@projectcaluma/ember-form 12.0.1 → 12.2.0

package/addon/components/cf-content.js

@@ -121,7 +121,7 @@ export default class CfContentComponent extends Component {
       this.document?.raw.form.slug;
 
     return this.document.fieldsets.find(
-      (fieldset) => fieldset.form.slug === slug
+      (fieldset) => fieldset.form.slug === slug,
     );
   }
 
@@ -140,7 +140,7 @@ export default class CfContentComponent extends Component {
         fetchPolicy: "network-only",
         variables: { id: this.args.documentId },
       },
-      "allDocuments.edges"
+      "allDocuments.edges",
     )).map(({ node }) => node);
 
     const [form] = (yield this.apollo.query(
@@ -149,7 +149,7 @@ export default class CfContentComponent extends Component {
         fetchPolicy: "cache-first",
         variables: { slug: answerDocument.form.slug },
       },
-      "allForms.edges"
+      "allForms.edges",
     )).map(({ node }) => node);
 
     const owner = getOwner(this);

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

@@ -13,7 +13,7 @@ if (macroCondition(dependencySatisfies("@projectcaluma/ember-workflow", ""))) {
 
       assert(
         "The document must have a `workItemUuid` for `<CfField::Input::ActionButton />` to work.",
-        this.args.field.document.workItemUuid
+        this.args.field.document.workItemUuid,
       );
     }
 
@@ -69,7 +69,7 @@ if (macroCondition(dependencySatisfies("@projectcaluma/ember-workflow", ""))) {
       super(...args);
 
       assert(
-        "@projectcaluma/ember-workflow must be installed to enable the usage of the action button questions"
+        "@projectcaluma/ember-workflow must be installed to enable the usage of the action button questions",
       );
     }
   };

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

@@ -27,7 +27,7 @@ export default class CfFieldInputFilesComponent extends Component {
         variables: { id: this.args.field.answer.raw.id },
         fetchPolicy: "network-only",
       },
-      "node.value"
+      "node.value",
     );
     const { downloadUrl } =
       answers.find((file) =>
@@ -35,7 +35,7 @@ export default class CfFieldInputFilesComponent extends Component {
         macroCondition(isTesting())
           ? file.id === fileId ||
             atob(file.id).substring(file.__typename.length + 1) === fileId
-          : file.id === fileId
+          : file.id === fileId,
       ) ?? {};
     if (downloadUrl) {
       window.open(downloadUrl, "_blank");
@@ -60,7 +60,7 @@ export default class CfFieldInputFilesComponent extends Component {
     // trigger save action for file list of old and new files with
     // reduces properties to match gql format
     const { filesValue: savedAnswerValue } = await this.args.onSave(
-      fileList.map(({ name, id }) => ({ name, id }))
+      fileList.map(({ name, id }) => ({ name, id })),
     );
 
     try {
@@ -69,7 +69,7 @@ export default class CfFieldInputFilesComponent extends Component {
         ...savedAnswerValue.find(
           (value) =>
             file.name === value.name &&
-            !fileList.find((file) => file.id === value.id)
+            !fileList.find((file) => file.id === value.id),
         ),
         value: file.value,
       }));

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

@@ -22,7 +22,7 @@ export default class CfFieldInputPowerselectComponent extends Component {
   get selectComponent() {
     return ensureSafeComponent(
       this.multiple ? PowerSelectMultipleComponent : PowerSelectComponent,
-      this
+      this,
     );
   }
 

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

@@ -28,7 +28,7 @@ export default class CfFieldInputTableComponent extends Component {
 
   get questions() {
     return this.args.field.question.raw.rowForm.questions.edges.map(
-      (edge) => edge.node
+      (edge) => edge.node,
     );
   }
 
@@ -37,7 +37,7 @@ export default class CfFieldInputTableComponent extends Component {
 
     if (config?.length) {
       return this.questions.filter((question) =>
-        config.includes(question.slug)
+        config.includes(question.slug),
       );
     }
 
@@ -53,7 +53,7 @@ export default class CfFieldInputTableComponent extends Component {
           input: { form: this.args.field.question.raw.rowForm.slug },
         },
       },
-      "saveDocument.document"
+      "saveDocument.document",
     );
 
     const owner = getOwner(this);
@@ -75,7 +75,7 @@ export default class CfFieldInputTableComponent extends Component {
     }
 
     const remainingDocuments = this.args.field.answer.value.filter(
-      (doc) => doc.pk !== document.pk
+      (doc) => doc.pk !== document.pk,
     );
 
     yield this.args.onSave(remainingDocuments);
@@ -104,7 +104,7 @@ export default class CfFieldInputTableComponent extends Component {
         yield this.args.onSave([...rows, newDocument]);
 
         this.notification.success(
-          this.intl.t("caluma.form.notification.table.add.success")
+          this.intl.t("caluma.form.notification.table.add.success"),
         );
       }
 
@@ -113,7 +113,7 @@ export default class CfFieldInputTableComponent extends Component {
       yield this.close.perform();
     } catch (e) {
       this.notification.danger(
-        this.intl.t("caluma.form.notification.table.add.error")
+        this.intl.t("caluma.form.notification.table.add.error"),
       );
     }
   }

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

@@ -15,7 +15,7 @@ export default class CfFieldValueComponent extends Component {
         variables: { id: this.args.field.answer.raw.id },
         fetchPolicy: "network-only",
       },
-      "node.value"
+      "node.value",
     );
 
     const { downloadUrl } = files?.find((file) => file.id === id) ?? {};

package/addon/components/cf-field.js

@@ -51,7 +51,7 @@ export default class CfFieldComponent extends Component {
       this.args.field?.question,
       "action-button",
       "static",
-      "form"
+      "form",
     );
   }
 

package/addon/helpers/get-widget.js

@@ -48,13 +48,13 @@ export default class GetWidgetHelper extends Helper {
       warn(
         `Widget override "${widget}" is not registered. Please register it by calling \`calumaOptions.registerComponentOverride\``,
         override,
-        { id: "ember-caluma.unregistered-override" }
+        { id: "ember-caluma.unregistered-override" },
       );
 
       if (override) {
         return ensureSafeComponent(
           override.componentClass ?? override.component,
-          this
+          this,
         );
       }
     }

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

@@ -20,7 +20,7 @@ class PowerSelectOverride {
 
   get label() {
     return this.intl.t(
-      "caluma.form-builder.question.widgetOverrides.powerselect"
+      "caluma.form-builder.question.widgetOverrides.powerselect",
     );
   }
 

package/addon/lib/answer.js

@@ -21,7 +21,7 @@ class DedupedTrackedObject {
       Object.defineProperty(
         this,
         key,
-        dedupeTracked(this, key, { initializer: () => value })
+        dedupeTracked(this, key, { initializer: () => value }),
       );
     });
   }
@@ -38,7 +38,7 @@ export default class Answer extends Base {
 
     assert(
       "A graphql answer `raw` must be passed",
-      /Answer$/.test(raw?.__typename)
+      /Answer$/.test(raw?.__typename),
     );
 
     super({ raw, ...args });
@@ -128,7 +128,7 @@ export default class Answer extends Base {
         if (document instanceof Document) return document;
 
         const existing = this.calumaStore.find(
-          `Document:${decodeId(document.id)}`
+          `Document:${decodeId(document.id)}`,
         );
 
         return (

package/addon/lib/dependencies.js

@@ -16,19 +16,19 @@ import { getAST, getTransforms } from "@projectcaluma/ember-core/utils/jexl";
 export function getDependenciesFromJexl(jexl, expression) {
   const allTransforms = getTransforms(getAST(jexl, expression));
   const answerTransforms = allTransforms.filter(
-    (transform) => transform.name === "answer"
+    (transform) => transform.name === "answer",
   );
   const mapbyTransforms = allTransforms.filter(
     (transform) =>
       transform.name === "mapby" &&
       transform.args[0].type === "FunctionCall" &&
-      transform.args[0].name === "answer"
+      transform.args[0].name === "answer",
   );
   const stringifyTransforms = allTransforms.filter(
     (transform) =>
       transform.name === "stringify" &&
       transform.args[0].type === "FunctionCall" &&
-      transform.args[0].name === "answer"
+      transform.args[0].name === "answer",
   );
 
   return [
@@ -41,7 +41,7 @@ export function getDependenciesFromJexl(jexl, expression) {
         return childKeys.map((key) => `${parentKey}.${key}`);
       }),
       ...stringifyTransforms.map(
-        (transform) => `${transform.args[0].args[0].value}.__all__`
+        (transform) => `${transform.args[0].args[0].value}.__all__`,
       ),
     ]),
   ];

package/addon/lib/document.js

@@ -5,7 +5,11 @@ import jexl from "jexl";
 import { cached } from "tracked-toolbox";
 
 import { decodeId } from "@projectcaluma/ember-core/helpers/decode-id";
-import { intersects, mapby } from "@projectcaluma/ember-core/utils/jexl";
+import {
+  intersects,
+  mapby,
+  flatten,
+} from "@projectcaluma/ember-core/utils/jexl";
 import Base from "@projectcaluma/ember-form/lib/base";
 
 const onlyNumbers = (nums) =>
@@ -21,7 +25,7 @@ export default class Document extends Base {
   constructor({ raw, parentDocument, dataSourceContext, ...args }) {
     assert(
       "A graphql document `raw` must be passed",
-      raw?.__typename === "Document"
+      raw?.__typename === "Document",
     );
 
     super({ raw, ...args });
@@ -58,7 +62,7 @@ export default class Document extends Base {
             raw: { form, answers: this.raw.answers },
             document: this,
             owner,
-          })
+          }),
       );
     });
   }
@@ -120,7 +124,7 @@ export default class Document extends Base {
     const rawId =
       this.raw.workItem?.id ||
       this.raw.case?.workItems.edges.find(
-        (edge) => edge.node.task.__typename === "CompleteWorkflowFormTask"
+        (edge) => edge.node.task.__typename === "CompleteWorkflowFormTask",
       )?.node.id;
 
     return rawId ? decodeId(rawId) : null;
@@ -145,8 +149,11 @@ export default class Document extends Base {
   get jexl() {
     const documentJexl = new jexl.Jexl();
 
+    // WARNING: When adding a new transform or operator, make sure to add it in
+    // `packages/form-builder/addon/validators/jexl.js` as well for the
+    // validation in the form builder.
     documentJexl.addTransform("answer", (slug, defaultValue) =>
-      this.findAnswer(slug, defaultValue)
+      this.findAnswer(slug, defaultValue),
     );
     documentJexl.addTransform("mapby", mapby);
     documentJexl.addBinaryOp("intersects", 20, intersects);
@@ -166,13 +173,13 @@ export default class Document extends Base {
     documentJexl.addTransform("round", (num, places = 0) =>
       !onlyNumbers([num]).length
         ? null
-        : Math.round(num * Math.pow(10, places)) / Math.pow(10, places)
+        : Math.round(num * Math.pow(10, places)) / Math.pow(10, places),
     );
     documentJexl.addTransform("ceil", (num) =>
-      !onlyNumbers([num]).length ? null : Math.ceil(num)
+      !onlyNumbers([num]).length ? null : Math.ceil(num),
     );
     documentJexl.addTransform("floor", (num) =>
-      !onlyNumbers([num]).length ? null : Math.floor(num)
+      !onlyNumbers([num]).length ? null : Math.floor(num),
     );
     documentJexl.addTransform("sum", (arr) => sum(onlyNumbers(arr)));
     documentJexl.addTransform("avg", (arr) => {
@@ -180,6 +187,7 @@ export default class Document extends Base {
       return nums.length ? sum(nums) / nums.length : null;
     });
     documentJexl.addTransform("stringify", (input) => JSON.stringify(input));
+    documentJexl.addTransform("flatten", flatten);
 
     return documentJexl;
   }
@@ -229,7 +237,7 @@ export default class Document extends Base {
         ...answerMap,
         [field.question.slug]: field.value,
       }),
-      {}
+      {},
     );
   }
 
@@ -264,7 +272,7 @@ export default class Document extends Base {
               ...obj,
               [tableField.question.slug]: tableField.value,
             };
-          }, {})
+          }, {}),
       );
     }
 
@@ -279,7 +287,7 @@ export default class Document extends Base {
    */
   findField(slug) {
     return [...this.fields, ...(this.parentDocument?.fields ?? [])].find(
-      (field) => field.question.slug === slug
+      (field) => field.question.slug === slug,
     );
   }
 }

package/addon/lib/field.js

@@ -283,7 +283,7 @@ export default class Field extends Base {
     try {
       return this.document.jexl.evalSync(
         this.question.raw.calcExpression,
-        this.jexlContext
+        this.jexlContext,
       );
     } catch (error) {
       return null;
@@ -311,7 +311,7 @@ export default class Field extends Base {
           question: this.question.slug,
         },
       },
-      "allUsedDynamicOptions.edges"
+      "allUsedDynamicOptions.edges",
     );
 
     return edges.map(({ node: { slug, label } }) => ({
@@ -352,11 +352,11 @@ export default class Field extends Base {
       (this.question.isMultipleChoice ? this.value : [this.value]) || [];
 
     const options = this.question.options.filter(
-      (option) => !option.disabled || selected.includes(option.slug)
+      (option) => !option.disabled || selected.includes(option.slug),
     );
 
     const hasUnknownValue = !selected.every((slug) =>
-      options.find((option) => option.slug === slug)
+      options.find((option) => option.slug === slug),
     );
 
     if (this.question.isDynamic && hasUnknownValue) {
@@ -399,7 +399,7 @@ export default class Field extends Base {
     const selected = this.options.filter(({ slug }) =>
       this.question.isMultipleChoice
         ? (this.value || []).includes(slug)
-        : this.value === slug
+        : this.value === slug,
     );
 
     return this.question.isMultipleChoice ? selected : selected[0];
@@ -491,11 +491,11 @@ export default class Field extends Base {
     try {
       return this.document.jexl.evalSync(
         this.question.raw.isHidden,
-        this.jexlContext
+        this.jexlContext,
       );
     } catch (error) {
       throw new Error(
-        `Error while evaluating \`isHidden\` expression on field \`${this.pk}\`: ${error.message}`
+        `Error while evaluating \`isHidden\` expression on field \`${this.pk}\`: ${error.message}`,
       );
     }
   }
@@ -526,11 +526,11 @@ export default class Field extends Base {
     try {
       return !this.document.jexl.evalSync(
         this.question.raw.isRequired,
-        this.jexlContext
+        this.jexlContext,
       );
     } catch (error) {
       throw new Error(
-        `Error while evaluating \`isRequired\` expression on field \`${this.pk}\`: ${error.message}`
+        `Error while evaluating \`isRequired\` expression on field \`${this.pk}\`: ${error.message}`,
       );
     }
   }
@@ -569,7 +569,7 @@ export default class Field extends Base {
         mutation: MUTATION_MAP[type],
         variables: { input },
       },
-      `saveDocument${type}.answer`
+      `saveDocument${type}.answer`,
     );
 
     const wasNew = this.isNew;
@@ -613,7 +613,7 @@ export default class Field extends Base {
 
     assert(
       `Missing validation function for ${this.questionType}`,
-      specificValidation
+      specificValidation,
     );
 
     const validationFns = [
@@ -626,7 +626,7 @@ export default class Field extends Base {
         const res = await fn.call(this);
 
         return Array.isArray(res) ? res : [res];
-      })
+      }),
     ))
       .reduce((arr, e) => [...arr, ...e], []) // flatten the array
       .filter((e) => typeof e === "object");
@@ -861,11 +861,11 @@ export default class Field extends Base {
             await field.validate.perform();
 
             return field.isValid;
-          })
+          }),
         );
 
         return validFields.every(Boolean);
-      })
+      }),
     );
 
     return (

package/addon/lib/fieldset.js

@@ -16,11 +16,11 @@ export default class Fieldset extends Base {
 
     assert(
       "A graphql form `raw.form` must be passed",
-      raw?.form?.__typename === "Form"
+      raw?.form?.__typename === "Form",
     );
     assert(
       "A collection of graphql answers `raw.answers` must be passed",
-      raw?.answers?.every((answer) => /Answer$/.test(answer.__typename))
+      raw?.answers?.every((answer) => /Answer$/.test(answer.__typename)),
     );
 
     super({ raw, ...args });
@@ -53,18 +53,18 @@ export default class Fieldset extends Base {
       return associateDestroyableChild(
         this,
         this.calumaStore.find(
-          `${this.document.pk}:Question:${question.slug}`
+          `${this.document.pk}:Question:${question.slug}`,
         ) ||
           new (owner.factoryFor("caluma-model:field").class)({
             raw: {
               question,
               answer: this.raw.answers.find(
-                (answer) => answer?.question?.slug === question.slug
+                (answer) => answer?.question?.slug === question.slug,
               ),
             },
             fieldset: this,
             owner,
-          })
+          }),
       );
     });
 

package/addon/lib/navigation.js

@@ -81,7 +81,7 @@ export class NavigationItem extends Base {
   @cached
   get children() {
     return this.navigation.items.filter(
-      (item) => item._parentSlug === this.slug
+      (item) => item._parentSlug === this.slug,
     );
   }
 
@@ -162,7 +162,7 @@ export class NavigationItem extends Base {
     return (
       (this.fieldset.field === undefined || !this.fieldset.field.hidden) &&
       this.fieldset.fields.some(
-        (field) => field.questionType !== "FormQuestion" && !field.hidden
+        (field) => field.questionType !== "FormQuestion" && !field.hidden,
       )
     );
   }
@@ -234,7 +234,7 @@ export class NavigationItem extends Base {
     return this.fieldset.fields.filter(
       (f) =>
         !["FormQuestion", "StaticQuestion"].includes(f.questionType) &&
-        !f.hidden
+        !f.hidden,
     );
   }
 
@@ -343,7 +343,7 @@ export class Navigation extends Base {
             fieldset,
             navigation: this,
             owner,
-          })
+          }),
       );
     });
 

package/addon/lib/parsers.js

@@ -3,7 +3,7 @@ import { assert } from "@ember/debug";
 export const parseDocument = (response) => {
   assert(
     "The passed document must be a GraphQL document",
-    response.__typename === "Document"
+    response.__typename === "Document",
   );
   assert("The passed document must include a form", response.form);
   assert("The passed document must include answers", response.answers);
@@ -19,7 +19,7 @@ export const parseDocument = (response) => {
 export const parseForm = (response) => {
   assert(
     "The passed form must be a GraphQL form",
-    response.__typename === "Form"
+    response.__typename === "Form",
   );
 
   return {
@@ -45,7 +45,7 @@ export const parseFormTree = (response) => {
 export const parseAnswer = (response) => {
   assert(
     "The passed answer must be a GraphQL answer",
-    /Answer$/.test(response.__typename)
+    /Answer$/.test(response.__typename),
   );
 
   return { ...response };
@@ -54,7 +54,7 @@ export const parseAnswer = (response) => {
 export const parseQuestion = (response) => {
   assert(
     "The passed question must be a GraphQL question",
-    /Question$/.test(response.__typename)
+    /Question$/.test(response.__typename),
   );
 
   return { ...response };

package/addon/lib/question.js

@@ -22,7 +22,7 @@ export default class Question extends Base {
   constructor({ raw, ...args }) {
     assert(
       "A graphql question `raw` must be passed",
-      /Question$/.test(raw?.__typename)
+      /Question$/.test(raw?.__typename),
     );
 
     super({ raw, ...args });
@@ -64,7 +64,7 @@ export default class Question extends Base {
             : null,
         },
       },
-      "allQuestions.edges"
+      "allQuestions.edges",
     );
 
     return (
@@ -153,7 +153,7 @@ export default class Question extends Base {
   @cached
   get defaultValue() {
     const key = camelize(
-      this.raw.__typename.replace(/Question$/, "DefaultAnswer")
+      this.raw.__typename.replace(/Question$/, "DefaultAnswer"),
     );
 
     const value = this.raw[key]?.value;
@@ -167,7 +167,7 @@ export default class Question extends Base {
               [answer.question.slug]: getValue(answer),
             };
           },
-          {}
+          {},
         );
       });
     }

package/addon/services/caluma-store.js

@@ -12,14 +12,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.pk,
     );
 
     const existing = this._store.get(obj.pk);
 
     if (existing) {
       debug(
-        `Object with the pk \`${obj.pk}\` already exists in the store. It will be updated.`
+        `Object with the pk \`${obj.pk}\` already exists in the store. It will be updated.`,
       );
 
       set(existing, "raw", obj.raw);

package/app/styles/_cf-navigation.scss

@@ -17,7 +17,9 @@ $icon-size: 0.8rem !default;
       width: $icon-size;
       color: color.adjust($global-border, $lightness: -40%);
       border: 1px solid color.adjust($global-border, $lightness: -10%);
-      transition: color 500ms ease, border 500ms ease;
+      transition:
+        color 500ms ease,
+        border 500ms ease;
 
       &::before {
         position: absolute;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form",
-  "version": "12.0.1",
+  "version": "12.2.0",
   "description": "Ember addon for rendering Caluma forms.",
   "keywords": [
     "ember-addon"
@@ -10,8 +10,8 @@
   "repository": "github:projectcaluma/ember-caluma",
   "dependencies": {
     "@ember/string": "^3.1.1",
-    "@embroider/macros": "^1.11.1",
-    "@embroider/util": "^1.11.1",
+    "@embroider/macros": "^1.12.3",
+    "@embroider/util": "^1.11.2",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "ember-apollo-client": "~4.0.2",
@@ -19,16 +19,16 @@
     "ember-autoresize-modifier": "^0.7.0",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-htmlbars": "^6.2.0",
-    "ember-cli-showdown": "^6.0.1",
+    "ember-cli-showdown": "^7.0.0",
     "ember-composable-helpers": "^5.0.0",
-    "ember-concurrency": "^2.3.7",
+    "ember-concurrency": "^3.0.0",
     "ember-fetch": "^8.1.2",
     "ember-flatpickr": "^4.0.0",
     "ember-in-viewport": "^4.1.0",
     "ember-intl": "^5.7.2",
     "ember-math-helpers": "^3.0.0",
-    "ember-power-select": "^7.0.0",
-    "ember-resources": "^5.6.4",
+    "ember-power-select": "^7.1.0",
+    "ember-resources": "^6.2.2",
     "ember-uikit": "^8.0.0",
     "ember-validators": "^4.1.2",
     "graphql": "^15.8.0",
@@ -36,11 +36,11 @@
     "lodash.isequal": "^4.5.0",
     "luxon": "^3.3.0",
     "tracked-toolbox": "^2.0.0",
-    "@projectcaluma/ember-core": "^12.0.1"
+    "@projectcaluma/ember-core": "^12.2.0"
   },
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
-    "@ember/test-helpers": "3.1.0",
+    "@ember/test-helpers": "3.2.0",
     "@embroider/test-setup": "3.0.1",
     "@faker-js/faker": "8.0.2",
     "broccoli-asset-rev": "3.0.0",
@@ -54,22 +54,22 @@
     "ember-load-initializers": "2.1.2",
     "ember-qunit": "7.0.0",
     "ember-resolver": "10.1.1",
-    "ember-source": "4.12.0",
+    "ember-source": "4.12.3",
     "ember-source-channel-url": "3.0.0",
     "ember-try": "2.0.0",
     "loader.js": "4.7.0",
     "miragejs": "0.1.47",
     "qunit": "2.19.4",
     "qunit-dom": "2.0.0",
-    "uikit": "3.16.21",
+    "uikit": "3.16.22",
     "uuid": "9.0.0",
-    "webpack": "5.87.0",
-    "@projectcaluma/ember-testing": "12.0.1",
-    "@projectcaluma/ember-workflow": "12.0.1"
+    "webpack": "5.88.2",
+    "@projectcaluma/ember-testing": "12.2.0",
+    "@projectcaluma/ember-workflow": "12.2.0"
   },
   "peerDependencies": {
     "ember-source": "^4.0.0",
-    "@projectcaluma/ember-workflow": "^12.0.1"
+    "@projectcaluma/ember-workflow": "^12.2.0"
   },
   "peerDependenciesMeta": {
     "@projectcaluma/ember-workflow": {