@projectcaluma/ember-form-builder 14.3.2 → 14.4.0

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

@@ -8,6 +8,7 @@
       @options={{this.validators}}
       @onChange={{this.updateValidators}}
       @renderInPlace={{true}}
+      data-test-select-format-validators
       as |item|
     >
       {{item.name}}

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

@@ -1,4 +1,5 @@
 import { action } from "@ember/object";
+import { underscore } from "@ember/string";
 import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
 import { dropTask } from "ember-concurrency";
@@ -9,8 +10,22 @@ import allFormatValidatorsQuery from "@projectcaluma/ember-form-builder/gql/quer
 export default class CfbFormEditorQuestionValidation extends Component {
   @queryManager apollo;
 
+  get simpleQuestionType() {
+    return underscore(this.args.questionType.replace(/Question$/, ""));
+  }
+
   get validators() {
-    return this._validators.value?.map((edge) => edge.node) ?? [];
+    return (
+      this._validators.value
+        ?.map((edge) => edge.node)
+        .filter((node) => {
+          const allowed = node.allowedQuestionTypes;
+
+          return (
+            allowed.length === 0 || allowed.includes(this.simpleQuestionType)
+          );
+        }) ?? []
+    );
   }
 
   get selected() {

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

@@ -161,13 +161,24 @@
           @name="maxLength"
           @label={{t "caluma.form-builder.question.max-length"}}
         />
+      {{/if}}
 
+      {{#if
+        (not
+          (has-question-type
+            f.model "action-button" "calculated-float" "static" "form"
+          )
+        )
+      }}
         <f.input
           @name="formatValidators"
           @label={{t "caluma.form-builder.question.formatValidators"}}
           @placeholder={{t "caluma.form-builder.question.no-selection"}}
           @required={{false}}
-          @renderComponent={{component "cfb-form-editor/question/validation"}}
+          @renderComponent={{component
+            "cfb-form-editor/question/validation"
+            questionType=f.model.__typename
+          }}
           @on-update={{changeset-set f.model "formatValidators"}}
           @value={{changeset-get f.model "formatValidators"}}
         />
@@ -307,6 +318,8 @@
                 "caluma.form-builder.question.search-empty"
               }}
               @renderInPlace={{true}}
+              @dropdownClass="select-row-form-dropdown"
+              data-test-select-row-form
               as |form|
             >
               <span
@@ -359,6 +372,8 @@
             }}
             @noMatchesMessage={{t "caluma.form-builder.question.search-empty"}}
             @renderInPlace={{true}}
+            @dropdownClass="select-sub-form-dropdown"
+            data-test-select-sub-form
             as |form|
           >
             <span class="uk-width-auto uk-margin-small-right uk-text-truncate">

package/addon/gql/queries/all-format-validators.graphql

@@ -4,6 +4,7 @@ query AllFormatValidators {
       node {
         slug
         name
+        allowedQuestionTypes
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form-builder",
-  "version": "14.3.2",
+  "version": "14.4.0",
   "description": "Ember engine for building Caluma forms.",
   "keywords": [
     "ember-addon",
@@ -12,7 +12,7 @@
   "dependencies": {
     "@babel/core": "^7.26.0",
     "@ember/legacy-built-in-components": "^0.5.0",
-    "@ember/render-modifiers": "^2.1.0",
+    "@ember/render-modifiers": "^2.1.0 || ^3.0.0",
     "@ember/string": "^3.1.1 || ^4.0.0",
     "@embroider/macros": "^1.16.10",
     "@glimmer/component": "^1.1.2",
@@ -32,7 +32,7 @@
     "ember-flatpickr": "^8.0.1",
     "ember-intl": "^7.1.1",
     "ember-load-initializers": "^2.1.2 || ^3.0.1",
-    "ember-math-helpers": "^4.2.1",
+    "ember-math-helpers": "^4.2.1 || ^5.0.0",
     "ember-power-select": "^8.6.2",
     "ember-resolver": "^12.0.1 || ^13.1.0",
     "ember-template-imports": "^4.2.0",
@@ -48,8 +48,8 @@
     "lodash.isequal": "^4.5.0",
     "reactiveweb": "^1.3.0",
     "uikit": "^3.22.0",
-    "@projectcaluma/ember-core": "^14.3.2",
-    "@projectcaluma/ember-form": "^14.3.2"
+    "@projectcaluma/ember-core": "^14.4.0",
+    "@projectcaluma/ember-form": "^14.4.0"
   },
   "//": [
     "TODO: remove obsolete dependency to `ember-data` which is only necessary",
@@ -61,9 +61,9 @@
     "@ember/optional-features": "2.2.0",
     "@ember/test-helpers": "4.0.4",
     "@embroider/test-setup": "4.0.0",
-    "@faker-js/faker": "9.7.0",
+    "@faker-js/faker": "10.0.0",
     "broccoli-asset-rev": "3.0.0",
-    "ember-autoresize-modifier": "0.7.0",
+    "ember-autoresize-modifier": "0.8.0",
     "ember-cli": "6.1.0",
     "ember-cli-clean-css": "3.0.0",
     "ember-cli-code-coverage": "3.1.0",
@@ -72,9 +72,9 @@
     "ember-cli-mirage": "3.0.4",
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
-    "ember-data": "5.5.0",
+    "ember-data": "5.7.0",
     "ember-engines": "0.12.0",
-    "ember-qunit": "9.0.2",
+    "ember-qunit": "9.0.3",
     "ember-sinon-qunit": "7.5.0",
     "ember-source": "6.1.0",
     "ember-source-channel-url": "3.0.0",
@@ -82,10 +82,10 @@
     "loader.js": "4.7.0",
     "miragejs": "0.1.48",
     "qunit": "2.24.1",
-    "qunit-dom": "3.4.0",
-    "sinon": "20.0.0",
-    "webpack": "5.99.8",
-    "@projectcaluma/ember-testing": "14.3.2"
+    "qunit-dom": "3.5.0",
+    "sinon": "21.0.0",
+    "webpack": "5.101.3",
+    "@projectcaluma/ember-testing": "14.4.0"
   },
   "peerDependencies": {
     "ember-engines": "^0.11.0",