@projectcaluma/ember-form 14.7.1 → 14.8.1

package/addon/components/document-validity.js

@@ -1,8 +1,11 @@
 import { action } from "@ember/object";
 import Component from "@glimmer/component";
+import { queryManager } from "ember-apollo-client";
 import { task } from "ember-concurrency";
 import { cached } from "tracked-toolbox";
 
+import documentValidityQuery from "@projectcaluma/ember-form/gql/queries/document-validity.graphql";
+
 /**
  * Component to check the validity of a document
  *
@@ -20,6 +23,8 @@ import { cached } from "tracked-toolbox";
  * @yield {Function} validate
  */
 export default class DocumentValidity extends Component {
+  @queryManager apollo;
+
   /**
    * The document to be validated
    *
@@ -43,39 +48,61 @@ export default class DocumentValidity extends Component {
     return this._validate.isRunning;
   }
 
-  _validateField = task(async (field) => {
-    await field.validate.linked().perform();
+  _validate = task({ restartable: true }, async () => {
+    try {
+      const saveTasks = this.args.document.fields
+        .flatMap((field) => [
+          ...[...(field._components ?? [])].map((c) => c.save.last),
+          field.save?.last,
+        ])
+        .filter(Boolean);
 
-    if (field.question.hasFormatValidators) {
-      await field.save.linked().perform();
-    }
-  });
+      // Wait until all currently running save tasks in the UI and in the field
+      // itself are finished
+      await Promise.all(saveTasks);
 
-  _validate = task({ restartable: true }, async () => {
-    const saveTasks = this.args.document.fields
-      .flatMap((field) => [
-        ...[...(field._components ?? [])].map((c) => c.save.last),
-        field.save?.last,
-      ])
-      .filter(Boolean);
+      await Promise.all(
+        this.args.document.fields.map((field) =>
+          field.validate.linked().perform(),
+        ),
+      );
 
-    // Wait until all currently running save tasks in the UI and in the field
-    // itself are finished
-    await Promise.all(saveTasks);
+      const { isValid, errors } = await this.apollo.query(
+        {
+          query: documentValidityQuery,
+          fetchPolicy: "network-only",
+          variables: { id: this.args.document.uuid },
+        },
+        "documentValidity.edges.0.node",
+      );
 
-    await Promise.all(
-      this.args.document.fields.map((field) =>
-        this._validateField.perform(field),
-      ),
-    );
+      if (!isValid) {
+        errors
+          .filter(({ errorCode }) => errorCode === "format_validation_failed")
+          .forEach(({ slug, errorMsg }) => {
+            const field = this.args.document.findField(slug);
 
-    if (this.isValid) {
-      this.args.onValid?.();
-    } else {
-      this.args.onInvalid?.();
-    }
+            field._errors = [
+              ...field._errors,
+              {
+                type: "format",
+                context: { errorMsg },
+                value: field.value,
+              },
+            ];
+          });
+      }
 
-    return this.isValid;
+      if (this.isValid) {
+        this.args.onValid?.();
+      } else {
+        this.args.onInvalid?.();
+      }
+
+      return this.isValid;
+    } catch {
+      return false;
+    }
   });
 
   @action

package/addon/gql/queries/document-validity.graphql

@@ -0,0 +1,15 @@
+query DocumentValidity($id: ID!, $dataSourceContext: JSONString) {
+  documentValidity(id: $id, dataSourceContext: $dataSourceContext) {
+    edges {
+      node {
+        id
+        isValid
+        errors {
+          slug
+          errorMsg
+          errorCode
+        }
+      }
+    }
+  }
+}

package/addon/lib/field.js

@@ -627,6 +627,8 @@ export default class Field extends Base {
       input.dataSourceContext = JSON.stringify(this.document.dataSourceContext);
     }
 
+    await this.beforeSave();
+
     try {
       const response = await this.apollo.mutate(
         {
@@ -652,12 +654,16 @@ export default class Field extends Base {
         this._errors = this._errors.filter(({ type }) => type !== "format");
       }
 
+      await this.afterSave(response);
+
       return response;
     } catch (e) {
       const validationError = e.errors.find(
         (err) => err.extensions?.code === "format_validation_failed",
       );
 
+      await this.onSaveError(e);
+
       if (validationError) {
         this._errors = [
           ...this._errors,
@@ -673,6 +679,31 @@ export default class Field extends Base {
     }
   });
 
+  /**
+   * Hook method that can be overridden to add functionality before saving the field.
+   *
+   * @method beforeSave
+   */
+  async beforeSave() {}
+
+  /**
+   * Hook method that can be overridden to add functionality after saving the field.
+   *
+   * @method afterSave
+   * @param {Object} response The response from the server
+   */
+  // eslint-disable-next-line no-unused-vars
+  async afterSave(response) {}
+
+  /**
+   * Hook method that can be overridden to add functionality when saving the field fails.
+   *
+   * @method onSaveError
+   * @param {Object} error The error thrown during saving
+   */
+  // eslint-disable-next-line no-unused-vars
+  async onSaveError(error) {}
+
   /**
    * The translated error messages
    *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form",
-  "version": "14.7.1",
+  "version": "14.8.1",
   "description": "Ember addon for rendering Caluma forms.",
   "keywords": [
     "ember-addon"
@@ -39,7 +39,7 @@
     "luxon": "^3.5.0",
     "reactiveweb": "^1.3.0",
     "tracked-toolbox": "^2.0.0",
-    "@projectcaluma/ember-core": "^14.7.1"
+    "@projectcaluma/ember-core": "^14.8.1"
   },
   "devDependencies": {
     "@ember/optional-features": "2.3.0",
@@ -74,12 +74,12 @@
     "uikit": "3.25.6",
     "uuid": "13.0.0",
     "webpack": "5.104.1",
-    "@projectcaluma/ember-testing": "14.7.1",
-    "@projectcaluma/ember-workflow": "14.7.1"
+    "@projectcaluma/ember-workflow": "14.8.1",
+    "@projectcaluma/ember-testing": "14.8.1"
   },
   "peerDependencies": {
     "ember-source": ">= 4.0.0",
-    "@projectcaluma/ember-workflow": "^14.7.1"
+    "@projectcaluma/ember-workflow": "^14.8.1"
   },
   "dependenciesMeta": {
     "@projectcaluma/ember-core": {