@projectcaluma/ember-form 14.0.0 → 14.1.0

package/addon/gql/fragments/field.graphql

@@ -73,6 +73,7 @@ fragment SimpleQuestion on Question {
           slug
           label
           isArchived
+          isHidden
         }
       }
     }
@@ -90,6 +91,7 @@ fragment SimpleQuestion on Question {
           slug
           label
           isArchived
+          isHidden
         }
       }
     }

package/addon/lib/field.js

@@ -339,7 +339,10 @@ export default class Field extends Base {
    * - DynamicMultipleChoiceQuestion
    *
    * This will also return the disabled state of the option. An option can only
-   * be disabled, if it is an old value used in a dynamic question.
+   * be disabled in any of the following cases:
+   * - it is a dynamic option which is no longer available
+   * - the option has been removed from the form using the form builder
+   * - the option is no longer visible due to its JEXL
    *
    * @property {null|Object[]} options
    */
@@ -352,9 +355,39 @@ export default class Field extends Base {
     const selected =
       (this.question.isMultipleChoice ? this.value : [this.value]) || [];
 
-    const options = this.question.options.filter(
-      (option) => !option.disabled || selected.includes(option.slug),
-    );
+    const options = this.question.options
+      .filter((option) => !option.disabled || selected.includes(option.slug))
+      .map((option) => {
+        if (!option.isHidden) {
+          return option;
+        }
+
+        try {
+          const isHidden = this.document.jexl.evalSync(
+            option.isHidden,
+            this.jexlContext,
+          );
+
+          if (selected.includes(option.slug) && isHidden) {
+            return {
+              ...option,
+              _isHidden: isHidden,
+              disabled: true,
+            };
+          }
+          return {
+            ...option,
+            _isHidden: isHidden,
+          };
+        } catch (error) {
+          throw new Error(
+            `Error while evaluating \`isHidden\` expression on Option\`${option.slug}\`: ${error.message}`,
+          );
+        }
+      })
+      .filter(
+        ({ _isHidden, disabled }) => !_isHidden || (_isHidden && disabled),
+      );
 
     const hasUnknownValue = !selected.every((slug) =>
       options.find((option) => option.slug === slug),

package/addon/lib/question.js

@@ -141,11 +141,14 @@ export default class Question extends Base {
     const key = camelize(this.raw.__typename.replace(/Question$/, "Options"));
     const raw = this.isDynamic ? this[key] : this.raw[key];
 
-    return (raw?.edges || []).map(({ node: { label, slug, isArchived } }) => ({
-      label,
-      slug,
-      disabled: isArchived || false,
-    }));
+    return (raw?.edges || []).map(
+      ({ node: { label, slug, isArchived, isHidden } }) => ({
+        label,
+        slug,
+        disabled: isArchived || false,
+        isHidden,
+      }),
+    );
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form",
-  "version": "14.0.0",
+  "version": "14.1.0",
   "description": "Ember addon for rendering Caluma forms.",
   "keywords": [
     "ember-addon"
@@ -41,13 +41,13 @@
     "luxon": "^3.5.0",
     "reactiveweb": "^1.3.0",
     "tracked-toolbox": "^2.0.0",
-    "@projectcaluma/ember-core": "^14.0.0"
+    "@projectcaluma/ember-core": "^14.1.0"
   },
   "devDependencies": {
     "@ember/optional-features": "2.2.0",
     "@ember/test-helpers": "4.0.4",
     "@embroider/test-setup": "4.0.0",
-    "@faker-js/faker": "9.3.0",
+    "@faker-js/faker": "9.4.0",
     "broccoli-asset-rev": "3.0.0",
     "ember-cli": "6.1.0",
     "ember-cli-clean-css": "3.0.0",
@@ -72,12 +72,12 @@
     "uikit": "3.22.0",
     "uuid": "11.0.5",
     "webpack": "5.97.1",
-    "@projectcaluma/ember-workflow": "14.0.0",
-    "@projectcaluma/ember-testing": "14.0.0"
+    "@projectcaluma/ember-workflow": "14.1.0",
+    "@projectcaluma/ember-testing": "14.1.0"
   },
   "peerDependencies": {
     "ember-source": ">= 4.0.0",
-    "@projectcaluma/ember-workflow": "^14.0.0"
+    "@projectcaluma/ember-workflow": "^14.1.0"
   },
   "dependenciesMeta": {
     "@projectcaluma/ember-core": {