@projectcaluma/ember-form 11.0.0-beta.18 → 11.0.0-beta.20

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+# [@projectcaluma/ember-form-v11.0.0-beta.20](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-form-v11.0.0-beta.19...@projectcaluma/ember-form-v11.0.0-beta.20) (2022-06-09)
+
+
+### Bug Fixes
+
+* **form:** improve validation of choice and multiple choice fields ([e828fad](https://github.com/projectcaluma/ember-caluma/commit/e828fad9557fd521ca9eec63af74f8cee12e3910))
+* **form:** pass context to table row form ([af1031a](https://github.com/projectcaluma/ember-caluma/commit/af1031ae9e8138a404cd043199709025092da882))
+
+
+### Features
+
+* **form:** add option to bypass the timeout when saving a field ([a2ba306](https://github.com/projectcaluma/ember-caluma/commit/a2ba306306f90a2d2279b34550507241f0987961))
+
+# [@projectcaluma/ember-form-v11.0.0-beta.19](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-form-v11.0.0-beta.18...@projectcaluma/ember-form-v11.0.0-beta.19) (2022-05-09)
+
+
+### Bug Fixes
+
+* **resources:** fix deprecations of ember-resources ([7a84c5c](https://github.com/projectcaluma/ember-caluma/commit/7a84c5c78d5b28f7b5393c64722907728dd5f42b))
+
 # [@projectcaluma/ember-form-v11.0.0-beta.18](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-form-v11.0.0-beta.17...@projectcaluma/ember-form-v11.0.0-beta.18) (2022-04-13)
 
 

package/addon/components/cf-content.js

@@ -4,7 +4,7 @@ import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
 import { dropTask } from "ember-concurrency";
-import { useTask } from "ember-resources";
+import { trackedTask } from "ember-resources/util/ember-concurrency";
 
 import getDocumentAnswersQuery from "@projectcaluma/ember-form/gql/queries/document-answers.graphql";
 import getDocumentFormsQuery from "@projectcaluma/ember-form/gql/queries/document-forms.graphql";
@@ -125,7 +125,7 @@ export default class CfContentComponent extends Component {
     );
   }
 
-  data = useTask(this, this.fetchData, () => [this.args.documentId]);
+  data = trackedTask(this, this.fetchData, () => [this.args.documentId]);
 
   @dropTask
   *fetchData() {

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

@@ -10,7 +10,7 @@
       name={{@field.pk}}
       value={{option.slug}}
       checked={{includes option.slug @field.answer.value}}
-      disabled={{@disabled}}
+      disabled={{or option.disabled @disabled}}
       {{on "change" this.update}}
     />
     {{#if (and option.disabled (not @disabled))}}

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

@@ -10,7 +10,7 @@
       name={{@field.pk}}
       value={{option.slug}}
       checked={{eq option.slug @field.answer.value}}
-      disabled={{@disabled}}
+      disabled={{or option.disabled @disabled}}
       {{on "change" (fn @onSave option.slug)}}
     />
     {{#if (and option.disabled (not @disabled))}}

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

@@ -83,6 +83,7 @@
         @document={{this.documentToEdit}}
         @fieldset={{object-at 0 this.documentToEdit.fieldsets}}
         @disabled={{@disabled}}
+        @context={{@context}}
       />
     </modal.body>
 

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

@@ -1,11 +1,13 @@
-<label class="uk-form-label" for={{@field.pk}}>
+<label class="uk-form-label" for={{@field.pk}} ...attributes>
   <span class="uk-text-bold">
     {{@field.question.raw.label}}
   </span>
 
-  {{#if this.optional}}
+  {{#if (and (not @field.question.isCalculated) @field.optional)}}
     <span
       class="uk-margin-small-left uk-text-muted uk-text-lowercase uk-text-normal"
     >({{t "caluma.form.optional"}})</span>
   {{/if}}
+
+  {{yield}}
 </label>

package/addon/components/cf-field.js

@@ -65,15 +65,18 @@ export default class CfFieldComponent extends Component {
    * reduce the amount of saved values when changed rapidly.
    *
    * @method save
-   * @param {String|Number|String[]} value
+   * @param {String|Number|String[]} value The new value to save to the field
+   * @param {Boolean} bypassTimeout Whether to bypass the timeout
    */
   @restartableTask
-  *save(value) {
+  *save(value, bypassTimeout = false) {
     /* istanbul ignore next */
     if (macroCondition(isTesting())) {
       // no timeout
     } else {
-      yield timeout(500);
+      if (!bypassTimeout) {
+        yield timeout(500);
+      }
     }
 
     if (this.args.field.answer) {

package/addon/lib/field.js

@@ -582,10 +582,10 @@ export default class Field extends Base {
   @cached
   get errors() {
     return this._errors.map(({ type, context, value }) => {
-      return this.intl.t(
-        `caluma.form.validation.${type}`,
-        Object.assign({}, context, { value })
-      );
+      return this.intl.t(`caluma.form.validation.${type}`, {
+        ...context,
+        value,
+      });
     });
   }
 
@@ -742,10 +742,7 @@ export default class Field extends Base {
    * @private
    */
   _validateChoiceQuestion() {
-    return validate("inclusion", this.answer.value, {
-      allowBlank: true,
-      in: (this.options || []).map(({ slug }) => slug),
-    });
+    return this._validateOption(this.answer.value, true);
   }
 
   /**
@@ -757,15 +754,9 @@ export default class Field extends Base {
    * @private
    */
   _validateMultipleChoiceQuestion() {
-    const value = this.answer.value;
-    if (!value) {
-      return true;
-    }
-    return value.map((value) =>
-      validate("inclusion", value, {
-        in: (this.options || []).map(({ slug }) => slug),
-      })
-    );
+    return this.answer.value
+      ? this.answer.value.map((value) => this._validateOption(value))
+      : true;
   }
 
   /**
@@ -779,9 +770,7 @@ export default class Field extends Base {
   async _validateDynamicChoiceQuestion() {
     await this.question.dynamicOptions;
 
-    return validate("inclusion", this.answer.value, {
-      in: (this.options || []).map(({ slug }) => slug),
-    });
+    return this._validateOption(this.answer.value);
   }
 
   /**
@@ -801,10 +790,20 @@ export default class Field extends Base {
 
     await this.question.dynamicOptions;
 
-    return value.map((value) => {
-      return validate("inclusion", value, {
-        in: (this.options || []).map(({ slug }) => slug),
-      });
+    return value.map((value) => this._validateOption(value));
+  }
+
+  _validateOption(value, allowBlank = false) {
+    const label = Array.isArray(this.selected)
+      ? this.selected.find((selected) => selected.slug === value)?.label
+      : this.selected?.label;
+
+    return validate("inclusion", value, {
+      in: (this.options || [])
+        .filter((option) => !option.disabled)
+        .map(({ slug }) => slug),
+      allowBlank,
+      label: label ?? value,
     });
   }
 

package/addon/lib/question.js

@@ -2,7 +2,7 @@ import { assert } from "@ember/debug";
 import { camelize } from "@ember/string";
 import { queryManager } from "ember-apollo-client";
 import { dropTask } from "ember-concurrency";
-import { useTask } from "ember-resources";
+import { trackedTask } from "ember-resources/util/ember-concurrency";
 import { cached } from "tracked-toolbox";
 
 import getDynamicOptions from "@projectcaluma/ember-form/gql/queries/dynamic-options.graphql";
@@ -77,7 +77,7 @@ export default class Question extends Base {
     );
   }
 
-  dynamicOptions = useTask(this, this.loadDynamicOptions, () => []);
+  dynamicOptions = trackedTask(this, this.loadDynamicOptions, () => []);
 
   get dynamicChoiceOptions() {
     return this.dynamicOptions.value ?? [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form",
-  "version": "11.0.0-beta.18",
+  "version": "11.0.0-beta.20",
   "description": "Ember addon for rendering Caluma forms.",
   "keywords": [
     "ember-addon"
@@ -15,13 +15,13 @@
   },
   "dependencies": {
     "@ember/string": "^3.0.0",
-    "@embroider/macros": "^1.6.0",
-    "@embroider/util": "^1.6.0",
-    "@glimmer/component": "^1.1.1",
-    "@glimmer/tracking": "^1.1.1",
-    "@projectcaluma/ember-core": "^11.0.0-beta.6",
+    "@embroider/macros": "^1.7.1",
+    "@embroider/util": "^1.7.1",
+    "@glimmer/component": "^1.1.2",
+    "@glimmer/tracking": "^1.1.2",
+    "@projectcaluma/ember-core": "^11.0.0-beta.7",
     "ember-apollo-client": "^4.0.2",
-    "ember-auto-import": "^2.4.1",
+    "ember-auto-import": "^2.4.2",
     "ember-autoresize-modifier": "^0.5.0",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-htmlbars": "^6.0.1",
@@ -31,31 +31,31 @@
     "ember-fetch": "^8.1.1",
     "ember-in-viewport": "^4.0.2",
     "ember-intl": "^5.7.2",
-    "ember-math-helpers": "^2.18.1",
+    "ember-math-helpers": "^2.18.2",
     "ember-pikaday": "^4.0.0",
     "ember-power-select": "^5.0.4",
-    "ember-resources": "^4.4.0",
-    "ember-uikit": "^5.1.1",
+    "ember-resources": "^4.8.2",
+    "ember-uikit": "^5.1.3",
     "ember-validators": "^4.1.2",
     "graphql": "^15.8.0",
     "jexl": "^2.3.0",
     "lodash.isequal": "^4.5.0",
-    "luxon": "^2.3.1",
+    "luxon": "^2.4.0",
     "tracked-toolbox": "^1.2.3"
   },
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
-    "@ember/test-helpers": "2.7.0",
-    "@embroider/test-setup": "1.6.0",
-    "@faker-js/faker": "6.1.2",
-    "@projectcaluma/ember-testing": "11.0.0-beta.6",
-    "@projectcaluma/ember-workflow": "11.0.0-beta.6",
+    "@ember/test-helpers": "2.8.1",
+    "@embroider/test-setup": "1.7.1",
+    "@faker-js/faker": "7.2.0",
+    "@projectcaluma/ember-testing": "11.0.0-beta.8",
+    "@projectcaluma/ember-workflow": "^11.0.0-beta.7",
     "broccoli-asset-rev": "3.0.0",
     "ember-cli": "3.28.5",
     "ember-cli-code-coverage": "1.0.3",
-    "ember-cli-dependency-checker": "3.2.0",
+    "ember-cli-dependency-checker": "3.3.1",
     "ember-cli-inject-live-reload": "2.1.0",
-    "ember-cli-mirage": "3.0.0-alpha.2",
+    "ember-cli-mirage": "3.0.0-alpha.3",
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
     "ember-disable-prototype-extensions": "1.1.3",
@@ -64,19 +64,19 @@
     "ember-maybe-import-regenerator": "1.0.0",
     "ember-qunit": "5.1.5",
     "ember-resolver": "8.0.3",
-    "ember-source": "3.28.8",
+    "ember-source": "3.28.9",
     "ember-source-channel-url": "3.0.0",
     "ember-try": "2.0.0",
     "loader.js": "4.7.0",
-    "miragejs": "0.1.43",
+    "miragejs": "0.1.45",
     "npm-run-all": "4.1.5",
-    "qunit": "2.18.1",
+    "qunit": "2.19.1",
     "qunit-dom": "2.0.0",
     "uuid": "8.3.2",
-    "webpack": "5.72.0"
+    "webpack": "5.73.0"
   },
   "peerDependencies": {
-    "@projectcaluma/ember-workflow": "^11.0.0-beta.6"
+    "@projectcaluma/ember-workflow": "^11.0.0-beta.7"
   },
   "peerDependenciesMeta": {
     "@projectcaluma/ember-workflow": {

package/translations/de.yaml

@@ -46,7 +46,7 @@ caluma:
       greaterThanOrEqualTo: "Die Eingabe in diesem Feld darf nicht kleiner als {gte} sein"
       lessThanOrEqualTo: "Die Eingabe in diesem Feld darf nicht grösser als {lte} sein"
       notAnInteger: "Bitte geben Sie eine ganze Zahl ein"
-      inclusion: "'{value}' ist kein gültiger Wert für dieses Feld"
+      inclusion: '"{label}" ist kein gültiger Wert für dieses Feld'
       deleteFailed: "Beim Löschen ist ein Fehler aufgetreten."
       uploadFailed: "Beim Hochladen ist ein Fehler aufgetreten."
       format: "{errorMsg}"

package/translations/en.yaml

@@ -46,7 +46,7 @@ caluma:
       greaterThanOrEqualTo: "The value of this field must be greater than or equal to {gte}"
       lessThanOrEqualTo: "The value of this field must be less than or equal to {lte}"
       notAnInteger: "The value of this field must be an integer"
-      inclusion: "'{value}' is not a valid value for this field"
+      inclusion: '"{label}" is not a valid value for this field'
       deleteFailed: "An error occured during deletion."
       uploadFailed: "An error occured during upload."
       format: "{errorMsg}"

package/translations/fr.yaml

@@ -46,7 +46,7 @@ caluma:
       greaterThanOrEqualTo: "La valeur indiquée dans ce champ ne doit pas être inférieure à {gte} "
       lessThanOrEqualTo: "L'entrée dans ce champ ne doit pas être supérieure à {lte} "
       notAnInteger: "Veuillez entrer un nombre entier"
-      inclusion: "'{value}' n'est pas une valeur valide pour ce champ"
+      inclusion: '"{label}" n''est pas une valeur valide pour ce champ'
       deleteFailed: "Une erreur est survenue lors de la suppression."
       uploadFailed: "Une erreur s'est produite pendant le téléchargement."
       format: "{errorMsg}"

package/addon/components/cf-field/label.js

@@ -1,11 +0,0 @@
-import Component from "@glimmer/component";
-
-export default class CfFieldLabelComponent extends Component {
-  get optional() {
-    if (this.args.field?.question.isCalculated) {
-      return false;
-    }
-
-    return this.args.field?.optional;
-  }
-}