@projectcaluma/ember-form 14.5.1 → 14.7.0

package/addon/components/cf-field/input/files.js

@@ -1,9 +1,9 @@
 import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
+import { waitForFetch } from "@ember/test-waiters";
 import { macroCondition, isTesting } from "@embroider/macros";
 import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
-import fetch from "fetch";
 
 import getFilesAnswerInfoQuery from "@projectcaluma/ember-form/gql/queries/filesanswer-info.graphql";
 
@@ -75,10 +75,12 @@ export default class CfFieldInputFilesComponent extends Component {
       }));
 
       const uploadFunction = async (file) => {
-        const response = await fetch(file.uploadUrl, {
-          method: "PUT",
-          body: file.value,
-        });
+        const response = await waitForFetch(
+          fetch(file.uploadUrl, {
+            method: "PUT",
+            body: file.value,
+          }),
+        );
         if (!response.ok) {
           throw new Error();
         }

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/base.js

@@ -2,6 +2,7 @@ import { setOwner } from "@ember/application";
 import { assert } from "@ember/debug";
 import { registerDestructor } from "@ember/destroyable";
 import { inject as service } from "@ember/service";
+import { cached } from "tracked-toolbox";
 
 export default class Base {
   @service calumaStore;
@@ -18,8 +19,8 @@ export default class Base {
     }
 
     registerDestructor(this, () => {
-      if (this.pk) {
-        this.calumaStore.delete(this.pk);
+      if (this.storeKey) {
+        this.calumaStore.delete(this.storeKey);
       }
     });
   }
@@ -31,13 +32,34 @@ export default class Base {
    */
   raw = {};
 
+  /**
+   * The primary key of the lib class.
+   * Must be overridden in subclasses.
+   *
+   * @property {String} pk
+   */
+  @cached
+  get pk() {
+    throw new Error("pk getter must be implemented in subclass");
+  }
+
+  /**
+   * The caluma store key of the answer.
+   *
+   * @property {String} storeKey
+   */
+  @cached
+  get storeKey() {
+    return this.pk;
+  }
+
   /**
    * Push the object into the caluma store
    *
    * @method pushIntoStore
    */
   pushIntoStore() {
-    if (this.pk) {
+    if (this.storeKey) {
       this.calumaStore.push(this);
     }
   }

package/addon/lib/field.js

@@ -177,6 +177,17 @@ export default class Field extends Base {
     return `${this.document.pk}:Question:${this.raw.question.slug}`;
   }
 
+  /**
+   * The caluma store key of the field.
+   * The form primary key is added for re-used fields in different forms.
+   *
+   * @property {String} storeKey
+   */
+  @cached
+  get storeKey() {
+    return `${this.fieldset.storeKey}:Question:${this.raw.question.slug}`;
+  }
+
   /**
    * The element ID used by the label component.
    *

package/addon/lib/fieldset.js

@@ -52,9 +52,7 @@ export default class Fieldset extends Base {
     const fields = this.raw.form.questions.map((question) => {
       return associateDestroyableChild(
         this,
-        this.calumaStore.find(
-          `${this.document.pk}:Question:${question.slug}`,
-        ) ||
+        this.calumaStore.find(`${this.pk}:Question:${question.slug}`) ||
           new (owner.factoryFor("caluma-model:field").class)({
             raw: {
               question,

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/addon/services/caluma-store.js

@@ -13,14 +13,14 @@ export default class CalumaStoreService extends Service {
   push(obj) {
     assert(
       `Object must have an \`pk\` in order to be pushed into the store`,
-      obj.pk,
+      obj.storeKey,
     );
 
-    const existing = this._store.get(obj.pk);
+    const existing = this._store.get(obj.storeKey);
 
     if (existing) {
       debug(
-        `Object with the pk \`${obj.pk}\` already exists in the store. It will be updated.`,
+        `Object with the storeKey \`${obj.storeKey}\` already exists in the store. It will be updated.`,
       );
 
       set(existing, "raw", obj.raw);
@@ -28,17 +28,17 @@ export default class CalumaStoreService extends Service {
       return existing;
     }
 
-    this._store.set(obj.pk, obj);
+    this._store.set(obj.storeKey, obj);
 
     return obj;
   }
 
-  find(pk) {
-    return this._store.get(pk) || null;
+  find(storeKey) {
+    return this._store.get(storeKey) || null;
   }
 
-  delete(pk) {
-    this._store.delete(pk);
+  delete(storeKey) {
+    this._store.delete(storeKey);
   }
 
   clear() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form",
-  "version": "14.5.1",
+  "version": "14.7.0",
   "description": "Ember addon for rendering Caluma forms.",
   "keywords": [
     "ember-addon"
@@ -11,10 +11,9 @@
   "dependencies": {
     "@babel/core": "^7.26.0",
     "@ember/string": "^3.1.1 || ^4.0.0",
+    "@ember/test-waiters": "^4.1.1",
     "@embroider/macros": "^1.16.10",
     "@embroider/util": "^1.13.2",
-    "@glimmer/component": "^1.1.2",
-    "@glimmer/tracking": "^1.1.2",
     "ember-apollo-client": "^5.0.0",
     "ember-auto-import": "^2.10.0",
     "ember-autoresize-modifier": "^0.7.0 || ^0.8.0",
@@ -24,7 +23,6 @@
     "ember-cli-showdown": "^9.0.1",
     "ember-composable-helpers": "^5.0.0",
     "ember-concurrency": "^4.0.2",
-    "ember-fetch": "^8.1.2",
     "ember-flatpickr": "^8.0.1",
     "ember-in-viewport": "^4.1.0",
     "ember-intl": "^7.1.1",
@@ -41,13 +39,15 @@
     "luxon": "^3.5.0",
     "reactiveweb": "^1.3.0",
     "tracked-toolbox": "^2.0.0",
-    "@projectcaluma/ember-core": "^14.5.1"
+    "@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",
     "ember-cli": "6.1.0",
     "ember-cli-clean-css": "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-testing": "14.5.1",
-    "@projectcaluma/ember-workflow": "14.5.1"
+    "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.5.1"
+    "@projectcaluma/ember-workflow": "^14.7.0"
   },
   "dependenciesMeta": {
     "@projectcaluma/ember-core": {