@projectcaluma/ember-form 14.3.2 → 14.4.1

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

@@ -24,5 +24,7 @@
     @onChange={{this.onChange}}
     @onReady={{this.onReady}}
     @onClose={{this.onClose}}
+    @minDate={{@minDate}}
+    @maxDate={{@maxDate}}
   />
 </div>

package/addon/gql/fragments/field.graphql

@@ -19,7 +19,6 @@ fragment SimpleQuestion on Question {
         node {
           slug
           regex
-          errorMsg
         }
       }
     }
@@ -38,7 +37,6 @@ fragment SimpleQuestion on Question {
         node {
           slug
           regex
-          errorMsg
         }
       }
     }

package/addon/lib/field.js

@@ -3,7 +3,6 @@ import { assert } from "@ember/debug";
 import { associateDestroyableChild } from "@ember/destroyable";
 import { inject as service } from "@ember/service";
 import { camelize } from "@ember/string";
-import { isEmpty } from "@ember/utils";
 import { tracked } from "@glimmer/tracking";
 import { queryManager } from "ember-apollo-client";
 import { dropTask, lastValue, restartableTask } from "ember-concurrency";
@@ -609,25 +608,45 @@ export default class Field extends Base {
       input.dataSourceContext = JSON.stringify(this.document.dataSourceContext);
     }
 
-    const response = yield this.apollo.mutate(
-      {
-        mutation: MUTATION_MAP[type],
-        variables: { input },
-      },
-      `saveDocument${type}.answer`,
-    );
+    try {
+      const response = yield this.apollo.mutate(
+        {
+          mutation: MUTATION_MAP[type],
+          variables: { input },
+        },
+        `saveDocument${type}.answer`,
+      );
 
-    const wasNew = this.isNew;
+      const wasNew = this.isNew;
 
-    Object.entries(response).forEach(([key, value]) => {
-      this.answer.raw[key] = value;
-    });
+      Object.entries(response).forEach(([key, value]) => {
+        this.answer.raw[key] = value;
+      });
 
-    if (wasNew) {
-      this.answer.pushIntoStore();
-    }
+      if (wasNew) {
+        this.answer.pushIntoStore();
+      }
 
-    return response;
+      return response;
+    } catch (e) {
+      const validationError = e.errors.find(
+        (err) => err.extensions?.code === "format_validation_failed",
+      );
+
+      if (validationError) {
+        this._errors = [
+          ...this._errors,
+          {
+            type: "format",
+            context: { errorMsg: validationError.message },
+            value,
+          },
+        ];
+      } else {
+        this._errors = [];
+        throw e;
+      }
+    }
   }
 
   /**
@@ -704,35 +723,6 @@ export default class Field extends Base {
     }
   }
 
-  /**
-   * Validate the value against the regexes of the given format validators.
-   *
-   * @method _validateFormatValidators
-   * @return {Array<Boolean|Object>} An array of error objects or `true`
-   * @private
-   */
-  _validateFormatValidators() {
-    const validators =
-      this.question.raw.formatValidators?.edges.map((edge) => edge.node) ?? [];
-    const value = this.answer.value;
-
-    if (isEmpty(value)) {
-      // empty values should not be validated since they are handled by the
-      // requiredness validation
-      return validators.map(() => true);
-    }
-
-    return validators.map((validator) => {
-      return (
-        new RegExp(validator.regex).test(value) || {
-          type: "format",
-          context: { errorMsg: validator.errorMsg },
-          value,
-        }
-      );
-    });
-  }
-
   /**
    * Method to validate if a question is required or not.
    *
@@ -757,7 +747,6 @@ export default class Field extends Base {
    */
   _validateTextQuestion() {
     return [
-      ...this._validateFormatValidators(),
       validate("length", this.answer.value, {
         min: this.question.raw.textMinLength || 0,
         max: this.question.raw.textMaxLength || Number.POSITIVE_INFINITY,
@@ -775,7 +764,6 @@ export default class Field extends Base {
    */
   _validateTextareaQuestion() {
     return [
-      ...this._validateFormatValidators(),
       validate("length", this.answer.value, {
         min: this.question.raw.textareaMinLength || 0,
         max: this.question.raw.textareaMaxLength || Number.POSITIVE_INFINITY,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form",
-  "version": "14.3.2",
+  "version": "14.4.1",
   "description": "Ember addon for rendering Caluma forms.",
   "keywords": [
     "ember-addon"
@@ -17,7 +17,7 @@
     "@glimmer/tracking": "^1.1.2",
     "ember-apollo-client": "~4.0.2",
     "ember-auto-import": "^2.10.0",
-    "ember-autoresize-modifier": "^0.7.0",
+    "ember-autoresize-modifier": "^0.7.0 || ^0.8.0",
     "ember-basic-dropdown": "^8.4.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.3.0",
@@ -28,7 +28,7 @@
     "ember-flatpickr": "^8.0.1",
     "ember-in-viewport": "^4.1.0",
     "ember-intl": "^7.1.1",
-    "ember-math-helpers": "^4.2.1",
+    "ember-math-helpers": "^4.2.1 || ^5.0.0",
     "ember-power-select": "^8.6.2",
     "ember-template-imports": "^4.2.0",
     "ember-truth-helpers": "^4.0.3",
@@ -41,13 +41,13 @@
     "luxon": "^3.5.0",
     "reactiveweb": "^1.3.0",
     "tracked-toolbox": "^2.0.0",
-    "@projectcaluma/ember-core": "^14.3.2"
+    "@projectcaluma/ember-core": "^14.4.1"
   },
   "devDependencies": {
     "@ember/optional-features": "2.2.0",
     "@ember/test-helpers": "4.0.4",
     "@embroider/test-setup": "4.0.0",
-    "@faker-js/faker": "9.7.0",
+    "@faker-js/faker": "10.0.0",
     "broccoli-asset-rev": "3.0.0",
     "ember-cli": "6.1.0",
     "ember-cli-clean-css": "3.0.0",
@@ -59,25 +59,25 @@
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
     "ember-load-initializers": "3.0.1",
-    "ember-qunit": "9.0.2",
-    "ember-resolver": "13.1.0",
+    "ember-qunit": "9.0.3",
+    "ember-resolver": "13.1.1",
     "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-dom": "3.4.0",
-    "sass": "1.88.0",
-    "uikit": "3.23.7",
-    "uuid": "11.1.0",
-    "webpack": "5.99.8",
-    "@projectcaluma/ember-testing": "14.3.2",
-    "@projectcaluma/ember-workflow": "14.3.2"
+    "qunit-dom": "3.5.0",
+    "sass": "1.92.1",
+    "uikit": "3.23.12",
+    "uuid": "12.0.0",
+    "webpack": "5.101.3",
+    "@projectcaluma/ember-workflow": "14.4.1",
+    "@projectcaluma/ember-testing": "14.4.1"
   },
   "peerDependencies": {
     "ember-source": ">= 4.0.0",
-    "@projectcaluma/ember-workflow": "^14.3.2"
+    "@projectcaluma/ember-workflow": "^14.4.1"
   },
   "dependenciesMeta": {
     "@projectcaluma/ember-core": {