diff --git a/app/apps-tab/detail/template.hbs b/app/apps-tab/detail/template.hbs index 1119db1b20..d274a3dadb 100644 --- a/app/apps-tab/detail/template.hbs +++ b/app/apps-tab/detail/template.hbs @@ -67,9 +67,7 @@ expand=(action expandFn) expandOnInit=false }} - {{marked-down - markdown=model.app.notes - }} + {{t "generic.removed" }} {{/accordion-list-item}} {{/if}} diff --git a/app/components/new-catalog/template.hbs b/app/components/new-catalog/template.hbs index 17b4c77635..7cc0eedaf5 100644 --- a/app/components/new-catalog/template.hbs +++ b/app/components/new-catalog/template.hbs @@ -34,7 +34,7 @@
{{#if appReadmeContent}} - {{marked-down markdown=appReadmeContent}} + {{t "generic.removed" }} {{else if (not noAppReadme)}}
@@ -66,7 +66,7 @@
{{#if readmeContent}}
- {{marked-down markdown=readmeContent}} + {{t "generic.removed" }}
{{else}}

diff --git a/lib/global-admin/addon/components/new-multi-cluster-app/template.hbs b/lib/global-admin/addon/components/new-multi-cluster-app/template.hbs index 613ad96ae1..f7610fe6b4 100644 --- a/lib/global-admin/addon/components/new-multi-cluster-app/template.hbs +++ b/lib/global-admin/addon/components/new-multi-cluster-app/template.hbs @@ -28,7 +28,7 @@

{{#if appReadmeContent}} - {{marked-down markdown=appReadmeContent}} + {{t "generic.removed" }} {{else if (not noAppReadme)}}
@@ -59,7 +59,7 @@
{{#if readmeContent}}
- {{marked-down markdown=readmeContent}} + {{t "generic.removed" }}
{{else}}

diff --git a/lib/shared/addon/components/marked-down/component.js b/lib/shared/addon/components/marked-down/component.js deleted file mode 100644 index 7eaa3e8acc..0000000000 --- a/lib/shared/addon/components/marked-down/component.js +++ /dev/null @@ -1,42 +0,0 @@ -import Component from '@ember/component'; -import layout from './template'; -import { htmlSafe } from '@ember/string'; -import { get, computed } from '@ember/object'; -import { next } from '@ember/runloop'; - -var Marked = null; -var DOMPurify = null; - -export default Component.extend({ - layout, - markdown: null, - init() { - this._super(...arguments); - - - if (!Marked) { - import('marked').then( (module) => { - Marked = module.default; - import('dompurify').then( (module) => { - DOMPurify = module.default; - - if ( this.isDestroyed || this.isDestroying ) { - return; - } - - next(() => this.notifyPropertyChange('parsedMarkdown')); - }); - }); - } - }, - parsedMarkdown: computed('markdown', function() { - if ( !Marked ) { - return ''; - } - - const html = Marked(get(this, 'markdown'), { breaks: true }); - - return htmlSafe(DOMPurify.sanitize(html)); - }), - -}); diff --git a/lib/shared/addon/components/marked-down/template.hbs b/lib/shared/addon/components/marked-down/template.hbs deleted file mode 100644 index 208cdcbe76..0000000000 --- a/lib/shared/addon/components/marked-down/template.hbs +++ /dev/null @@ -1 +0,0 @@ -{{parsedMarkdown}} \ No newline at end of file diff --git a/lib/shared/app/components/marked-down/component.js b/lib/shared/app/components/marked-down/component.js deleted file mode 100644 index a0a6aab0a0..0000000000 --- a/lib/shared/app/components/marked-down/component.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'shared/components/marked-down/component'; diff --git a/lib/shared/package.json b/lib/shared/package.json index ea5758921a..0070f362f7 100644 --- a/lib/shared/package.json +++ b/lib/shared/package.json @@ -6,7 +6,6 @@ "dependencies": { "async": "*", "d3": "*", - "dompurify": "*", "echarts": "*", "@rancher/ember-api-store": "*", "ember-auto-import": "*", @@ -27,7 +26,6 @@ "json2yaml": "*", "jsyaml": "*", "liquid-fire": "*", - "marked": "*", "prettycron": "*", "prismjs": "*", "semver": "*", diff --git a/package.json b/package.json index 0997984b2c..0e2cdd9886 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,6 @@ "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "d3": "3.5.17", - "dompurify": "^2.1.1", "dot-object": "^2.1.4", "dotenv": "^8.2.0", "echarts": "4.9.0", @@ -93,7 +92,6 @@ "linkifyjs": "^4.1.3", "linkify-string": "^4.1.3", "loader.js": "^4.7.0", - "marked": "^2.0.0", "moment": "~2.29.4", "node-sass": "4.14.1", "objects-to-csv": "^1.3.5", diff --git a/translations/en-us.yaml b/translations/en-us.yaml index 780410b8e2..fca98a272c 100644 --- a/translations/en-us.yaml +++ b/translations/en-us.yaml @@ -100,6 +100,7 @@ generic: persistentVolume: persistent volume random: Random remove: Remove + removed: Functionality has been removed from the legacy UI restarts: Restarts role: Role save: Save