@projectcaluma/ember-form 14.8.2 → 14.8.3

package/addon/components/cf-field/info.hbs

@@ -16,11 +16,7 @@
     as |modal|
   >
     <modal.body>
-      <MarkdownToHtml
-        @markdown={{@text}}
-        @openLinksInNewWindow={{true}}
-        @extensions="DOMPurify"
-      />
+      <MarkdownToHtml @markdown={{@text}} @openLinksInNewWindow={{true}} />
     </modal.body>
   </UkModal>
 </div>

package/addon/components/cf-field/input/static.hbs

@@ -1,5 +1,4 @@
 <MarkdownToHtml
   @markdown={{@field.question.raw.staticContent}}
   @openLinksInNewWindow={{true}}
-  @extensions="DOMPurify"
 />

package/addon/components/cf-field/input/table.hbs

@@ -118,6 +118,7 @@
         />
         <DocumentValidity
           @document={{this.documentToEdit}}
+          @skipBackendValidation={{true}}
           as |isValid validate|
         >
           <UkButton

package/addon/components/document-validity.js

@@ -70,34 +70,7 @@ export default class DocumentValidity extends Component {
         ),
       );
 
-      const { isValid, errors } = await this.apollo.query(
-        {
-          query: documentValidityQuery,
-          fetchPolicy: "network-only",
-          variables: { id: this.args.document.uuid },
-        },
-        "documentValidity.edges.0.node",
-      );
-
-      if (!isValid) {
-        errors
-          .filter(({ errorCode }) => errorCode === "format_validation_failed")
-          .forEach(({ slug, errorMsg, documentId }) => {
-            const pk = `Document:${documentId}:Question:${slug}`;
-            const field = this.calumaStore.findByPk(pk);
-            const parentField = field.document.parentField;
-
-            // Add the error manually as the frontend does not validate format
-            // validators - only the backend.
-            field.addManualError("format", { errorMsg }, field.value);
-
-            if (parentField) {
-              // If the affected field is in a table row, we need to mark the
-              // table answer as invalid as well.
-              parentField.addManualError("table", {}, null);
-            }
-          });
-      }
+      await this.#runBackendValidation();
 
       if (this.isValid) {
         this.args.onValid?.();
@@ -111,6 +84,39 @@ export default class DocumentValidity extends Component {
     }
   });
 
+  async #runBackendValidation() {
+    if (this.args.skipBackendValidation) return;
+
+    const { isValid, errors } = await this.apollo.query(
+      {
+        query: documentValidityQuery,
+        fetchPolicy: "network-only",
+        variables: { id: this.args.document.uuid },
+      },
+      "documentValidity.edges.0.node",
+    );
+
+    if (!isValid) {
+      errors
+        .filter(({ errorCode }) => errorCode === "format_validation_failed")
+        .forEach(({ slug, errorMsg, documentId }) => {
+          const pk = `Document:${documentId}:Question:${slug}`;
+          const field = this.calumaStore.findByPk(pk);
+          const parentField = field.document.parentField;
+
+          // Add the error manually as the frontend does not validate format
+          // validators - only the backend.
+          field.addManualError("format", { errorMsg }, field.value);
+
+          if (parentField) {
+            // If the affected field is in a table row, we need to mark the
+            // table answer as invalid as well.
+            parentField.addManualError("table", {}, null);
+          }
+        });
+    }
+  }
+
   @action
   validate() {
     return this._validate.perform();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form",
-  "version": "14.8.2",
+  "version": "14.8.3",
   "description": "Ember addon for rendering Caluma forms.",
   "keywords": [
     "ember-addon"
@@ -14,7 +14,6 @@
     "@ember/test-waiters": "^4.1.1",
     "@embroider/macros": "^1.16.10",
     "@embroider/util": "^1.13.2",
-    "dompurify": "^3.3.1",
     "ember-apollo-client": "^5.0.0",
     "ember-auto-import": "^2.10.0",
     "ember-autoresize-modifier": "^0.7.0 || ^0.8.0",
@@ -40,7 +39,7 @@
     "luxon": "^3.5.0",
     "reactiveweb": "^1.3.0",
     "tracked-toolbox": "^2.0.0",
-    "@projectcaluma/ember-core": "^14.8.2"
+    "@projectcaluma/ember-core": "^14.8.3"
   },
   "devDependencies": {
     "@ember/optional-features": "2.3.0",
@@ -75,12 +74,12 @@
     "uikit": "3.25.6",
     "uuid": "13.0.0",
     "webpack": "5.104.1",
-    "@projectcaluma/ember-testing": "14.8.2",
-    "@projectcaluma/ember-workflow": "14.8.2"
+    "@projectcaluma/ember-testing": "14.8.3",
+    "@projectcaluma/ember-workflow": "14.8.3"
   },
   "peerDependencies": {
     "ember-source": ">= 4.0.0",
-    "@projectcaluma/ember-workflow": "^14.8.2"
+    "@projectcaluma/ember-workflow": "^14.8.3"
   },
   "dependenciesMeta": {
     "@projectcaluma/ember-core": {

package/addon/initializers/register-showdown-extensions.js

@@ -1,20 +0,0 @@
-import DOMPurify from "dompurify";
-import showdown from "showdown";
-
-export function initialize() {
-  showdown.extension("DOMPurify", function () {
-    return [
-      {
-        type: "output",
-        filter(dirty) {
-          return DOMPurify.sanitize(dirty, { USE_PROFILES: { html: true } });
-        },
-      },
-    ];
-  });
-}
-
-export default {
-  name: "register-showdown-extensions",
-  initialize,
-};

package/app/initializers/register-showdown-extensions.js

@@ -1,4 +0,0 @@
-export {
-  default,
-  initialize,
-} from "@projectcaluma/ember-form/initializers/register-showdown-extensions";