@projectcaluma/ember-form-builder 11.0.0-beta.3 → 11.0.0-beta.7

package/CHANGELOG.md

@@ -1,3 +1,45 @@
+# [@projectcaluma/ember-form-builder-v11.0.0-beta.7](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-form-builder-v11.0.0-beta.6...@projectcaluma/ember-form-builder-v11.0.0-beta.7) (2022-02-07)
+
+
+### Bug Fixes
+
+* **deps:** remove moment altogether and update ember-pikday ([b2f7fa2](https://github.com/projectcaluma/ember-caluma/commit/b2f7fa28fa076897addd36e5964c926c671508ff))
+
+
+### BREAKING CHANGES
+
+* **deps:** The host app now needs to opt-in to use the default
+pikaday styles: https://github.com/adopted-ember-addons/ember-pikaday#styles
+
+# [@projectcaluma/ember-form-builder-v11.0.0-beta.6](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-form-builder-v11.0.0-beta.5...@projectcaluma/ember-form-builder-v11.0.0-beta.6) (2022-02-03)
+
+
+### Bug Fixes
+
+* **validation:** sync format validator validation with backend ([ee66968](https://github.com/projectcaluma/ember-caluma/commit/ee66968230b9f0e4c5a4df8bdb3f8e58b44b5b82))
+
+
+### BREAKING CHANGES
+
+* **validation:** Use the `formatValidators` property of the backend to store and read
+format validators instead of the `meta.formatValidators` so the backend
+validates as well. For more information on how to migrate check the
+migration guide to v11.
+
+# [@projectcaluma/ember-form-builder-v11.0.0-beta.5](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-form-builder-v11.0.0-beta.4...@projectcaluma/ember-form-builder-v11.0.0-beta.5) (2022-02-02)
+
+
+### Bug Fixes
+
+* **form-builder:** fix active filter in form list ([87a1016](https://github.com/projectcaluma/ember-caluma/commit/87a1016eb646436f04f7e6e891502f329fd8e8a0))
+
+# [@projectcaluma/ember-form-builder-v11.0.0-beta.4](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-form-builder-v11.0.0-beta.3...@projectcaluma/ember-form-builder-v11.0.0-beta.4) (2022-02-01)
+
+
+### Bug Fixes
+
+* **form-builder:** omit isRequired property when saving action buttons ([27fb4ff](https://github.com/projectcaluma/ember-caluma/commit/27fb4ff9e394a4c9491c33374f1b088fd09274d3))
+
 # [@projectcaluma/ember-form-builder-v11.0.0-beta.3](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-form-builder-v11.0.0-beta.2...@projectcaluma/ember-form-builder-v11.0.0-beta.3) (2022-01-24)
 
 

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

@@ -102,11 +102,11 @@ export default class CfbFormEditorGeneral extends Component {
 
   @restartableTask
   *validateSlug(slug, changeset) {
+    const { environment } =
+      getOwner(this).resolveRegistration("config:environment");
+
     /* istanbul ignore next */
-    if (
-      getOwner(this).resolveRegistration("config:environment").environment !==
-      "test"
-    ) {
+    if (environment !== "test") {
       yield timeout(500);
     }
 

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

@@ -1,9 +1,9 @@
-<div class="uk-margin" {{did-insert (perform this.availableFormatValidators)}}>
+<div class="uk-margin">
   {{component @labelComponent}}
 
   <PowerSelectMultiple
     @selected={{this.selected}}
-    @placeholder={{this.placeholder}}
+    @placeholder={{@placeholder}}
     @options={{this.validators}}
     @onChange={{this.updateValidators}}
     @renderInPlace={{true}}

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

@@ -2,34 +2,38 @@ import { action } from "@ember/object";
 import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
 import { dropTask } from "ember-concurrency";
+import { useTask } from "ember-resources";
 
-import allFormatValidatorsQuery from "@projectcaluma/ember-core/gql/queries/all-format-validators.graphql";
+import allFormatValidatorsQuery from "@projectcaluma/ember-form-builder/gql/queries/all-format-validators.graphql";
 
 export default class CfbFormEditorQuestionValidation extends Component {
   @queryManager apollo;
 
-  @dropTask
-  *availableFormatValidators() {
-    const formatValidators = yield this.apollo.watchQuery(
-      { query: allFormatValidatorsQuery, fetchPolicy: "cache-and-network" },
-      "allFormatValidators.edges"
-    );
-    return formatValidators.map((edge) => edge.node);
-  }
-
   get validators() {
-    return this.availableFormatValidators?.lastSuccessful?.value || [];
+    return this._validators.value?.map((edge) => edge.node) ?? [];
   }
 
   get selected() {
     return this.validators.filter((validator) =>
-      (this.args.value || []).includes(validator.slug)
+      (this.args.value?.edges.map((edge) => edge.node.slug) || []).includes(
+        validator.slug
+      )
+    );
+  }
+
+  _validators = useTask(this, this.fetchFormatValidators, () => []);
+
+  @dropTask
+  *fetchFormatValidators() {
+    return yield this.apollo.watchQuery(
+      { query: allFormatValidatorsQuery, fetchPolicy: "cache-and-network" },
+      "allFormatValidators.edges"
     );
   }
 
   @action
   updateValidators(value) {
-    this.args.update(value.map((validator) => validator.slug));
+    this.args.update({ edges: value.map(({ slug }) => ({ node: { slug } })) });
     this.args.setDirty();
   }
 }

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

@@ -1,3 +1,4 @@
+import { getOwner } from "@ember/application";
 import { action } from "@ember/object";
 import { run } from "@ember/runloop";
 import { inject as service } from "@ember/service";
@@ -55,7 +56,10 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
     const mode = this.mode;
     const search = mode !== "reorder" ? this.search : "";
 
-    if (search) {
+    const { environment } =
+      getOwner(this).resolveRegistration("config:environment");
+
+    if (search && environment !== "test") {
       yield timeout(500);
     }
 

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

@@ -207,13 +207,13 @@
         />
 
         <f.input
-          @name="meta.formatValidators"
+          @name="formatValidators"
           @label={{t "caluma.form-builder.question.formatValidators"}}
           @placeholder={{t "caluma.form-builder.question.choose"}}
           @required={{false}}
           @renderComponent={{component "cfb-form-editor/question/validation"}}
-          @on-update={{changeset-set f.model "meta.formatValidators"}}
-          @value={{changeset-get f.model "meta.formatValidators"}}
+          @on-update={{changeset-set f.model "formatValidators"}}
+          @value={{changeset-get f.model "formatValidators"}}
         />
       {{/if}}
 

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

@@ -106,6 +106,7 @@ export default class CfbFormEditorQuestion extends Component {
             subForm: {},
             meta: {},
             dataSource: "",
+            formatValidators: null,
             // action button
             action: ACTIONS[0],
             color: COLORS[0],
@@ -221,7 +222,9 @@ export default class CfbFormEditorQuestion extends Component {
       isArchived: changeset.get("isArchived"),
     };
 
-    if (!hasQuestionType(changeset, "static", "calculated-float")) {
+    if (
+      !hasQuestionType(changeset, "static", "calculated-float", "action-button")
+    ) {
       Object.assign(input, {
         isRequired: changeset.get("isRequired"),
       });
@@ -256,6 +259,9 @@ export default class CfbFormEditorQuestion extends Component {
       minLength: parseInt(changeset.get("minLength")),
       maxLength: parseInt(changeset.get("maxLength")),
       placeholder: changeset.get("placeholder"),
+      formatValidators: changeset
+        .get("formatValidators")
+        ?.edges.map((edge) => edge.node.slug),
     };
   }
 
@@ -264,6 +270,9 @@ export default class CfbFormEditorQuestion extends Component {
       minLength: parseInt(changeset.get("minLength")),
       maxLength: parseInt(changeset.get("maxLength")),
       placeholder: changeset.get("placeholder"),
+      formatValidators: changeset
+        .get("formatValidators")
+        ?.edges.map((edge) => edge.node.slug),
     };
   }
 
@@ -417,11 +426,11 @@ export default class CfbFormEditorQuestion extends Component {
 
   @restartableTask
   *validateSlug(slug, changeset) {
+    const { environment } =
+      getOwner(this).resolveRegistration("config:environment");
+
     /* istanbul ignore next */
-    if (
-      getOwner(this).resolveRegistration("config:environment").environment !==
-      "test"
-    ) {
+    if (environment !== "test") {
       yield timeout(500);
     }
 

package/addon/components/cfb-form-list.hbs

@@ -5,7 +5,7 @@
         data-test-filter={{category}}
         @onClick={{fn (perform this.setFilter) "category" category}}
         @label={{t (concat "caluma.form-builder.form." category)}}
-        @class={{if (eq this.category category) "uk-button-primary" ""}}
+        @color={{if (eq this.category category) "primary"}}
       />
     {{/each}}
   </div>

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

@@ -1,3 +1,4 @@
+import { getOwner } from "@ember/application";
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { timeout, restartableTask } from "ember-concurrency";
@@ -30,7 +31,12 @@ export default class ComponentsCfbFormListComponent extends Component {
 
   @restartableTask
   *setFilter(name, eventOrValue) {
-    yield timeout(500);
+    const { environment } =
+      getOwner(this).resolveRegistration("config:environment");
+
+    if (environment !== "test") {
+      yield timeout(500);
+    }
 
     this[name] =
       eventOrValue instanceof Event ? eventOrValue.target.value : eventOrValue;

package/addon/engine.js

@@ -11,7 +11,7 @@ export default class FormBuilderEngine extends Engine {
   Resolver = Resolver;
 
   dependencies = {
-    services: ["apollo", "notification", "intl", "caluma-options", "validator"],
+    services: ["apollo", "notification", "intl", "caluma-options"],
   };
 }
 

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

@@ -0,0 +1,10 @@
+query AllFormatValidators {
+  allFormatValidators {
+    edges {
+      node {
+        slug
+        name
+      }
+    }
+  }
+}

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

@@ -33,11 +33,25 @@ query FormEditorQuestion($slug: String!) {
             id
             stringValue: value
           }
+          formatValidators {
+            edges {
+              node {
+                slug
+              }
+            }
+          }
         }
         ... on TextareaQuestion {
           minLength
           maxLength
           placeholder
+          formatValidators {
+            edges {
+              node {
+                slug
+              }
+            }
+          }
           defaultAnswer {
             id
             stringValue: value

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form-builder",
-  "version": "11.0.0-beta.3",
+  "version": "11.0.0-beta.7",
   "description": "Ember engine for building Caluma forms.",
   "keywords": [
     "ember-addon",
@@ -18,15 +18,15 @@
     "ember-engines": ">= 0.8"
   },
   "dependencies": {
-    "@ember/render-modifiers": "^2.0.3",
+    "@ember/render-modifiers": "^2.0.4",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
-    "@projectcaluma/ember-core": "^11.0.0-beta.2",
-    "@projectcaluma/ember-form": "^11.0.0-beta.3",
+    "@projectcaluma/ember-core": "^11.0.0-beta.4",
+    "@projectcaluma/ember-form": "^11.0.0-beta.9",
     "codejar": "^3.5.0",
     "ember-apollo-client": "^3.2.0",
     "ember-auto-import": "^2.4.0",
-    "ember-changeset": "^4.0.0-beta.1",
+    "ember-changeset": "^4.0.0-beta.2",
     "ember-changeset-validations": "^4.0.0-beta.2",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-htmlbars": "^6.0.1",
@@ -34,25 +34,26 @@
     "ember-concurrency": "^2.2.0",
     "ember-engines-router-service": "^0.3.0",
     "ember-fetch": "^8.1.1",
-    "ember-math-helpers": "^2.18.0",
-    "ember-pikaday": "^3.0.0",
+    "ember-intl": "^5.7.2",
+    "ember-math-helpers": "^2.18.1",
+    "ember-pikaday": "^4.0.0",
     "ember-power-select": "^5.0.3",
-    "ember-resources": "^4.1.3",
+    "ember-resources": "^4.3.1",
     "ember-test-selectors": "^6.0.0",
-    "ember-uikit": "^5.0.0-beta.3",
-    "ember-validated-form": "^5.1.1",
+    "ember-uikit": "^5.0.0",
+    "ember-validated-form": "^5.2.0",
     "graphql": "^15.8.0",
     "graphql-tag": "^2.12.6",
     "jexl": "^2.3.0",
-    "moment": "^2.29.1",
     "prismjs": "^1.26.0"
   },
+  "//": "TODO: remove ember-data when https://github.com/ember-engines/ember-engines/pull/794 is released",
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
     "@ember/test-helpers": "2.6.0",
     "@embroider/test-setup": "1.0.0",
-    "@faker-js/faker": "6.0.0-alpha.3",
-    "@projectcaluma/ember-testing": "10.2.0-beta.2",
+    "@faker-js/faker": "6.0.0-alpha.5",
+    "@projectcaluma/ember-testing": "11.0.0-beta.2",
     "broccoli-asset-rev": "3.0.0",
     "ember-cli": "3.28.5",
     "ember-cli-code-coverage": "1.0.3",
@@ -61,6 +62,7 @@
     "ember-cli-mirage": "2.4.0",
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
+    "ember-data": "3.28.8",
     "ember-disable-prototype-extensions": "1.1.3",
     "ember-engines": "0.8.20",
     "ember-export-application-global": "2.0.1",
@@ -76,7 +78,7 @@
     "npm-run-all": "4.1.5",
     "qunit": "2.17.2",
     "qunit-dom": "2.0.0",
-    "webpack": "5.67.0"
+    "webpack": "5.68.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"