@projectcaluma/ember-form-builder 10.0.3 → 11.0.0-beta.4

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

@@ -1,17 +1,16 @@
-import { action } from "@ember/object";
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
-import { queryManager } from "ember-apollo-client";
-import { timeout } from "ember-concurrency";
-import { restartableTask } from "ember-concurrency-decorators";
+import { timeout, restartableTask } from "ember-concurrency";
 
-import calumaQuery from "@projectcaluma/ember-core/caluma-query";
+import { useCalumaQuery } from "@projectcaluma/ember-core/caluma-query";
 import { allForms } from "@projectcaluma/ember-core/caluma-query/queries";
 
 export default class ComponentsCfbFormListComponent extends Component {
-  @queryManager apollo;
-
-  @calumaQuery({ query: allForms, options: { pageSize: 20 } }) formsQuery;
+  formsQuery = useCalumaQuery(this, allForms, () => ({
+    options: { pageSize: 20 },
+    filter: this.filter,
+    order: [{ attribute: "NAME", direction: "ASC" }],
+  }));
 
   @tracked category = "active";
   @tracked search = "";
@@ -29,33 +28,11 @@ export default class ComponentsCfbFormListComponent extends Component {
     return [isArchived, search].filter(Boolean) || null;
   }
 
-  @action
-  setFilter(name, eventOrValue) {
-    this[name] =
-      eventOrValue instanceof Event ? eventOrValue.target.value : eventOrValue;
-
-    this.fetchForms.perform();
-  }
-
-  @action
-  submit(event) {
-    event.preventDefault();
-  }
-
-  @action
-  loadMoreForms(e) {
-    e.preventDefault();
-
-    this.formsQuery.fetchMore();
-  }
-
   @restartableTask
-  *fetchForms() {
+  *setFilter(name, eventOrValue) {
     yield timeout(500);
 
-    yield this.formsQuery.fetch({
-      filter: this.filter,
-      order: [{ attribute: "NAME", direction: "ASC" }],
-    });
+    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/routes/edit/questions/edit.js

@@ -1,7 +1,7 @@
 import Route from "@ember/routing/route";
 import { inject as service } from "@ember/service";
 import { queryManager } from "ember-apollo-client";
-import { lastValue, dropTask } from "ember-concurrency-decorators";
+import { lastValue, dropTask } from "ember-concurrency";
 import { gql } from "graphql-tag";
 
 import { navigationTitle } from "@projectcaluma/ember-form-builder/decorators";

package/addon/routes/edit.js

@@ -1,7 +1,7 @@
 import Route from "@ember/routing/route";
 import { inject as service } from "@ember/service";
 import { queryManager } from "ember-apollo-client";
-import { lastValue, dropTask } from "ember-concurrency-decorators";
+import { lastValue, dropTask } from "ember-concurrency";
 import { gql } from "graphql-tag";
 
 import { navigationTitle } from "@projectcaluma/ember-form-builder/decorators";

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": "10.0.3",
+  "version": "11.0.0-beta.4",
   "description": "Ember engine for building Caluma forms.",
   "keywords": [
     "ember-addon",
@@ -14,50 +14,55 @@
     "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.3",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
-    "@projectcaluma/ember-core": "^10.1.0",
-    "@projectcaluma/ember-form": "^10.0.3",
+    "@projectcaluma/ember-core": "^11.0.0-beta.2",
+    "@projectcaluma/ember-form": "^11.0.0-beta.4",
     "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-cli-babel": "^7.26.6",
+    "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": "^4.5.0",
+    "ember-composable-helpers": "^5.0.0",
     "ember-concurrency": "^2.2.0",
-    "ember-concurrency-decorators": "^2.0.3",
     "ember-engines-router-service": "^0.3.0",
-    "ember-fetch": "^8.0.4",
-    "ember-math-helpers": "^2.18.0",
+    "ember-fetch": "^8.1.1",
+    "ember-math-helpers": "^2.18.1",
     "ember-pikaday": "^3.0.0",
     "ember-power-select": "^5.0.3",
+    "ember-resources": "^4.2.0",
     "ember-test-selectors": "^6.0.0",
-    "ember-uikit": "^4.0.0",
-    "ember-validated-form": "^5.0.0",
-    "graphql": "^15.6.1",
+    "ember-uikit": "^5.0.0-beta.9",
+    "ember-validated-form": "^5.1.1",
+    "graphql": "^15.8.0",
     "graphql-tag": "^2.12.6",
     "jexl": "^2.3.0",
     "moment": "^2.29.1",
-    "prismjs": "^1.25.0"
+    "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.48.1",
-    "@projectcaluma/ember-testing": "10.0.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.4",
+    "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.4",
+    "ember-data": "3.28.7",
     "ember-disable-prototype-extensions": "1.1.3",
     "ember-engines": "0.8.20",
     "ember-export-application-global": "2.0.1",
@@ -68,12 +73,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"