Merge branch 'plugin-settings-ui' of github.com:SchrodingersGat/Inven…

…Tree into plugin-settings-ui
inventree · Oct 7, 2024 · 43fce97 · 43fce97
2 parents 5fec281 + 6ef2213
commit 43fce97
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/src/backend/InvenTree/InvenTree/settings.py b/src/backend/InvenTree/InvenTree/settings.py
@@ -1277,6 +1277,7 @@
             'li',
             'ol',
             'p',
+            'pre',
             's',
             'strong',
             'table',

diff --git a/src/backend/InvenTree/templates/js/translated/helpers.js b/src/backend/InvenTree/templates/js/translated/helpers.js
@@ -1,6 +1,7 @@
 {% load i18n %}
 
 /* globals
+    DOMPurify,
     EasyMDE,
     inventreeFormDataUpload,
     inventreeGet,

diff --git a/src/frontend/package.json b/src/frontend/package.json
@@ -40,6 +40,7 @@
         "@sentry/react": "^8.31.0",
         "@tabler/icons-react": "^3.17.0",
         "@tanstack/react-query": "^5.56.2",
+        "@types/dompurify": "^3.0.5",
         "@uiw/codemirror-theme-vscode": "^4.23.3",
         "@uiw/react-codemirror": "^4.23.3",
         "@uiw/react-split": "^5.9.3",

diff --git a/src/frontend/yarn.lock b/src/frontend/yarn.lock
@@ -1710,6 +1710,13 @@
   resolved "https://registry.yarnpkg.com/@types/d3-timer/-/d3-timer-3.0.2.tgz#70bbda77dc23aa727413e22e214afa3f0e852f70"
   integrity sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==
 
+"@types/dompurify@^3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@types/dompurify/-/dompurify-3.0.5.tgz#02069a2fcb89a163bacf1a788f73cb415dd75cb7"
+  integrity sha512-1Wg0g3BtQF7sSb27fJQAKck1HECM6zV1EB66j8JH9i3LCjYabJa0FSdiSgsD5K/RbrsR0SiraKacLB+T8ZVYAg==
+  dependencies:
+    "@types/trusted-types" "*"
+
 "@types/estree@*":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
@@ -1838,6 +1845,11 @@
   dependencies:
     "@types/estree" "*"
 
+"@types/trusted-types@*":
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.7.tgz#baccb07a970b91707df3a3e8ba6896c57ead2d11"
+  integrity sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==
+
 "@types/yargs-parser@*":
   version "21.0.3"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15"