@projectcaluma/ember-form-builder 14.1.0 → 14.2.0

package/addon/components/cfb-form-editor/copy-modal.js

@@ -54,7 +54,7 @@ export default class CfbFormEditorCopyModal extends Component {
       );
 
       this.router.transitionTo("edit", changeset.slug);
-    } catch (e) {
+    } catch {
       this.notification.danger(
         this.intl.t("caluma.form-builder.notification.form.create.error"),
       );

package/addon/components/cfb-form-editor/general.js

@@ -87,7 +87,7 @@ export default class CfbFormEditorGeneral extends Component {
       );
 
       this.args.onAfterSubmit?.(form);
-    } catch (e) {
+    } catch {
       this.notification.danger(
         this.intl.t(
           `caluma.form-builder.notification.form.${

package/addon/components/cfb-form-editor/question/options.js

@@ -45,7 +45,7 @@ export default class CfbFormEditorQuestionOptions extends Component {
           "caluma.form-builder.notification.form.reorder-options.success",
         ),
       );
-    } catch (e) {
+    } catch {
       this.notification.danger(
         this.intl.t(
           "caluma.form-builder.notification.form.reorder-options.error",

package/addon/components/cfb-form-editor/question-list/item.js

@@ -2,10 +2,11 @@ import { action } from "@ember/object";
 import { guidFor } from "@ember/object/internals";
 import { service } from "@ember/service";
 import Component from "@glimmer/component";
-import jexl from "jexl";
 
 import { hasQuestionType } from "@projectcaluma/ember-core/helpers/has-question-type";
 
+const cleanJexl = (expr) => expr.replace(/\s/g, "");
+
 export default class CfbFormEditorQuestionListItem extends Component {
   @service router;
 
@@ -14,33 +15,31 @@ export default class CfbFormEditorQuestionListItem extends Component {
   }
 
   get required() {
-    try {
-      return jexl.evalSync(this.args.question?.isRequired);
-    } catch (error) {
-      return this.args.question?.isRequired;
-    }
+    return this.requiredType !== "not-required";
   }
 
   get requiredType() {
-    const required = this.required;
-    return required === true
+    const required = cleanJexl(this.args.question?.isRequired ?? "");
+
+    return required === "true"
       ? "required"
-      : required
-        ? "conditional"
-        : "not-required";
+      : required === "false"
+        ? "not-required"
+        : "conditional";
   }
 
   get hidden() {
-    try {
-      return jexl.evalSync(this.args.question?.isHidden);
-    } catch (error) {
-      return this.args.question?.isHidden;
-    }
+    return this.hiddenType !== "not-hidden";
   }
 
   get hiddenType() {
-    const hidden = this.hidden;
-    return hidden === true ? "hidden" : hidden ? "conditional" : "not-hidden";
+    const hidden = cleanJexl(this.args.question?.isHidden ?? "");
+
+    return hidden === "true"
+      ? "hidden"
+      : hidden === "false"
+        ? "not-hidden"
+        : "conditional";
   }
 
   get showFormLink() {

package/addon/components/cfb-form-editor/question-list.js

@@ -120,7 +120,7 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
           "caluma.form-builder.notification.form.reorder-questions.success",
         ),
       );
-    } catch (e) {
+    } catch {
       this.notification.danger(
         this.intl.t(
           "caluma.form-builder.notification.form.reorder-questions.error",
@@ -154,7 +154,7 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
       this.questionTask.perform();
 
       this.args.onAfterAddQuestion?.(question);
-    } catch (e) {
+    } catch {
       this.notification.danger(
         this.intl.t("caluma.form-builder.notification.form.add-question.error"),
       );
@@ -182,7 +182,7 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
       );
 
       this.args.onAfterRemoveQuestion?.(question);
-    } catch (e) {
+    } catch {
       this.notification.danger(
         this.intl.t(
           "caluma.form-builder.notification.form.remove-question.error",

package/addon/components/cfb-form-editor/question-usage.js

@@ -22,7 +22,7 @@ export default class CfbFormEditorQuestionUsage extends Component {
   }
 
   get otherForms() {
-    return this.forms.value?.length - 1 ?? 0;
+    return (this.forms.value?.length ?? 1) - 1;
   }
 
   forms = trackedFunction(this, async () => {

package/addon/components/cfb-form-editor/question.js

@@ -445,7 +445,6 @@ export default class CfbFormEditorQuestion extends Component {
 
       this.args.onAfterSubmit?.(question);
     } catch (e) {
-      // eslint-disable-next-line no-console
       console.error(e);
       this.notification.danger(
         this.intl.t("caluma.form-builder.notification.question.save.error"),

package/addon/validators/slug.js

@@ -95,7 +95,7 @@ export class SlugUniquenessValidator {
       } else if (this.type === "option") {
         count = response.allQuestions.edges[0].node.options.totalCount;
       }
-    } catch (error) {
+    } catch {
       // do nothing, which will result in count being Infinity which will return
       // a validation error
     }

package/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
-// eslint-disable-next-line n/no-unpublished-require
 const { buildEngine } = require("ember-engines/lib/engine-addon");
 
 module.exports = buildEngine({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form-builder",
-  "version": "14.1.0",
+  "version": "14.2.0",
   "description": "Ember engine for building Caluma forms.",
   "keywords": [
     "ember-addon",
@@ -48,8 +48,8 @@
     "lodash.isequal": "^4.5.0",
     "reactiveweb": "^1.3.0",
     "uikit": "^3.22.0",
-    "@projectcaluma/ember-core": "^14.1.0",
-    "@projectcaluma/ember-form": "^14.1.0"
+    "@projectcaluma/ember-form": "^14.2.0",
+    "@projectcaluma/ember-core": "^14.2.0"
   },
   "//": [
     "TODO: remove obsolete dependency to `ember-data` which is only necessary",
@@ -61,7 +61,7 @@
     "@ember/optional-features": "2.2.0",
     "@ember/test-helpers": "4.0.4",
     "@embroider/test-setup": "4.0.0",
-    "@faker-js/faker": "9.4.0",
+    "@faker-js/faker": "9.7.0",
     "broccoli-asset-rev": "3.0.0",
     "ember-autoresize-modifier": "0.7.0",
     "ember-cli": "6.1.0",
@@ -72,20 +72,20 @@
     "ember-cli-mirage": "3.0.4",
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
-    "ember-data": "5.3.9",
-    "ember-engines": "0.11.0",
-    "ember-qunit": "9.0.1",
+    "ember-data": "5.5.0",
+    "ember-engines": "0.12.0",
+    "ember-qunit": "9.0.2",
     "ember-sinon-qunit": "7.5.0",
     "ember-source": "6.1.0",
     "ember-source-channel-url": "3.0.0",
-    "ember-try": "3.0.0",
+    "ember-try": "4.0.0",
     "loader.js": "4.7.0",
     "miragejs": "0.1.48",
-    "qunit": "2.23.1",
+    "qunit": "2.24.1",
     "qunit-dom": "3.4.0",
-    "sinon": "19.0.2",
-    "webpack": "5.97.1",
-    "@projectcaluma/ember-testing": "14.1.0"
+    "sinon": "20.0.0",
+    "webpack": "5.99.8",
+    "@projectcaluma/ember-testing": "14.2.0"
   },
   "peerDependencies": {
     "ember-engines": "^0.11.0",