@projectcaluma/ember-form 11.0.0-beta.12 → 11.0.0-beta.15

package/CHANGELOG.md

@@ -1,3 +1,32 @@
+# [@projectcaluma/ember-form-v11.0.0-beta.15](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-form-v11.0.0-beta.14...@projectcaluma/ember-form-v11.0.0-beta.15) (2022-03-16)
+
+
+### Bug Fixes
+
+* **form:** make sure dynamic options are loaded before validating ([2713b37](https://github.com/projectcaluma/ember-caluma/commit/2713b3718b64f9111ca3e7bec2a6c60fafcb183a))
+
+# [@projectcaluma/ember-form-v11.0.0-beta.14](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-form-v11.0.0-beta.13...@projectcaluma/ember-form-v11.0.0-beta.14) (2022-03-11)
+
+
+### Bug Fixes
+
+* **form:** make sure table controls are always visible ([8cd97d2](https://github.com/projectcaluma/ember-caluma/commit/8cd97d204539f2e84b9baf9841591460bddf145a))
+
+# [@projectcaluma/ember-form-v11.0.0-beta.13](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-form-v11.0.0-beta.12...@projectcaluma/ember-form-v11.0.0-beta.13) (2022-03-11)
+
+
+### Bug Fixes
+
+* **form:** don't refetch dynamic options on validation ([27061c6](https://github.com/projectcaluma/ember-caluma/commit/27061c67f0562508f558305247cb51d615fa36b0))
+* **form:** fix input in date fields ([cf54bf5](https://github.com/projectcaluma/ember-caluma/commit/cf54bf5542e35fd7dbe293a9e22288afae6a517a))
+* **navigation:** exclude static questions from visible fields ([6ebd085](https://github.com/projectcaluma/ember-caluma/commit/6ebd085098df71fab693dec5282ea4b81d5b9836))
+* **workflow:** return case status on complete / skip work-item mutation ([524453c](https://github.com/projectcaluma/ember-caluma/commit/524453c1189b4375ca792fca7d35056b916696f8))
+
+
+### Features
+
+* **form:** support passing component override classes ([9409c7c](https://github.com/projectcaluma/ember-caluma/commit/9409c7cb5901dcdffec1c0294046da64b74b9922))
+
 # [@projectcaluma/ember-form-v11.0.0-beta.12](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-form-v11.0.0-beta.11...@projectcaluma/ember-form-v11.0.0-beta.12) (2022-02-23)
 
 

package/addon/components/cf-field/input/action-button.js

@@ -1,17 +1,7 @@
 import { assert } from "@ember/debug";
 import { action } from "@ember/object";
 import Component from "@glimmer/component";
-import UIkit from "uikit";
-
-async function confirm(text) {
-  try {
-    await UIkit.modal.confirm(text);
-
-    return true;
-  } catch (error) {
-    return false;
-  }
-}
+import { confirm } from "ember-uikit";
 
 export default class CfFieldInputActionButtonComponent extends Component {
   constructor(...args) {

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

@@ -24,6 +24,7 @@
       i18n=this.pikadayTranslations
       value=@field.answer.value
       onSelect=this.onChange
+      parse=this.parseDate
     }}
   />
 {{/if}}

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

@@ -16,6 +16,15 @@ export default class CfFieldInputDateComponent extends Component {
     this.args.onSave(date ? DateTime.fromJSDate(date).toISODate() : null);
   }
 
+  @action
+  parseDate(value) {
+    const date = DateTime.fromFormat(value, "D", {
+      locale: this.intl.primaryLocale,
+    });
+
+    return date.isValid ? date.toJSDate() : null;
+  }
+
   @action
   formatDate(date) {
     return this.intl.formatDate(date, {

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

@@ -29,7 +29,7 @@
               @color="link"
               @onClick={{fn this.edit document}}
               title={{t "caluma.form.edit"}}
-              class="uk-flex-inline uk-margin-small-left"
+              class="uk-flex-inline uk-margin-small-left table-controls"
               data-test-edit-row
             >
               <UkIcon @icon="pencil" />
@@ -40,7 +40,7 @@
                 @color="link"
                 @onClick={{fn (perform this.delete) document}}
                 title={{t "caluma.form.delete"}}
-                class="uk-flex-inline uk-margin-small-left"
+                class="uk-flex-inline uk-margin-small-left table-controls"
                 data-test-delete-row
               >
                 <UkIcon @icon="trash" />

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

@@ -5,22 +5,12 @@ import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { queryManager } from "ember-apollo-client";
 import { dropTask } from "ember-concurrency";
-import UIkit from "uikit";
+import { confirm } from "ember-uikit";
 
 import removeDocumentMutation from "@projectcaluma/ember-form/gql/mutations/remove-document.graphql";
 import saveDocumentMutation from "@projectcaluma/ember-form/gql/mutations/save-document.graphql";
 import { parseDocument } from "@projectcaluma/ember-form/lib/parsers";
 
-async function confirm(text) {
-  try {
-    await UIkit.modal.confirm(text);
-
-    return true;
-  } catch (error) {
-    return false;
-  }
-}
-
 export default class CfFieldInputTableComponent extends Component {
   @service notification;
   @service intl;

package/addon/components/cf-field.hbs

@@ -14,7 +14,10 @@
 
     <div class="uk-flex">
       <div class="uk-width-expand">
-        {{#let (component (get-widget @field.question)) as |FieldComponent|}}
+        {{#let
+          (component (ensure-safe-component (get-widget @field.question)))
+          as |FieldComponent|
+        }}
           <FieldComponent
             @field={{@field}}
             @disabled={{@disabled}}

package/addon/components/cf-field.js

@@ -1,5 +1,5 @@
-import { getOwner } from "@ember/application";
 import { action } from "@ember/object";
+import { macroCondition, isTesting } from "@embroider/macros";
 import Component from "@glimmer/component";
 import { timeout, restartableTask } from "ember-concurrency";
 
@@ -60,11 +60,10 @@ export default class CfFieldComponent extends Component {
    */
   @restartableTask
   *save(value) {
-    const { environment } =
-      getOwner(this).resolveRegistration("config:environment");
-
     /* istanbul ignore next */
-    if (environment !== "test") {
+    if (macroCondition(isTesting())) {
+      // no timeout
+    } else {
       yield timeout(500);
     }
 

package/addon/components/cf-form-wrapper.hbs

@@ -1,6 +1,8 @@
 {{#let
   (component
-    (get-widget @fieldset.field.question @fieldset.form default="cf-form")
+    (ensure-safe-component
+      (get-widget @fieldset.field.question @fieldset.form default="cf-form")
+    )
   )
   as |FormComponent|
 }}

package/addon/helpers/get-widget.js

@@ -1,6 +1,15 @@
 import Helper from "@ember/component/helper";
 import { warn } from "@ember/debug";
 import { inject as service } from "@ember/service";
+import { ensureSafeComponent } from "@embroider/util";
+
+import InputComponent from "@projectcaluma/ember-form/components/cf-field/input";
+import FormComponent from "@projectcaluma/ember-form/components/cf-form";
+
+const DEFAULT_WIDGETS = {
+  "cf-field/input": InputComponent,
+  "cf-form": FormComponent,
+};
 
 /**
  * Helper for getting the right widget.
@@ -42,9 +51,14 @@ export default class GetWidgetHelper extends Helper {
         { id: "ember-caluma.unregistered-override" }
       );
 
-      if (override) return widget;
+      if (override) {
+        return ensureSafeComponent(
+          override.componentClass ?? override.component,
+          this
+        );
+      }
     }
 
-    return defaultWidget;
+    return ensureSafeComponent(DEFAULT_WIDGETS[defaultWidget], this);
   }
 }

package/addon/instance-initializers/form-widget-overrides.js

@@ -0,0 +1,52 @@
+import { setOwner } from "@ember/application";
+import { inject as service } from "@ember/service";
+
+import HiddenComponent from "@projectcaluma/ember-form/components/cf-field/input/hidden";
+import PowerSelectComponent from "@projectcaluma/ember-form/components/cf-field/input/powerselect";
+
+class HiddenOverride {
+  @service intl;
+
+  get label() {
+    return this.intl.t("caluma.form-builder.question.widgetOverrides.hidden");
+  }
+
+  component = "cf-field/input/hidden";
+  componentClass = HiddenComponent;
+}
+
+class PowerSelectOverride {
+  @service intl;
+
+  get label() {
+    return this.intl.t(
+      "caluma.form-builder.question.widgetOverrides.powerselect"
+    );
+  }
+
+  component = "cf-field/input/powerselect";
+  componentClass = PowerSelectComponent;
+  types = [
+    "ChoiceQuestion",
+    "MultipleChoiceQuestion",
+    "DynamicChoiceQuestion",
+    "DynamicMultipleChoiceQuestion",
+  ];
+}
+
+export function initialize(appInstance) {
+  const options = appInstance.lookup("service:caluma-options");
+
+  const hiddenOverride = new HiddenOverride();
+  const powerSelectOverride = new PowerSelectOverride();
+
+  setOwner(hiddenOverride, appInstance);
+  setOwner(powerSelectOverride, appInstance);
+
+  options.registerComponentOverride(hiddenOverride);
+  options.registerComponentOverride(powerSelectOverride);
+}
+
+export default {
+  initialize,
+};

package/addon/lib/field.js

@@ -83,18 +83,12 @@ export default class Field extends Base {
   _createQuestion() {
     const owner = getOwner(this);
 
-    const question =
+    this.question =
       this.calumaStore.find(`Question:${this.raw.question.slug}`) ||
       new (owner.factoryFor("caluma-model:question").class)({
         raw: this.raw.question,
         owner,
       });
-
-    if (question.isDynamic) {
-      question.loadDynamicOptions.perform();
-    }
-
-    this.question = question;
   }
 
   _createAnswer() {
@@ -783,7 +777,7 @@ export default class Field extends Base {
    * @private
    */
   async _validateDynamicChoiceQuestion() {
-    await this.question.loadDynamicOptions.perform();
+    await this.question.dynamicOptions;
 
     return validate("inclusion", this.answer.value, {
       in: (this.options || []).map(({ slug }) => slug),
@@ -805,7 +799,7 @@ export default class Field extends Base {
       return true;
     }
 
-    await this.question.loadDynamicOptions.perform();
+    await this.question.dynamicOptions;
 
     return value.map((value) => {
       return validate("inclusion", value, {

package/addon/lib/navigation.js

@@ -232,7 +232,9 @@ export class NavigationItem extends Base {
   @cached
   get visibleFields() {
     return this.fieldset.fields.filter(
-      (f) => f.questionType !== "FormQuestion" && !f.hidden
+      (f) =>
+        !["FormQuestion", "StaticQuestion"].includes(f.questionType) &&
+        !f.hidden
     );
   }
 

package/addon/lib/question.js

@@ -1,7 +1,8 @@
 import { assert } from "@ember/debug";
 import { camelize } from "@ember/string";
 import { queryManager } from "ember-apollo-client";
-import { dropTask, lastValue } from "ember-concurrency";
+import { dropTask } from "ember-concurrency";
+import { useTask } from "ember-resources";
 import { cached } from "tracked-toolbox";
 
 import getDynamicOptions from "@projectcaluma/ember-form/gql/queries/dynamic-options.graphql";
@@ -71,13 +72,20 @@ export default class Question extends Base {
     );
 
     return (
-      question.node.dynamicChoiceOptions ||
+      question.node.dynamicChoiceOptions ??
       question.node.dynamicMultipleChoiceOptions
     );
   }
 
-  @lastValue("loadDynamicOptions") dynamicChoiceOptions;
-  @lastValue("loadDynamicOptions") dynamicMultipleChoiceOptions;
+  dynamicOptions = useTask(this, this.loadDynamicOptions, () => []);
+
+  get dynamicChoiceOptions() {
+    return this.dynamicOptions.value ?? [];
+  }
+
+  get dynamicMultipleChoiceOptions() {
+    return this.dynamicOptions.value ?? [];
+  }
 
   /**
    * Whether the question is a single choice question

package/app/instance-initializers/form-widget-overrides.js

@@ -0,0 +1,4 @@
+export {
+  default,
+  initialize,
+} from "@projectcaluma/ember-form/instance-initializers/form-widget-overrides";

package/app/styles/@projectcaluma/ember-form.scss

@@ -5,6 +5,11 @@
 
 @import "../uikit-overwrites";
 
+.table-controls > .uk-icon {
+  min-height: 20px;
+  min-width: 20px;
+}
+
 .cf-checkbox_label {
   display: block;
   position: relative;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form",
-  "version": "11.0.0-beta.12",
+  "version": "11.0.0-beta.15",
   "description": "Ember addon for rendering Caluma forms.",
   "keywords": [
     "ember-addon"
@@ -14,10 +14,11 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
+    "@embroider/macros": "^1.5.0",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
-    "@projectcaluma/ember-core": "^11.0.0-beta.4",
-    "ember-apollo-client": "^3.2.0",
+    "@projectcaluma/ember-core": "^11.0.0-beta.5",
+    "ember-apollo-client": "^3.2.1",
     "ember-auto-import": "^2.4.0",
     "ember-autoresize-modifier": "^0.5.0",
     "ember-cli-babel": "^7.26.11",
@@ -31,28 +32,28 @@
     "ember-math-helpers": "^2.18.1",
     "ember-pikaday": "^4.0.0",
     "ember-power-select": "^5.0.4",
-    "ember-resources": "^4.3.3",
-    "ember-uikit": "^5.0.0",
+    "ember-resources": "^4.4.0",
+    "ember-uikit": "^5.1.0",
     "ember-validators": "^4.1.2",
     "graphql": "^15.8.0",
     "jexl": "^2.3.0",
     "lodash.isequal": "^4.5.0",
-    "luxon": "^2.3.0",
+    "luxon": "^2.3.1",
     "tracked-toolbox": "^1.2.3"
   },
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
     "@ember/test-helpers": "2.6.0",
-    "@embroider/test-setup": "1.2.0",
-    "@faker-js/faker": "6.0.0-alpha.7",
-    "@projectcaluma/ember-testing": "11.0.0-beta.3",
-    "@projectcaluma/ember-workflow": "11.0.0-beta.4",
+    "@embroider/test-setup": "1.5.0",
+    "@faker-js/faker": "6.0.0-beta.0",
+    "@projectcaluma/ember-testing": "11.0.0-beta.4",
+    "@projectcaluma/ember-workflow": "11.0.0-beta.5",
     "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-inject-live-reload": "2.1.0",
-    "ember-cli-mirage": "2.4.0",
+    "ember-cli-mirage": "3.0.0-alpha.2",
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
     "ember-disable-prototype-extensions": "1.1.3",
@@ -70,7 +71,7 @@
     "qunit": "2.18.0",
     "qunit-dom": "2.0.0",
     "uuid": "8.3.2",
-    "webpack": "5.69.1"
+    "webpack": "5.70.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"

package/translations/de.yaml

@@ -34,7 +34,6 @@ caluma:
       options-empty: "Keine Optionen vorhanden"
       search-placeholder: "Hier tippen um zu suchen"
       search-empty: "Keine Optionen gefunden"
-      null: "Keine Auswahl"
 
     validation:
       blank: "Dieses Feld darf nicht leer gelassen werden"
@@ -44,6 +43,7 @@ caluma:
       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"
+      deleteFailed: "Beim Löschen ist ein Fehler aufgetreten."
       uploadFailed: "Beim Hochladen ist ein Fehler aufgetreten."
       format: "{errorMsg}"
       table: "Mindestens eine Zeile der Tabelle wurde nicht korrekt ausgefüllt"

package/translations/en.yaml

@@ -34,7 +34,6 @@ caluma:
       options-empty: "No options available"
       search-placeholder: "Type here to search options"
       search-empty: "Search didn't match any options"
-      null: "No selection"
 
     validation:
       blank: "This field can't be blank"
@@ -44,6 +43,7 @@ caluma:
       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"
+      deleteFailed: "An error occured during deletion."
       uploadFailed: "An error occured during upload."
       format: "{errorMsg}"
       table: "At least one row of the table was not filled in correctly"

package/translations/fr.yaml

@@ -34,7 +34,6 @@ caluma:
       options-empty: "Pas d'options disponibles"
       search-placeholder: "Tapez ici pour rechercher"
       search-empty: "Pas d'options trouvées"
-      null: "Aucune sélection"
 
     validation:
       blank: "Ce champ ne doit pas être laissé vide"
@@ -44,6 +43,7 @@ caluma:
       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"
+      deleteFailed: "Une erreur est survenue lors de la suppression."
       uploadFailed: "Une erreur s'est produite pendant le téléchargement."
       format: "{errorMsg}"
       table: "Au moins une ligne du tableau n'a pas été remplie correctement"