@projectcaluma/ember-form-builder 11.0.0-beta.1 → 11.0.0-beta.5

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

@@ -85,7 +85,7 @@
   <div
     class="uk-text-center uk-text-muted uk-padding uk-padding-remove-horizontal"
   >
-    {{uk-icon "bolt" ratio=5}}
+    <UkIcon @icon="bolt" @ratio={{5}} />
     <p>{{t "caluma.form-builder.form.not-found" slug=@slug}}</p>
   </div>
 {{/if}}

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

@@ -3,7 +3,6 @@ import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
-import { optional } from "ember-composable-helpers/helpers/optional";
 import { timeout, restartableTask, dropTask } from "ember-concurrency";
 import { useTask } from "ember-resources";
 
@@ -89,7 +88,7 @@ export default class CfbFormEditorGeneral extends Component {
         )
       );
 
-      optional([this.args["on-after-submit"]])(form);
+      this.args.onAfterSubmit?.(form);
     } catch (e) {
       this.notification.danger(
         this.intl.t(
@@ -103,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/options.hbs

@@ -3,7 +3,7 @@
 
   <UkSortable
     @handle=".uk-sortable-handle"
-    @on-moved={{this._handleMoved}}
+    @onMoved={{this._handleMoved}}
     @tagName="ul"
     class="uk-list uk-list-divider uk-margin-remove-bottom uk-margin-small-top"
   >

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

@@ -6,6 +6,7 @@
     @placeholder={{this.placeholder}}
     @options={{this.validators}}
     @onChange={{this.updateValidators}}
+    @renderInPlace={{true}}
     as |item|
   >
     {{item.name}}

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

@@ -4,8 +4,8 @@
     @question.isArchived
     "cfb-form-editor__question-list__item__archived"
   }}
-  {{did-insert (fn (optional @on-register) this.elementId @question.slug)}}
-  {{will-destroy (fn (optional @on-unregister) this.elementId @question.slug)}}
+  {{did-insert (fn (optional @onRegister) this.elementId @question.slug)}}
+  {{will-destroy (fn (optional @onUnregister) this.elementId @question.slug)}}
   ...attributes
 >
   <div class="uk-flex uk-flex-middle">
@@ -24,7 +24,7 @@
           data-test-remove-item
           uk-icon="minus"
           class="cfb-pointer uk-text-danger"
-          {{on "click" (fn (optional @on-remove-question) @question)}}
+          {{on "click" (fn (optional @onRemoveQuestion) @question)}}
         >
         </i>
       {{else if (eq @mode "add")}}
@@ -33,7 +33,7 @@
           data-test-add-item
           uk-icon="plus"
           class="cfb-pointer uk-text-success"
-          {{on "click" (fn (optional @on-add-question) @question)}}
+          {{on "click" (fn (optional @onAddQuestion) @question)}}
         >
         </i>
       {{/if}}

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

@@ -51,12 +51,12 @@ export default class CfbFormEditorQuestionListItem extends Component {
   @action
   editQuestion(question, e) {
     e.preventDefault();
-    this.args["on-edit-question"]?.(question);
+    this.args.onEditQuestion?.(question);
   }
 
   @action
   clickForm(form, e) {
     e.preventDefault();
-    this.args["on-click-form"]?.(form);
+    this.args.onClickForm?.(form);
   }
 }

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

@@ -76,12 +76,12 @@
           data-test-question-list-item={{item.node.slug}}
           @mode={{this.mode}}
           @question={{item.node}}
-          @on-edit-question={{@on-edit-question}}
-          @on-remove-question={{perform this.removeQuestion}}
-          @on-add-question={{perform this.addQuestion}}
-          @on-click-form={{@on-click-form}}
-          @on-register={{this.registerChild}}
-          @on-unregister={{this.unregisterChild}}
+          @onEditQuestion={{@onEditQuestion}}
+          @onRemoveQuestion={{perform this.removeQuestion}}
+          @onAddQuestion={{perform this.addQuestion}}
+          @onClickForm={{@onClickForm}}
+          @onRegister={{this.registerChild}}
+          @onUnregister={{this.unregisterChild}}
         />
       {{else}}
         <li

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

@@ -1,10 +1,10 @@
+import { getOwner } from "@ember/application";
 import { action } from "@ember/object";
 import { run } from "@ember/runloop";
 import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { queryManager } from "ember-apollo-client";
-import { optional } from "ember-composable-helpers/helpers/optional";
 import {
   timeout,
   enqueueTask,
@@ -56,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);
     }
 
@@ -148,7 +151,7 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
 
       this.questionTask.perform();
 
-      optional([this.args["on-after-add-question"]])(question);
+      this.args.onAfterAddQuestion?.(question);
     } catch (e) {
       this.notification.danger(
         this.intl.t("caluma.form-builder.notification.form.add-question.error")
@@ -176,7 +179,7 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
         )
       );
 
-      optional([this.args["on-after-remove-question"]])(question);
+      this.args.onAfterRemoveQuestion?.(question);
     } catch (e) {
       this.notification.danger(
         this.intl.t(
@@ -238,7 +241,7 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
   createNewQuestion(e) {
     e.preventDefault();
 
-    this.args["on-create-question"]?.();
+    this.args.onCreateQuestion?.();
     this.setMode("reorder");
   }
 }

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

@@ -341,6 +341,7 @@
               @noMatchesMessage={{t
                 "caluma.form-builder.question.search-empty"
               }}
+              @renderInPlace={{true}}
               as |form|
             >
               <span
@@ -413,6 +414,7 @@
               "caluma.form-builder.question.search-placeholder"
             }}
             @noMatchesMessage={{t "caluma.form-builder.question.search-empty"}}
+            @renderInPlace={{true}}
             as |form|
           >
             <span class="uk-width-auto uk-margin-small-right uk-text-truncate">
@@ -448,7 +450,7 @@
 
       <UkButton
         @color="link"
-        @on-click={{toggle-action "showAdvanced" this}}
+        @onClick={{toggle-action "showAdvanced" this}}
         class="uk-flex uk-flex-middle uk-margin"
       >
         {{#if this.showAdvanced}}

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

@@ -8,7 +8,6 @@ import { tracked } from "@glimmer/tracking";
 import { queryManager } from "ember-apollo-client";
 import Changeset from "ember-changeset";
 import lookupValidator from "ember-changeset-validations";
-import { optional } from "ember-composable-helpers/helpers/optional";
 import { dropTask, restartableTask, task, timeout } from "ember-concurrency";
 import { all } from "rsvp";
 
@@ -222,7 +221,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"),
       });
@@ -406,7 +407,7 @@ export default class CfbFormEditorQuestion extends Component {
         this.intl.t("caluma.form-builder.notification.question.save.success")
       );
 
-      optional([this.args["on-after-submit"]])(question);
+      this.args.onAfterSubmit?.(question);
     } catch (e) {
       // eslint-disable-next-line no-console
       console.error(e);
@@ -418,11 +419,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-editor.hbs

@@ -12,11 +12,11 @@
       {{else}}
         <CfbFormEditor::QuestionList
           @form={{@slug}}
-          @on-edit-question={{@on-edit-question}}
-          @on-create-question={{@on-create-question}}
-          @on-after-add-question={{@on-after-add-question}}
-          @on-after-remove-question={{@on-after-remove-question}}
-          @on-click-form={{@on-click-form}}
+          @onEditQuestion={{@onEditQuestion}}
+          @onCreateQuestion={{@onCreateQuestion}}
+          @onAfterAddQuestion={{@onAfterAddQuestion}}
+          @onAfterRemoveQuestion={{@onAfterRemoveQuestion}}
+          @onClickForm={{@onClickForm}}
         />
       {{/if}}
     </div>

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

@@ -12,7 +12,7 @@
       type="button"
       uk-icon="pencil"
       class="uk-icon-button"
-      {{on "click" (fn (optional @on-edit-form) @item)}}
+      {{on "click" (fn (optional @onEditForm) @item)}}
     >
     </button>
   </span>

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

@@ -3,16 +3,16 @@
     {{#each (array "active" "archived" "all") as |category|}}
       <UkButton
         data-test-filter={{category}}
-        @on-click={{fn (perform this.setFilter) "category" 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>
   <div>
     <UkButton
       data-test-new-form
-      @on-click={{optional @on-new-form}}
+      @onClick={{optional @onNewForm}}
       @label={{t "caluma.form-builder.form.new"}}
     />
   </div>
@@ -37,7 +37,7 @@
       <CfbFormList::Item
         data-test-form-list-item={{item.slug}}
         @item={{item}}
-        @on-edit-form={{@on-edit-form}}
+        @onEditForm={{@onEditForm}}
       />
     {{/each}}
     {{#if this.formsQuery.isLoading}}

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/components/cfb-toggle-switch.hbs

@@ -7,7 +7,7 @@
       @size={{@size}}
       @name={{@name}}
       @disabled={{@disabled}}
-      @on-toggle={{@update}}
+      @onToggle={{@update}}
     />
   </div>
 

package/addon/engine.js

@@ -6,16 +6,13 @@ import config from "./config/environment";
 
 const { modulePrefix } = config;
 
-/* eslint-disable ember/avoid-leaking-state-in-ember-objects */
-const Eng = Engine.extend({
-  modulePrefix,
-  Resolver,
+export default class FormBuilderEngine extends Engine {
+  modulePrefix = modulePrefix;
+  Resolver = Resolver;
 
-  dependencies: {
+  dependencies = {
     services: ["apollo", "notification", "intl", "caluma-options", "validator"],
-  },
-});
+  };
+}
 
-loadInitializers(Eng, modulePrefix);
-
-export default Eng;
+loadInitializers(FormBuilderEngine, modulePrefix);

package/addon/templates/edit/questions/edit.hbs

@@ -1,5 +1,5 @@
 <CfbFormEditor::Question
   @slug={{@model.questionSlug}}
   @form={{@model.formSlug}}
-  @on-after-submit={{this.afterSubmit}}
+  @onAfterSubmit={{this.afterSubmit}}
 />

package/addon/templates/edit/questions/new.hbs

@@ -1,4 +1 @@
-<CfbFormEditor::Question
-  @form={{@model}}
-  @on-after-submit={{this.afterSubmit}}
-/>
+<CfbFormEditor::Question @form={{@model}} @onAfterSubmit={{this.afterSubmit}} />

package/addon/templates/edit.hbs

@@ -1,10 +1,10 @@
 <CfbFormEditor
   @slug={{@model}}
-  @on-edit-question={{this.editQuestion}}
-  @on-create-question={{this.createQuestion}}
-  @on-after-add-question={{this.editQuestion}}
-  @on-after-remove-question={{this.afterRemoveQuestion}}
-  @on-click-form={{this.clickForm}}
+  @onEditQuestion={{this.editQuestion}}
+  @onCreateQuestion={{this.createQuestion}}
+  @onAfterAddQuestion={{this.editQuestion}}
+  @onAfterRemoveQuestion={{this.afterRemoveQuestion}}
+  @onClickForm={{this.clickForm}}
 >
   {{outlet}}
 </CfbFormEditor>

package/addon/templates/index.hbs

@@ -1 +1 @@
-<CfbFormList @on-new-form={{this.newForm}} @on-edit-form={{this.editForm}} />
+<CfbFormList @onNewForm={{this.newForm}} @onEditForm={{this.editForm}} />

package/addon/templates/new.hbs

@@ -1,6 +1,6 @@
 <CfbFormEditor @slug={{@model}}>
   <CfbFormEditor::General
     @slug={{@model}}
-    @on-after-submit={{this.afterSubmit}}
+    @onAfterSubmit={{this.afterSubmit}}
   />
 </CfbFormEditor>

package/addon/utils/and.js

@@ -0,0 +1,47 @@
+import { typeOf } from "@ember/utils";
+import { isPromise } from "validated-changeset";
+
+function notTrue(value) {
+  return typeOf(value) !== "boolean" || !value;
+}
+
+function handleResult(result) {
+  if (notTrue(result)) throw result;
+  return true;
+}
+
+/**
+ * Accepts an array of ember-changeset-validations validation functions.
+ *
+ * Copied and updated from nucleartide/ember-changeset-hofs
+ * @module and
+ */
+export default function and(...validators) {
+  return (key, newValue, oldValue, changes, object) => {
+    for (let i = 0; i < validators.length; i++) {
+      const validation = validators[i](
+        key,
+        newValue,
+        oldValue,
+        changes,
+        object
+      );
+
+      if (isPromise(validation)) {
+        let promise = validation.then(handleResult);
+
+        for (let j = i + 1; j < validators.length; j++) {
+          promise = promise
+            .then(() => validators[j](key, newValue, oldValue, changes, object))
+            .then(handleResult);
+        }
+
+        return promise.catch((err) => err);
+      }
+
+      if (notTrue(validation)) return validation;
+    }
+
+    return true;
+  };
+}

package/addon/utils/or.js

@@ -0,0 +1,40 @@
+import { isPromise } from "validated-changeset";
+
+function isTrue(value) {
+  return value === true;
+}
+
+function handleResult(result) {
+  if (isTrue(result)) throw true;
+  return result;
+}
+
+/**
+ * Copied and updated from nucleartide/ember-changeset-hofs
+ * @module or
+ */
+export default function or(...validators) {
+  return (key, newValue, oldValue, changes, object) => {
+    let validation;
+
+    for (let i = 0; i < validators.length; i++) {
+      validation = validators[i](key, newValue, oldValue, changes, object);
+
+      if (isPromise(validation)) {
+        let promise = validation.then(handleResult);
+
+        for (let j = i + 1; j < validators.length; j++) {
+          promise = promise
+            .then(() => validators[j](key, newValue, oldValue, changes, object))
+            .then(handleResult);
+        }
+
+        return promise.catch((err) => err);
+      }
+
+      if (isTrue(validation)) return true;
+    }
+
+    return validation;
+  };
+}

package/addon/validations/option.js

@@ -3,7 +3,7 @@ import {
   validateLength,
 } from "ember-changeset-validations/validators";
 
-import and from "@projectcaluma/ember-core/utils/and";
+import and from "@projectcaluma/ember-form-builder/utils/and";
 import validateSlug from "@projectcaluma/ember-form-builder/validators/slug";
 
 export default {

package/addon/validations/question.js

@@ -7,8 +7,8 @@ import {
 import validateGtLt from "../validators/gt-lt";
 import validateOptions from "../validators/options";
 
-import and from "@projectcaluma/ember-core/utils/and";
-import or from "@projectcaluma/ember-core/utils/or";
+import and from "@projectcaluma/ember-form-builder/utils/and";
+import or from "@projectcaluma/ember-form-builder/utils/or";
 import validateSlug from "@projectcaluma/ember-form-builder/validators/slug";
 import validateType from "@projectcaluma/ember-form-builder/validators/type";
 

package/addon/validators/slug.js

@@ -4,7 +4,7 @@ import {
   validateFormat,
 } from "ember-changeset-validations/validators";
 
-import and from "@projectcaluma/ember-core/utils/and";
+import and from "@projectcaluma/ember-form-builder/utils/and";
 
 const validateSlug = () =>
   and(

package/app/utils/and.js

@@ -0,0 +1 @@
+export { default } from "@projectcaluma/ember-form-builder/utils/and";

package/app/utils/or.js

@@ -0,0 +1 @@
+export { default } from "@projectcaluma/ember-form-builder/utils/or";

package/index.js

@@ -1,12 +1,14 @@
 "use strict";
 
 // eslint-disable-next-line node/no-unpublished-require
-const EngineAddon = require("ember-engines/lib/engine-addon");
+const { buildEngine } = require("ember-engines/lib/engine-addon");
 
-/* eslint-disable ember/avoid-leaking-state-in-ember-objects */
-module.exports = EngineAddon.extend({
+module.exports = buildEngine({
   name: require("./package.json").name,
-  lazyLoading: false,
+
+  lazyLoading: {
+    enabled: false,
+  },
 
   included(...args) {
     this._super.included.apply(this, args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form-builder",
-  "version": "11.0.0-beta.1",
+  "version": "11.0.0-beta.5",
   "description": "Ember engine for building Caluma forms.",
   "keywords": [
     "ember-addon",
@@ -14,29 +14,33 @@
     "test:ember": "ember test",
     "test:ember-compatibility": "ember try:each"
   },
+  "peerDependencies": {
+    "ember-engines": ">= 0.8"
+  },
   "dependencies": {
-    "@ember/render-modifiers": "^2.0.2",
+    "@ember/render-modifiers": "^2.0.4",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
-    "@projectcaluma/ember-core": "^11.0.0-beta.1",
-    "@projectcaluma/ember-form": "^11.0.0-beta.1",
+    "@projectcaluma/ember-core": "^11.0.0-beta.2",
+    "@projectcaluma/ember-form": "^11.0.0-beta.6",
     "codejar": "^3.5.0",
     "ember-apollo-client": "^3.2.0",
-    "ember-auto-import": "^2.2.3",
-    "ember-changeset": "^3.15.0",
-    "ember-changeset-validations": "^3.16.0",
+    "ember-auto-import": "^2.4.0",
+    "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",
     "ember-composable-helpers": "^5.0.0",
     "ember-concurrency": "^2.2.0",
     "ember-engines-router-service": "^0.3.0",
-    "ember-fetch": "^8.0.4",
-    "ember-math-helpers": "^2.18.0",
+    "ember-fetch": "^8.1.1",
+    "ember-intl": "^5.7.2",
+    "ember-math-helpers": "^2.18.1",
     "ember-pikaday": "^3.0.0",
     "ember-power-select": "^5.0.3",
-    "ember-resources": "^4.1.3",
+    "ember-resources": "^4.2.0",
     "ember-test-selectors": "^6.0.0",
-    "ember-uikit": "^4.0.0",
+    "ember-uikit": "^5.0.0-beta.11",
     "ember-validated-form": "^5.1.1",
     "graphql": "^15.8.0",
     "graphql-tag": "^2.12.6",
@@ -44,17 +48,19 @@
     "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": "0.49.0",
-    "@projectcaluma/ember-testing": "10.1.0",
+    "@embroider/test-setup": "1.0.0",
+    "@faker-js/faker": "6.0.0-alpha.5",
+    "@projectcaluma/ember-testing": "10.2.0-beta.2",
     "broccoli-asset-rev": "3.0.0",
     "ember-cli": "3.28.5",
     "ember-cli-code-coverage": "1.0.3",
     "ember-cli-dependency-checker": "3.2.0",
     "ember-cli-inject-live-reload": "2.1.0",
-    "ember-cli-mirage": "2.2.0",
+    "ember-cli-mirage": "2.4.0",
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
     "ember-data": "3.28.7",
@@ -68,12 +74,12 @@
     "ember-source": "3.28.8",
     "ember-source-channel-url": "3.0.0",
     "ember-try": "2.0.0",
-    "faker": "5.5.3",
     "loader.js": "4.7.0",
+    "miragejs": "0.1.43",
     "npm-run-all": "4.1.5",
     "qunit": "2.17.2",
     "qunit-dom": "2.0.0",
-    "webpack": "5.65.0"
+    "webpack": "5.68.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"