Merge pull request #5188 from nwmac/remove-marked-and-dompurify

Remove use of marked and dompurify dependencies
rancher · Dec 9, 2024 · e2613a9 · e2613a9
2 parents ae0f3f3 + a760f89
commit e2613a9
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 55 deletions.
diff --git 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
@@ -34,7 +34,7 @@
     </div>
     <div class="col span-8">
       {{#if appReadmeContent}}
-        {{marked-down markdown=appReadmeContent}}
+        {{t "generic.removed" }}
       {{else if (not noAppReadme)}}
         <div class="text-center">
           <i class="icon icon-spinner icon-spin icon-3x"></i>
@@ -66,7 +66,7 @@
       <div class="row">
         {{#if readmeContent}}
           <div class="col span-12" style="overflow-y: auto; max-height: 500px;">
-            {{marked-down markdown=readmeContent}}
+            {{t "generic.removed" }}
           </div>
         {{else}}
           <h2 class="mb-10">

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
@@ -28,7 +28,7 @@
     </div>
     <div class="col span-8">
       {{#if appReadmeContent}}
-        {{marked-down markdown=appReadmeContent}}
+        {{t "generic.removed" }}
       {{else if (not noAppReadme)}}
         <div class="text-center">
           <i class="icon icon-spinner icon-spin icon-3x"></i>
@@ -59,7 +59,7 @@
     <div class="row">
       {{#if readmeContent}}
         <div class="col span-12 readme-content">
-          {{marked-down markdown=readmeContent}}
+          {{t "generic.removed" }}
         </div>
       {{else}}
         <h2 class="mb-10">

diff --git a/lib/shared/addon/components/marked-down/component.js b/lib/shared/addon/components/marked-down/component.js
diff --git a/lib/shared/addon/components/marked-down/template.hbs b/lib/shared/addon/components/marked-down/template.hbs
diff --git a/lib/shared/app/components/marked-down/component.js b/lib/shared/app/components/marked-down/component.js
diff --git 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
@@ -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
@@ -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