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

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": "10.0.2",
+  "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.0",
+    "@ember/render-modifiers": "^2.0.4",
+    "@embroider/macros": "^1.5.0",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
-    "@projectcaluma/ember-core": "^10.0.2",
-    "@projectcaluma/ember-form": "^10.0.2",
+    "@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-cli-babel": "^7.26.6",
-    "ember-cli-htmlbars": "^6.0.0",
-    "ember-composable-helpers": "^4.5.0",
-    "ember-concurrency": "^2.2.0",
-    "ember-concurrency-decorators": "^2.0.3",
+    "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.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": "^4.1.7",
+    "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.0.0",
-    "graphql": "^15.6.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.25.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.47.2",
-    "@projectcaluma/ember-testing": "10.0.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-cli": "3.28.4",
+    "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.3",
+    "ember-data": "3.28.8",
     "ember-disable-prototype-extensions": "1.1.3",
     "ember-engines": "0.8.20",
     "ember-export-application-global": "2.0.1",
@@ -65,15 +72,15 @@
     "ember-maybe-import-regenerator": "1.0.0",
     "ember-qunit": "5.1.5",
     "ember-resolver": "8.0.3",
-    "ember-source": "3.28.6",
+    "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.64.1"
+    "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"

package/translations/fr.yaml

@@ -1,9 +1,41 @@
 caluma:
   form-builder:
+    global:
+      save: "Enregistrer"
+      loading: "Télécharger"
+      cancel: "Annuler"
+      search: "Chercher"
+      optional: "Facultatif"
+
+      empty-search: "Aucun résultat trouvé. Adaptez votre recherche pour obtenir de meilleurs résultats."
+
+      not-found:
+        title: "Vous avez l'air perdu"
+        subtitle: "La page demandée n'existe pas !"
+        home: "Retour au départ"
+
+    form:
+      name: "Nom"
+      slug: "Slug"
+      description: "Description"
+      isArchived: "Archivé"
+      widgetOverride: "Élément spécial"
+      isPublished: "Publié"
+      draft: "Brouillon"
+      active: "Actif"
+      all: "Tous"
+
+      allForms: "Tous les formulaires"
+      new: "Nouveau formulaire"
+      empty: "Nous n'avons trouvé aucun formulaire. Cliquez sur le bouton dans le coin supérieur droit pour créer un formulaire !"
+      loadMore: "Télécharger plus de formulaires"
+
+      not-found: "Aucun formulaire trouvé avec le slug '{slug}'"
+
     question-list:
       required:
         label: "Obligatoire (JEXL)"
-        not-required: "Optionnel"
+        not-required: "Facultatif"
         required: "Obligatoire"
         conditional: "Conditionnellement obligatoire"
       hidden:
@@ -13,11 +45,132 @@ caluma:
         conditional: "Conditionnellement caché"
 
     question:
+      label: "Étiquette"
+      slug: "Slug"
+      type: "Type"
+      isRequired: "Champ obligatoire"
+      staticContent: "Contenu statique"
+      infoText: "Texte d'information"
+      confirmationText: "Texte de confirmation"
+      placeholder: "Caractère générique"
+      isHidden: "Caché (JEXL)"
+      widgetOverride: "Type d'affichage"
+      isArchived: "Archivé"
+      type-disabled: "Le type de question ne peut pas être modifié après la création d'une question afin d'éviter les données corrompues."
+      supportsMarkdownPrefix: "Ce champ supporte"
+      markdown: "Markdown"
+      dataSource: "Source des données"
+      formatValidators: "Validation"
       defaultValue: "Valeur par défaut"
+      meta: "Méta-informations"
+
+      general: "Général"
+      options: "Options"
+
+      min-value: "Valeur minimale"
+      max-value: "Valeur maximale"
+      min-length: "Longueur minimale"
+      max-length: "Longueur maximale"
+      rowForm: "Formulaire pour les entrées de tableau"
+      subForm: "Formulaire pour les entrées"
+      no-selection: "Aucune sélection"
       search-placeholder: "Tapez ici pour rechercher"
       search-empty: "Pas de formulaires trouvés"
+      columnsToDisplay: "Colonnes à afficher dans le formulaire"
+      calcExpression: "Formule de calcul (JEXL)"
+
+      new: "Nouvelle question"
+
+      minor-info-title: "Important !"
+      minor-info: "L'adaptation d'une question ne doit jamais modifier le sens de la question afin de maintenir la cohérence des données."
+
+      remove: "Supprimer la question"
+      add: "Ajouter une question nouvelle ou existante"
+      search: "Chercher une question (étiquette ou slug)"
+      create: "ou créer une nouvelle question"
+      loadMore: "Télécharger plus de questions"
+
+      empty: "Vous n'avez pas encore ajouté de questions. Appuyez sur le bouton ci-dessus pour le faire !"
+      advancedSettings: "Paramètres avancés"
+
+      types:
+        IntegerQuestion: "Nombre entier"
+        FloatQuestion: "Nombre à virgule flottante"
+        MultipleChoiceQuestion: "Sélection multiple"
+        ChoiceQuestion: "Sélection individuel"
+        TextQuestion: "Texte"
+        TextareaQuestion: "Texte (plusieurs lignes)"
+        TableQuestion: "Tableau"
+        FormQuestion: "Formulaire"
+        FileQuestion: "Fichier"
+        StaticQuestion: "Contenu non interactif"
+        DateQuestion: "Date"
+        DynamicMultipleChoiceQuestion: "Sélection multiple dynamique"
+        DynamicChoiceQuestion: "Sélection individuel dynamique"
+        CalculatedFloatQuestion: "Calcul (nombre à virgule flottante)"
+        ActionButtonQuestion: "Bouton d'action"
+
+      confirmText: "Texte de confirmation"
+      action: "Action"
+      color: "Couleur"
+      validateOnEnter: "Validation lors de l'entrée dans la fenêtre"
+
+      actions:
+        COMPLETE: "Conclure"
+        SKIP: "Sauter"
+
+      colors:
+        PRIMARY: "Primaire"
+        SECONDARY: "Secondaire"
+        DEFAULT: "Défaut"
+
+      widgetOverrides:
+        powerselect: "Power Select"
+        hidden: "Caché"
+
+      not-found: "Aucune question trouvée avec le slug '{slug}'"
+
+      hideLabel: "Cacher l'étiquette"
 
     options:
       delete: "Supprimer l'option"
       archive: "Archiver (masquer) l'option"
       restore: "Restaurer l'option"
+
+    notification:
+      form:
+        save:
+          success: "Votre formulaire a été enregistré avec succès !"
+          error: "Oups, quelque chose s'est mal passé lors de l'enregistrement du formulaire..."
+
+        create:
+          success: "Votre formulaire a été créé avec succès !"
+          error: "Oups, quelque chose s'est mal passé lors de la création du formulaire..."
+
+        reorder-questions:
+          success: "Vos questions ont été triées avec succès !"
+          error: "Oups, quelque chose s'est mal passé lors du tri des questions..."
+
+        reorder-options:
+          success: "Vos options ont été triées avec succès !"
+          error: "Oups, quelque chose s'est mal passé lors du tri des options..."
+
+        add-question:
+          success: "La question a été ajoutée avec succès à votre formulaire !"
+          error: "Oups, quelque chose s'est mal passé lors de l'ajout de la question..."
+
+        remove-question:
+          success: "La question a été supprimée avec succès de votre formulaire !"
+          error: "Oups, quelque chose s'est mal passé lors de la suppression de la question..."
+
+      question:
+        save:
+          success: "Votre question a été enregistrée avec succès !"
+          error: "Oups, quelque chose s'est mal passé lors de l'enregistrement de la question..."
+
+    validations:
+      form:
+        slug: "Un formulaire avec ce slug existe déjà"
+
+      question:
+        slug: "Une question avec ce slug existe déjà"