@projectcaluma/ember-form 14.6.0 → 14.7.0

package/addon/components/cf-field.hbs

@@ -55,12 +55,8 @@
                   <p class="uk-text-meta uk-margin-small">
                     {{t "caluma.form.error.details"}}
                   </p>
-                  <pre
-                    class="uk-margin-remove"
-                  >
-                    {{~format-graphql-error
-                      this.save.last.error
-                    ~}}
+                  <pre class="uk-margin-remove">
+                    {{~format-graphql-error this.save.last.error~}}
                   </pre>
                 </div>
               {{/if}}

package/addon/components/document-validity.hbs

@@ -1,7 +1,7 @@
 {{#if @validateOnEnter}}
   <div {{in-viewport onEnter=this.validate}}>
-    {{yield this.isValid this.validate}}
+    {{yield this.isValid this.validate this.isValidating}}
   </div>
 {{else}}
-  {{yield this.isValid this.validate}}
+  {{yield this.isValid this.validate this.isValidating}}
 {{/if}}

package/addon/components/document-validity.js

@@ -39,6 +39,10 @@ export default class DocumentValidity extends Component {
       .every((f) => f.isValid);
   }
 
+  get isValidating() {
+    return this._validate.isRunning;
+  }
+
   @restartableTask
   *_validate() {
     const saveTasks = this.args.document.fields
@@ -52,9 +56,15 @@ export default class DocumentValidity extends Component {
     // itself are finished
     yield Promise.all(saveTasks);
 
-    for (const field of this.args.document.fields) {
-      yield field.validate.linked().perform();
-    }
+    yield Promise.all(
+      this.args.document.fields.map(async (field) => {
+        await field.validate.linked().perform();
+
+        if (field.question.hasFormatValidators) {
+          await field.save.linked().perform();
+        }
+      }),
+    );
 
     if (this.isValid) {
       this.args.onValid?.();

package/addon/gql/fragments/field.graphql

@@ -15,12 +15,7 @@ fragment SimpleQuestion on Question {
     }
     placeholder
     formatValidators {
-      edges {
-        node {
-          slug
-          regex
-        }
-      }
+      totalCount
     }
     hintText
   }
@@ -33,12 +28,7 @@ fragment SimpleQuestion on Question {
     }
     placeholder
     formatValidators {
-      edges {
-        node {
-          slug
-          regex
-        }
-      }
+      totalCount
     }
     hintText
   }
@@ -50,6 +40,9 @@ fragment SimpleQuestion on Question {
       value
     }
     placeholder
+    formatValidators {
+      totalCount
+    }
     hintText
   }
   ... on FloatQuestion {
@@ -61,6 +54,9 @@ fragment SimpleQuestion on Question {
       value
     }
     placeholder
+    formatValidators {
+      totalCount
+    }
     hintText
   }
   ... on ChoiceQuestion {
@@ -79,6 +75,9 @@ fragment SimpleQuestion on Question {
       id
       value
     }
+    formatValidators {
+      totalCount
+    }
     hintText
   }
   ... on MultipleChoiceQuestion {
@@ -97,12 +96,21 @@ fragment SimpleQuestion on Question {
       id
       value
     }
+    formatValidators {
+      totalCount
+    }
     hintText
   }
   ... on DynamicChoiceQuestion {
+    formatValidators {
+      totalCount
+    }
     hintText
   }
   ... on DynamicMultipleChoiceQuestion {
+    formatValidators {
+      totalCount
+    }
     hintText
   }
   ... on DateQuestion {
@@ -110,6 +118,9 @@ fragment SimpleQuestion on Question {
       id
       value
     }
+    formatValidators {
+      totalCount
+    }
     hintText
   }
   ... on StaticQuestion {
@@ -120,6 +131,9 @@ fragment SimpleQuestion on Question {
     hintText
   }
   ... on FilesQuestion {
+    formatValidators {
+      totalCount
+    }
     hintText
   }
   ... on ActionButtonQuestion {

package/addon/lib/question.js

@@ -192,4 +192,8 @@ export default class Question extends Base {
         ].includes(this.raw.__typename))
     );
   }
+
+  get hasFormatValidators() {
+    return (this.raw.formatValidators?.totalCount ?? 0) > 0;
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form",
-  "version": "14.6.0",
+  "version": "14.7.0",
   "description": "Ember addon for rendering Caluma forms.",
   "keywords": [
     "ember-addon"
@@ -39,13 +39,13 @@
     "luxon": "^3.5.0",
     "reactiveweb": "^1.3.0",
     "tracked-toolbox": "^2.0.0",
-    "@projectcaluma/ember-core": "^14.6.0"
+    "@projectcaluma/ember-core": "^14.7.0"
   },
   "devDependencies": {
-    "@ember/optional-features": "2.2.0",
+    "@ember/optional-features": "2.3.0",
     "@ember/test-helpers": "4.0.4",
     "@embroider/test-setup": "4.0.0",
-    "@faker-js/faker": "10.0.0",
+    "@faker-js/faker": "10.2.0",
     "@glimmer/component": "1.1.2",
     "@glimmer/tracking": "1.1.2",
     "broccoli-asset-rev": "3.0.0",
@@ -61,23 +61,25 @@
     "ember-load-initializers": "3.0.1",
     "ember-qunit": "9.0.4",
     "ember-resolver": "13.1.1",
+    "ember-sinon-qunit": "7.5.0",
     "ember-source": "6.1.0",
     "ember-source-channel-url": "3.0.0",
     "ember-try": "4.0.0",
     "loader.js": "4.7.0",
     "miragejs": "0.1.48",
-    "qunit": "2.24.1",
+    "qunit": "2.25.0",
     "qunit-dom": "3.5.0",
-    "sass": "1.93.2",
-    "uikit": "3.23.13",
+    "sass": "1.97.3",
+    "sinon": "21.0.1",
+    "uikit": "3.25.6",
     "uuid": "13.0.0",
-    "webpack": "5.101.3",
-    "@projectcaluma/ember-workflow": "14.6.0",
-    "@projectcaluma/ember-testing": "14.6.0"
+    "webpack": "5.104.1",
+    "@projectcaluma/ember-testing": "14.7.0",
+    "@projectcaluma/ember-workflow": "14.7.0"
   },
   "peerDependencies": {
     "ember-source": ">= 4.0.0",
-    "@projectcaluma/ember-workflow": "^14.6.0"
+    "@projectcaluma/ember-workflow": "^14.7.0"
   },
   "dependenciesMeta": {
     "@projectcaluma/ember-core": {