@projectcaluma/ember-form-builder 12.1.0 → 12.3.0

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

@@ -46,7 +46,7 @@ export default class CfbFormEditorGeneral extends Component {
         variables: { slug: this.args.slug },
         fetchPolicy: "cache-and-network",
       },
-      "allForms.edges"
+      "allForms.edges",
     );
   }
 
@@ -72,15 +72,15 @@ export default class CfbFormEditorGeneral extends Component {
             },
           },
         },
-        "saveForm.form"
+        "saveForm.form",
       );
 
       this.notification.success(
         this.intl.t(
           `caluma.form-builder.notification.form.${
             this.args.slug ? "save" : "create"
-          }.success`
-        )
+          }.success`,
+        ),
       );
 
       this.args.onAfterSubmit?.(form);
@@ -89,8 +89,8 @@ export default class CfbFormEditorGeneral extends Component {
         this.intl.t(
           `caluma.form-builder.notification.form.${
             this.args.slug ? "save" : "create"
-          }.error`
-        )
+          }.error`,
+        ),
       );
     }
   }

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

@@ -30,11 +30,13 @@ export default class CfbFormEditorQuestionDefault extends Component {
 
     if (
       ["ChoiceQuestion", "MultipleChoiceQuestion"].includes(
-        this.args.model.__typename
+        this.args.model.__typename,
       )
     ) {
-      // Use Power Select for choice questions to save space.
-      raw.meta = { widgetOverride: "cf-field/input/powerselect" };
+      if (!this.args.disableChoicePowerselectOverride) {
+        // Use Power Select for choice questions to save space.
+        raw.meta = { widgetOverride: "cf-field/input/powerselect" };
+      }
 
       const key = this.args.model.__typename
         .replace(/^./, (match) => match.toLowerCase())

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

@@ -42,14 +42,14 @@ export default class CfbFormEditorQuestionOptions extends Component {
 
       this.notification.success(
         this.intl.t(
-          "caluma.form-builder.notification.form.reorder-options.success"
-        )
+          "caluma.form-builder.notification.form.reorder-options.success",
+        ),
       );
     } catch (e) {
       this.notification.danger(
         this.intl.t(
-          "caluma.form-builder.notification.form.reorder-options.error"
-        )
+          "caluma.form-builder.notification.form.reorder-options.error",
+        ),
       );
     }
   }
@@ -68,7 +68,7 @@ export default class CfbFormEditorQuestionOptions extends Component {
           question: this.args.model.slug,
         },
         lookupValidator(OptionValidations),
-        OptionValidations
+        OptionValidations,
       ),
     ]);
 
@@ -103,7 +103,7 @@ export default class CfbFormEditorQuestionOptions extends Component {
     const options = [...sortable.$el.children].slice(0, -1);
 
     this.reorderOptions.perform(
-      options.map((option) => option.firstElementChild.firstElementChild.id)
+      options.map((option) => option.firstElementChild.firstElementChild.id),
     );
   }
 }

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

@@ -16,8 +16,8 @@ export default class CfbFormEditorQuestionValidation extends Component {
   get selected() {
     return this.validators.filter((validator) =>
       (this.args.value?.edges.map((edge) => edge.node.slug) || []).includes(
-        validator.slug
-      )
+        validator.slug,
+      ),
     );
   }
 
@@ -27,7 +27,7 @@ export default class CfbFormEditorQuestionValidation extends Component {
   *fetchFormatValidators() {
     return yield this.apollo.watchQuery(
       { query: allFormatValidatorsQuery, fetchPolicy: "cache-and-network" },
-      "allFormatValidators.edges"
+      "allFormatValidators.edges",
     );
   }
 

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

@@ -77,7 +77,7 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
           },
           fetchPolicy: "network-only",
         },
-        "allQuestions"
+        "allQuestions",
       );
 
       this.cursor = questions.pageInfo.endCursor;
@@ -97,7 +97,7 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
         },
         fetchPolicy: "cache-and-network",
       },
-      "allForms.edges"
+      "allForms.edges",
     );
   }
 
@@ -117,14 +117,14 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
 
       this.notification.success(
         this.intl.t(
-          "caluma.form-builder.notification.form.reorder-questions.success"
-        )
+          "caluma.form-builder.notification.form.reorder-questions.success",
+        ),
       );
     } catch (e) {
       this.notification.danger(
         this.intl.t(
-          "caluma.form-builder.notification.form.reorder-questions.error"
-        )
+          "caluma.form-builder.notification.form.reorder-questions.error",
+        ),
       );
     }
   }
@@ -145,8 +145,8 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
 
       this.notification.success(
         this.intl.t(
-          "caluma.form-builder.notification.form.add-question.success"
-        )
+          "caluma.form-builder.notification.form.add-question.success",
+        ),
       );
 
       this._resetParameters();
@@ -156,7 +156,7 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
       this.args.onAfterAddQuestion?.(question);
     } catch (e) {
       this.notification.danger(
-        this.intl.t("caluma.form-builder.notification.form.add-question.error")
+        this.intl.t("caluma.form-builder.notification.form.add-question.error"),
       );
     }
   }
@@ -177,16 +177,16 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
 
       this.notification.success(
         this.intl.t(
-          "caluma.form-builder.notification.form.remove-question.success"
-        )
+          "caluma.form-builder.notification.form.remove-question.success",
+        ),
       );
 
       this.args.onAfterRemoveQuestion?.(question);
     } catch (e) {
       this.notification.danger(
         this.intl.t(
-          "caluma.form-builder.notification.form.remove-question.error"
-        )
+          "caluma.form-builder.notification.form.remove-question.error",
+        ),
       );
     }
   }
@@ -195,7 +195,7 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
     const children = [...sortable.$el.children];
 
     this.reorderQuestions.perform(
-      children.map((child) => this._children[child.id])
+      children.map((child) => this._children[child.id]),
     );
   }
 
@@ -208,7 +208,7 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
   @action
   setupUIkit() {
     UIkit.util.on("#question-list", "moved", (...args) =>
-      run(this, this._handleMoved, ...args)
+      run(this, this._handleMoved, ...args),
     );
   }
 

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

@@ -405,6 +405,12 @@
             @label={{t "caluma.form-builder.question.validateOnEnter"}}
             @renderComponent={{component "cfb-toggle-switch" size="small"}}
           />
+          <f.input
+            @name="showValidation"
+            @required={{true}}
+            @label={{t "caluma.form-builder.question.showValidation"}}
+            @renderComponent={{component "cfb-toggle-switch" size="small"}}
+          />
         {{/if}}
 
         <f.input

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

@@ -110,6 +110,7 @@ export default class CfbFormEditorQuestion extends Component {
             action: ACTIONS[0],
             color: COLORS[0],
             validateOnEnter: false,
+            showValidation: false,
             __typename: Object.keys(TYPES)[0],
           },
         },
@@ -122,7 +123,7 @@ export default class CfbFormEditorQuestion extends Component {
         variables: { slug: this.args.slug },
         fetchPolicy: "cache-and-network",
       },
-      "allQuestions.edges"
+      "allQuestions.edges",
     );
   }
 
@@ -137,7 +138,7 @@ export default class CfbFormEditorQuestion extends Component {
         },
         fetchPolicy: "cache-and-network",
       },
-      "allForms.edges"
+      "allForms.edges",
     );
     if (!forms.map) {
       return [];
@@ -151,7 +152,7 @@ export default class CfbFormEditorQuestion extends Component {
   *availableDataSources() {
     const dataSources = yield this.apollo.watchQuery(
       { query: allDataSourcesQuery, fetchPolicy: "cache-and-network" },
-      "allDataSources.edges"
+      "allDataSources.edges",
     );
     return dataSources.map((edge) => {
       return {
@@ -348,6 +349,7 @@ export default class CfbFormEditorQuestion extends Component {
       action: changeset.get("action"),
       color: changeset.get("color"),
       validateOnEnter: Boolean(changeset.get("validateOnEnter")),
+      showValidation: Boolean(changeset.get("showValidation")),
     };
   }
 
@@ -363,7 +365,7 @@ export default class CfbFormEditorQuestion extends Component {
             mutation: saveOptionMutation,
             variables: { input: { label, slug, isArchived } },
           });
-        })
+        }),
     );
   }
 
@@ -412,7 +414,7 @@ export default class CfbFormEditorQuestion extends Component {
           mutation: TYPES[typename],
           variables: { input },
         },
-        `save${typename}.question`
+        `save${typename}.question`,
       );
 
       yield this.saveDefaultAnswer.perform(question, changeset);
@@ -432,7 +434,7 @@ export default class CfbFormEditorQuestion extends Component {
       }
 
       this.notification.success(
-        this.intl.t("caluma.form-builder.notification.question.save.success")
+        this.intl.t("caluma.form-builder.notification.question.save.success"),
       );
 
       this.args.onAfterSubmit?.(question);
@@ -440,7 +442,7 @@ export default class CfbFormEditorQuestion extends Component {
       // eslint-disable-next-line no-console
       console.error(e);
       this.notification.danger(
-        this.intl.t("caluma.form-builder.notification.question.save.error")
+        this.intl.t("caluma.form-builder.notification.question.save.error"),
       );
     }
   }
@@ -456,8 +458,8 @@ export default class CfbFormEditorQuestion extends Component {
           new Changeset(
             { ...edge.node, slugUnlinked: false, question: this.model.slug },
             lookupValidator(optionValidations),
-            optionValidations
-          )
+            optionValidations,
+          ),
       ) ?? [
         new Changeset(
           {
@@ -469,14 +471,14 @@ export default class CfbFormEditorQuestion extends Component {
             question: this.model.slug,
           },
           lookupValidator(optionValidations),
-          optionValidations
+          optionValidations,
         ),
       ];
 
       this.changeset = new Changeset(
         { ...this.model, options },
         lookupValidator(validations),
-        validations
+        validations,
       );
     }
   }

package/addon/components/cfb-navigation.js

@@ -13,7 +13,7 @@ export default class CfbNavigationComponent extends Component {
     const routeParts = currentRoute.split(".");
     return routeParts
       .map((routeName, index) =>
-        this._lookupRoute(routeName, routeParts, index)
+        this._lookupRoute(routeName, routeParts, index),
       )
       .filter((route) => route && route.__navigationTitleProperty);
   }

package/addon/gql/mutations/save-action-button-question.graphql

@@ -9,6 +9,7 @@ mutation SaveActionButtonQuestion($input: SaveActionButtonQuestionInput!) {
         action
         color
         validateOnEnter
+        showValidation
       }
     }
     clientMutationId

package/addon/gql/queries/form-editor-question.graphql

@@ -170,6 +170,7 @@ query FormEditorQuestion($slug: String!) {
           action
           color
           validateOnEnter
+          showValidation
         }
       }
     }

package/addon/routes/edit/questions/edit.js

@@ -32,7 +32,7 @@ export default class EditQuestionsEditRoute extends Route {
         `,
         variables: { slug },
       },
-      "allQuestions.edges"
+      "allQuestions.edges",
     );
 
     return question?.node.label;

package/addon/routes/edit.js

@@ -31,7 +31,7 @@ export default class EditRoute extends Route {
         `,
         variables: { slug },
       },
-      "allForms.edges"
+      "allForms.edges",
     );
 
     return form?.node.name;

package/addon/utils/and.js

@@ -24,7 +24,7 @@ export default function and(...validators) {
         newValue,
         oldValue,
         changes,
-        object
+        object,
       );
 
       if (isPromise(validation)) {

package/addon/validations/question.js

@@ -22,67 +22,67 @@ export default {
     validateType("FormQuestion", true),
     validateType("StaticQuestion", true),
     validateType("FilesQuestion", true),
-    validateLength({ max: 1024, allowBlank: true })
+    validateLength({ max: 1024, allowBlank: true }),
   ),
   integerMinValue: or(
     validateType("IntegerQuestion", false),
     and(
       validateNumber({ allowBlank: true, integer: true }),
-      validateGtLt({ lt: "integerMaxValue", allowNone: true })
-    )
+      validateGtLt({ lt: "integerMaxValue", allowNone: true }),
+    ),
   ),
   integerMaxValue: or(
     validateType("IntegerQuestion", false),
     and(
       validateNumber({ allowBlank: true, integer: true }),
-      validateGtLt({ gt: "integerMinValue", allowNone: true })
-    )
+      validateGtLt({ gt: "integerMinValue", allowNone: true }),
+    ),
   ),
 
   floatMinValue: or(
     validateType("FloatQuestion", false),
     and(
       validateNumber({ allowBlank: true }),
-      validateGtLt({ lt: "floatMaxValue", allowNone: true })
-    )
+      validateGtLt({ lt: "floatMaxValue", allowNone: true }),
+    ),
   ),
   floatMaxValue: or(
     validateType("FloatQuestion", false),
     and(
       validateNumber({ allowBlank: true }),
-      validateGtLt({ gt: "floatMinValue", allowNone: true })
-    )
+      validateGtLt({ gt: "floatMinValue", allowNone: true }),
+    ),
   ),
 
   minLength: or(
     and(
       validateType("TextQuestion", false),
-      validateType("TextareaQuestion", false)
+      validateType("TextareaQuestion", false),
     ),
-    validateNumber({ gt: 0, allowBlank: true })
+    validateNumber({ gt: 0, allowBlank: true }),
   ),
   maxLength: or(
     and(
       validateType("TextQuestion", false),
-      validateType("TextareaQuestion", false)
+      validateType("TextareaQuestion", false),
     ),
-    validateNumber({ gt: 0, allowBlank: true })
+    validateNumber({ gt: 0, allowBlank: true }),
   ),
 
   options: or(
     and(
       validateType("MultipleChoiceQuestion", false),
-      validateType("ChoiceQuestion", false)
+      validateType("ChoiceQuestion", false),
     ),
-    and(validateOptions(), validateLength({ min: 1 }))
+    and(validateOptions(), validateLength({ min: 1 })),
   ),
   "rowForm.slug": or(
     validateType("TableQuestion", false),
-    validatePresence(true)
+    validatePresence(true),
   ),
   "subForm.slug": or(
     validateType("FormQuestion", false),
-    validatePresence(true)
+    validatePresence(true),
   ),
   isHidden: validateJexl(),
   isRequired: validateJexl(),

package/addon/validators/gt-lt.js

@@ -20,7 +20,7 @@ export default function validateGtLt(options = {}) {
       newValue,
       oldValue,
       changes,
-      content
+      content,
     );
   };
 }

package/addon/validators/jexl.js

@@ -12,6 +12,7 @@ const TRANSFORMS = [
   "sum",
   "avg",
   "stringify",
+  "flatten",
 ];
 const BINARY_OPS = ["intersects"];
 

package/addon/validators/slug.js

@@ -36,7 +36,7 @@ export class SlugUniquenessValidator {
 
   async validate(key, newValue, oldValue, changes, context) {
     const application = importSync(
-      "@projectcaluma/ember-form-builder/-private/application"
+      "@projectcaluma/ember-form-builder/-private/application",
     ).default;
 
     setOwner(this, application.instance);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form-builder",
-  "version": "12.1.0",
+  "version": "12.3.0",
   "description": "Ember engine for building Caluma forms.",
   "keywords": [
     "ember-addon",
@@ -13,7 +13,7 @@
     "@ember/legacy-built-in-components": "^0.4.2",
     "@ember/render-modifiers": "^2.1.0",
     "@ember/string": "^3.1.1",
-    "@embroider/macros": "^1.11.1",
+    "@embroider/macros": "^1.13.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "codejar": "^3.7.0",
@@ -24,14 +24,14 @@
     "ember-cli-babel": "^7.26.11",
     "ember-cli-htmlbars": "^6.2.0",
     "ember-composable-helpers": "^5.0.0",
-    "ember-concurrency": "^2.3.7",
+    "ember-concurrency": "^3.0.0",
     "ember-engines-router-service": "^0.3.0",
     "ember-fetch": "^8.1.2",
     "ember-flatpickr": "^4.0.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.3.1",
     "ember-test-selectors": "^6.0.0",
     "ember-uikit": "^8.0.0",
     "ember-validated-form": "^6.2.0",
@@ -40,9 +40,9 @@
     "highlight.js": "^11.8.0",
     "highlightjs-jexl": "^0.0.5",
     "jexl": "^2.3.0",
-    "uikit": "^3.16.22",
-    "@projectcaluma/ember-core": "^12.1.0",
-    "@projectcaluma/ember-form": "^12.1.0"
+    "uikit": "^3.16.23",
+    "@projectcaluma/ember-core": "^12.3.0",
+    "@projectcaluma/ember-form": "^12.3.0"
   },
   "//": [
     "TODO: remove obsolete dependency to `ember-data` which is only necessary",
@@ -52,7 +52,7 @@
   ],
   "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",
@@ -64,20 +64,20 @@
     "ember-cli-mirage": "3.0.0-alpha.3",
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
-    "ember-data": "4.12.0",
+    "ember-data": "4.12.3",
     "ember-engines": "0.9.0",
     "ember-load-initializers": "2.1.2",
     "ember-qunit": "7.0.0",
-    "ember-resolver": "10.1.1",
-    "ember-source": "4.12.0",
+    "ember-resolver": "11.0.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",
-    "webpack": "5.87.0",
-    "@projectcaluma/ember-testing": "12.1.0"
+    "webpack": "5.88.2",
+    "@projectcaluma/ember-testing": "12.3.0"
   },
   "peerDependencies": {
     "ember-engines": "^0.9.0",

package/translations/de.yaml

@@ -115,6 +115,7 @@ caluma:
       action: "Aktion"
       color: "Farbe"
       validateOnEnter: "Validierung beim Betreten des Fensters"
+      showValidation: "Validierungs-Fehler anzeigen"
 
       actions:
         COMPLETE: "Abschliessen"

package/translations/en.yaml

@@ -115,6 +115,7 @@ caluma:
       action: "Action"
       color: "Color"
       validateOnEnter: "Validate on entering the viewport"
+      showValidation: "Show validation errors"
 
       actions:
         COMPLETE: "Complete"