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

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

@@ -1,38 +1,71 @@
+import { inject as service } from "@ember/service";
+import { macroCondition, isTesting } from "@embroider/macros";
 import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
 import { timeout, restartableTask } from "ember-concurrency";
 
 import { useCalumaQuery } from "@projectcaluma/ember-core/caluma-query";
 import { allForms } from "@projectcaluma/ember-core/caluma-query/queries";
 
 export default class ComponentsCfbFormListComponent extends Component {
+  @service intl;
+
   formsQuery = useCalumaQuery(this, allForms, () => ({
     options: { pageSize: 20 },
     filter: this.filter,
     order: [{ attribute: "NAME", direction: "ASC" }],
   }));
 
-  @tracked category = "active";
-  @tracked search = "";
+  get categories() {
+    return [
+      {
+        value: "active",
+        label: this.intl.t("caluma.form-builder.form.active"),
+      },
+      {
+        value: "archived",
+        label: this.intl.t("caluma.form-builder.form.isArchived"),
+      },
+      {
+        value: "published",
+        label: this.intl.t("caluma.form-builder.form.isPublished"),
+      },
+      {
+        value: "unpublished",
+        label: this.intl.t("caluma.form-builder.form.draft"),
+      },
+      { value: "all", label: this.intl.t("caluma.form-builder.form.all") },
+    ];
+  }
 
   get filter() {
     const isArchived =
-      this.category === "active"
+      this.args.category === "active"
         ? { isArchived: false }
-        : this.category === "archived"
+        : this.args.category === "archived"
         ? { isArchived: true }
         : null;
 
-    const search = this.search ? { search: this.search } : null;
+    const search = this.args.search ? { search: this.args.search } : null;
+
+    const isPublished =
+      this.args.category === "unpublished"
+        ? { isPublished: false }
+        : this.args.category === "published"
+        ? { isPublished: true }
+        : null;
 
-    return [isArchived, search].filter(Boolean) || null;
+    return [isArchived, isPublished, search].filter(Boolean) || null;
   }
 
   @restartableTask
-  *setFilter(name, eventOrValue) {
-    yield timeout(500);
+  *search(event) {
+    /* istanbul ignore next */
+    if (macroCondition(isTesting())) {
+      // no timeout
+    } else {
+      yield timeout(500);
+    }
 
-    this[name] =
-      eventOrValue instanceof Event ? eventOrValue.target.value : eventOrValue;
+    this.args.onUpdateSearch(event.target.value);
   }
 }

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/controllers/index.js

@@ -1,10 +1,16 @@
 import Controller from "@ember/controller";
 import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
 
 export default class IndexController extends Controller {
   @service router;
 
+  queryParams = ["search", "category"];
+
+  @tracked search = "";
+  @tracked category = "active";
+
   @action
   newForm() {
     this.router.transitionTo("new");

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: {
-    services: ["apollo", "notification", "intl", "caluma-options", "validator"],
-  },
-});
+  dependencies = {
+    services: ["apollo", "notification", "intl", "caluma-options"],
+  };
+}
 
-loadInitializers(Eng, modulePrefix);
-
-export default Eng;
+loadInitializers(FormBuilderEngine, modulePrefix);

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/addon/instance-initializers/form-builder-widget-overrides.js

@@ -0,0 +1,15 @@
+import DefaultTableComponent from "@projectcaluma/ember-form-builder/components/cfb-form-editor/question/default/table";
+
+export function initialize(appInstance) {
+  const options = appInstance.lookup("service:caluma-options");
+
+  options.registerComponentOverride({
+    component: "cfb-form-editor/question/default/table",
+    componentClass: DefaultTableComponent,
+    types: [],
+  });
+}
+
+export default {
+  initialize,
+};

package/addon/modifiers/pikaday.js

@@ -0,0 +1,2 @@
+import "ember-pikaday/pikaday.css";
+export { default } from "ember-pikaday/modifiers/pikaday";

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,8 @@
-<CfbFormList @on-new-form={{this.newForm}} @on-edit-form={{this.editForm}} />
+<CfbFormList
+  @search={{this.search}}
+  @category={{this.category}}
+  @onNewForm={{this.newForm}}
+  @onEditForm={{this.editForm}}
+  @onUpdateSearch={{fn (mut this.search)}}
+  @onUpdateCategory={{fn (mut this.category)}}
+/>

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/instance-initializers/form-builder-widget-overrides.js

@@ -0,0 +1,4 @@
+export {
+  default,
+  initialize,
+} from "@projectcaluma/ember-form-builder/instance-initializers/form-builder-widget-overrides";

package/app/styles/@projectcaluma/ember-form-builder.scss

@@ -22,7 +22,7 @@
 .cfb-code-editor {
   font-family: $base-code-font-family;
   letter-spacing: normal;
-  height: 70px;
+  min-height: 70px;
   line-height: 16px;
   tab-size: 4;
 }

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.10",
   "description": "Ember engine for building Caluma forms.",
   "keywords": [
     "ember-addon",
@@ -14,50 +14,57 @@
     "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",
+    "@embroider/macros": "^1.5.0",
     "@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.5",
+    "@projectcaluma/ember-form": "^11.0.0-beta.13",
     "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.5",
+    "ember-changeset-validations": "^4.0.0-beta.3",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-htmlbars": "^6.0.1",
     "ember-composable-helpers": "^5.0.0",
-    "ember-concurrency": "^2.2.0",
+    "ember-concurrency": "^2.2.1",
     "ember-engines-router-service": "^0.3.0",
-    "ember-fetch": "^8.0.4",
-    "ember-math-helpers": "^2.18.0",
-    "ember-pikaday": "^3.0.0",
-    "ember-power-select": "^5.0.3",
-    "ember-resources": "^4.1.3",
+    "ember-fetch": "^8.1.1",
+    "ember-intl": "^5.7.2",
+    "ember-math-helpers": "^2.18.1",
+    "ember-pikaday": "^4.0.0",
+    "ember-power-select": "^5.0.4",
+    "ember-resources": "^4.4.0",
     "ember-test-selectors": "^6.0.0",
-    "ember-uikit": "^4.0.0",
-    "ember-validated-form": "^5.1.1",
+    "ember-uikit": "^5.0.0",
+    "ember-validated-form": "^5.3.0",
     "graphql": "^15.8.0",
     "graphql-tag": "^2.12.6",
     "jexl": "^2.3.0",
-    "moment": "^2.29.1",
-    "prismjs": "^1.26.0"
+    "prismjs": "^1.27.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.5.0",
+    "@faker-js/faker": "6.0.0-beta.0",
+    "@projectcaluma/ember-testing": "11.0.0-beta.4",
     "broccoli-asset-rev": "3.0.0",
+    "ember-autoresize-modifier": "^0.5.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": "3.0.0-alpha.2",
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
-    "ember-data": "3.28.7",
+    "ember-data": "3.28.8",
     "ember-disable-prototype-extensions": "1.1.3",
     "ember-engines": "0.8.20",
     "ember-export-application-global": "2.0.1",
@@ -68,12 +75,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": "2.18.0",
     "qunit-dom": "2.0.0",
-    "webpack": "5.65.0"
+    "webpack": "5.70.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"

package/translations/de.yaml

@@ -10,7 +10,7 @@ caluma:
       empty-search: "Keine Resultate gefunden. Passen Sie Ihre Suche an um bessere Resultate zu erhalten."
 
       not-found:
-        title: "Du siehst verloren aus"
+        title: "Sie sehen verloren aus"
         subtitle: "Die angefrage Seite existiert nicht!"
         home: "Zurück zum Start"
 
@@ -21,14 +21,13 @@ caluma:
       isArchived: "Archiviert"
       widgetOverride: "Spezialelement"
       isPublished: "Publiziert"
-      archived: "Archivierte"
       draft: "Entwurf"
-      active: "Aktive"
+      active: "Aktiv"
       all: "Alle"
 
       allForms: "Alle Formulare"
       new: "Neues Formular"
-      empty: "Wir haben keine Formulare gefunden. Klicken Sie den Knopf im der rechten oberen Ecke um ein Formular zu Erstellen!"
+      empty: "Wir haben keine Formulare gefunden. Klicken Sie den Knopf im der rechten oberen Ecke um ein Formular zu erstellen!"
       loadMore: "Mehr Formulare laden"
 
       not-found: "Kein Formular mit dem Slug '{slug}' gefunden"
@@ -63,6 +62,7 @@ caluma:
       dataSource: "Datenquelle"
       formatValidators: "Validierung"
       defaultValue: "Standardwert"
+      meta: "Metainformationen"
 
       general: "Allgemein"
       options: "Optionen"
@@ -73,7 +73,7 @@ caluma:
       max-length: "Maximale Länge"
       rowForm: "Formular für Tabelleneinträge"
       subForm: "Formular für Einträge"
-      choose: "-- bitte wählen --"
+      no-selection: "Keine Auswahl"
       search-placeholder: "Hier tippen um zu suchen"
       search-empty: "Keine Formulare gefunden"
       columnsToDisplay: "Spalten zur Anzeige im Formular"

package/translations/en.yaml

@@ -21,7 +21,6 @@ caluma:
       isArchived: "Archived"
       widgetOverride: "Custom widget"
       isPublished: "Published"
-      archived: "Archived"
       draft: "Draft"
       active: "Active"
       all: "All"
@@ -63,6 +62,7 @@ caluma:
       dataSource: "Data source"
       formatValidators: "Validation"
       defaultValue: "Default value"
+      meta: "Meta information"
 
       general: "General"
       options: "Options"
@@ -73,7 +73,7 @@ caluma:
       max-length: "Maximum length"
       rowForm: "Form to use for rows"
       subForm: "Form to use for entries"
-      choose: "-- please choose --"
+      no-selection: "No selection"
       search-placeholder: "Type here to search forms"
       search-empty: "Search didn't match any forms"
       columnsToDisplay: "Columns to be shown in the form"