@projectcaluma/ember-form-builder 11.0.0-beta.2 → 11.0.0-beta.24

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

@@ -1,7 +1,7 @@
 #import FormInfo from '../fragments/form-info.graphql'
 
 query FormEditorGeneral($slug: String!) {
-  allForms(filter: [{ slug: $slug }]) {
+  allForms(filter: [{ slugs: [$slug] }]) {
     edges {
       node {
         id

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

@@ -2,7 +2,7 @@
 #import FieldQuestion, FieldTableQuestion, SimpleAnswer, SimpleQuestion from '../fragments/field.graphql'
 
 query FormEditorQuestion($slug: String!) {
-  allQuestions(filter: [{ slug: $slug }]) {
+  allQuestions(filter: [{ slugs: [$slug] }]) {
     edges {
       node {
         id
@@ -11,6 +11,7 @@ query FormEditorQuestion($slug: String!) {
           integerMaxValue: maxValue
           integerMinValue: minValue
           placeholder
+          hintText
           defaultAnswer {
             id
             integerValue: value
@@ -20,6 +21,7 @@ query FormEditorQuestion($slug: String!) {
           floatMaxValue: maxValue
           floatMinValue: minValue
           placeholder
+          hintText
           defaultAnswer {
             id
             floatValue: value
@@ -29,21 +31,38 @@ query FormEditorQuestion($slug: String!) {
           minLength
           maxLength
           placeholder
+          hintText
           defaultAnswer {
             id
             stringValue: value
           }
+          formatValidators {
+            edges {
+              node {
+                slug
+              }
+            }
+          }
         }
         ... on TextareaQuestion {
           minLength
           maxLength
           placeholder
+          formatValidators {
+            edges {
+              node {
+                slug
+              }
+            }
+          }
+          hintText
           defaultAnswer {
             id
             stringValue: value
           }
         }
         ... on DateQuestion {
+          hintText
           defaultAnswer {
             id
             dateValue: value
@@ -60,6 +79,7 @@ query FormEditorQuestion($slug: String!) {
               }
             }
           }
+          hintText
           defaultAnswer {
             id
             listValue: value
@@ -76,6 +96,7 @@ query FormEditorQuestion($slug: String!) {
               }
             }
           }
+          hintText
           defaultAnswer {
             id
             stringValue: value
@@ -83,9 +104,11 @@ query FormEditorQuestion($slug: String!) {
         }
         ... on DynamicMultipleChoiceQuestion {
           dataSource
+          hintText
         }
         ... on DynamicChoiceQuestion {
           dataSource
+          hintText
         }
         ... on TableQuestion {
           rowForm {
@@ -101,6 +124,7 @@ query FormEditorQuestion($slug: String!) {
               }
             }
           }
+          hintText
           defaultAnswer {
             id
             tableValue: value {
@@ -137,6 +161,10 @@ query FormEditorQuestion($slug: String!) {
         }
         ... on CalculatedFloatQuestion {
           calcExpression
+          hintText
+        }
+        ... on FilesQuestion {
+          hintText
         }
         ... on ActionButtonQuestion {
           action

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

@@ -1,12 +1,12 @@
 #import QuestionInfo from '../fragments/question-info.graphql'
 
-query SearchFormQuestion($slug: String!, $search: String, $archived: Boolean) {
-  allForms(filter: [{ slug: $slug }]) {
+query SearchFormQuestion($slug: String!, $search: String) {
+  allForms(filter: [{ slugs: [$slug] }]) {
     edges {
       node {
         id
         slug
-        questions(search: $search, isArchived: $archived) {
+        questions(filter: [{ search: $search }]) {
           edges {
             node {
               id

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/routes/edit/questions/edit.js

@@ -20,9 +20,10 @@ export default class EditQuestionsEditRoute extends Route {
       {
         query: gql`
           query QuestionLabel($slug: String!) {
-            allQuestions(slug: $slug) {
+            allQuestions(filter: [{ slugs: [$slug] }]) {
               edges {
                 node {
+                  id
                   label
                 }
               }

package/addon/routes/edit.js

@@ -20,7 +20,7 @@ export default class EditRoute extends Route {
       {
         query: gql`
           query FormName($slug: String!) {
-            allForms(slug: $slug) {
+            allForms(filter: [{ slugs: [$slug] }]) {
               edges {
                 node {
                   name

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/validations/question.js

@@ -16,6 +16,12 @@ export default {
   label: and(validatePresence(true), validateLength({ max: 1024 })),
   slug: validateSlug(),
 
+  hintText: or(
+    validateType("FormQuestion", true),
+    validateType("StaticQuestion", true),
+    validateType("FilesQuestion", true),
+    validateLength({ max: 1024, allowBlank: true })
+  ),
   integerMinValue: or(
     validateType("IntegerQuestion", false),
     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

@@ -3,7 +3,7 @@
 @import "../cfb-form-editor/question-list/item";
 @import "../cfb-form-editor/question";
 @import "../cfb-navigation";
-@import "../cfb-powerselect";
+@import "../cfb-uikit-powerselect";
 
 .cfb-pointer {
   cursor: pointer;
@@ -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/styles/_cfb-uikit-powerselect.scss

@@ -0,0 +1,2 @@
+@import "@projectcaluma/ember-core";
+@import "ember-power-select";

package/index.js

@@ -9,10 +9,4 @@ module.exports = buildEngine({
   lazyLoading: {
     enabled: false,
   },
-
-  included(...args) {
-    this._super.included.apply(this, args);
-
-    this.import("node_modules/prismjs/themes/prism.css");
-  },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form-builder",
-  "version": "11.0.0-beta.2",
+  "version": "11.0.0-beta.24",
   "description": "Ember engine for building Caluma forms.",
   "keywords": [
     "ember-addon",
@@ -18,65 +18,76 @@
     "ember-engines": ">= 0.8"
   },
   "dependencies": {
-    "@ember/render-modifiers": "^2.0.3",
-    "@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.2",
-    "codejar": "^3.5.0",
-    "ember-apollo-client": "^3.2.0",
-    "ember-auto-import": "^2.3.0",
-    "ember-changeset": "^4.0.0-beta.1",
-    "ember-changeset-validations": "^4.0.0-beta.2",
+    "@ember/render-modifiers": "^2.0.4",
+    "@ember/string": "^3.0.0",
+    "@embroider/macros": "^1.8.3",
+    "@glimmer/component": "^1.1.2",
+    "@glimmer/tracking": "^1.1.2",
+    "@projectcaluma/ember-core": "^11.0.0-beta.24",
+    "@projectcaluma/ember-form": "^11.0.0-beta.24",
+    "codejar": "^3.6.0",
+    "ember-apollo-client": "~4.0.2",
+    "ember-auto-import": "^2.4.2",
+    "ember-changeset": "^4.1.0",
+    "ember-changeset-validations": "^4.1.0",
     "ember-cli-babel": "^7.26.11",
-    "ember-cli-htmlbars": "^6.0.1",
+    "ember-cli-htmlbars": "^6.1.0",
     "ember-composable-helpers": "^5.0.0",
-    "ember-concurrency": "^2.2.0",
+    "ember-concurrency": "^2.3.2",
     "ember-engines-router-service": "^0.3.0",
-    "ember-fetch": "^8.1.1",
-    "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.2",
+    "ember-intl": "^5.7.2",
+    "ember-math-helpers": "^2.18.2",
+    "ember-pikaday": "^4.0.0",
+    "ember-power-select": "^6.0.1",
+    "ember-resources": "^5.2.1",
     "ember-test-selectors": "^6.0.0",
-    "ember-uikit": "^4.0.0",
-    "ember-validated-form": "^5.1.1",
+    "ember-uikit": "^5.1.3",
+    "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"
+    "highlight.js": "^11.6.0",
+    "highlightjs-jexl": "^0.0.5",
+    "jexl": "^2.3.0"
   },
+  "//": [
+    "TODO: remove obsolete dependency to `ember-data` which is only necessary",
+    "because @embroider/macros `dependencySatisfies` still resolves to `true`",
+    "even if the dependency is only present in the workspace (because of the",
+    "docs app) but not as direct dependency of the package."
+  ],
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
-    "@ember/test-helpers": "2.6.0",
-    "@embroider/test-setup": "0.50.2",
-    "@faker-js/faker": "6.0.0-alpha.3",
-    "@projectcaluma/ember-testing": "10.2.0-beta.1",
+    "@ember/test-helpers": "2.8.1",
+    "@embroider/test-setup": "1.8.3",
+    "@faker-js/faker": "7.4.0",
+    "@projectcaluma/ember-testing": "11.0.0-beta.24",
     "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-dependency-checker": "3.3.1",
     "ember-cli-inject-live-reload": "2.1.0",
-    "ember-cli-mirage": "2.3.1",
+    "ember-cli-mirage": "3.0.0-alpha.3",
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
+    "ember-data": "3.28.10",
     "ember-disable-prototype-extensions": "1.1.3",
-    "ember-engines": "0.8.20",
+    "ember-engines": "0.8.23",
     "ember-export-application-global": "2.0.1",
     "ember-load-initializers": "2.1.2",
     "ember-maybe-import-regenerator": "1.0.0",
     "ember-qunit": "5.1.5",
     "ember-resolver": "8.0.3",
-    "ember-source": "3.28.8",
+    "ember-source": "3.28.9",
     "ember-source-channel-url": "3.0.0",
     "ember-try": "2.0.0",
     "loader.js": "4.7.0",
-    "miragejs": "0.1.43",
+    "miragejs": "0.1.45",
     "npm-run-all": "4.1.5",
-    "qunit": "2.17.2",
+    "qunit": "2.19.1",
     "qunit-dom": "2.0.0",
-    "webpack": "5.66.0"
+    "webpack": "5.74.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"
@@ -52,6 +51,7 @@ caluma:
       isRequired: "Pflichtfeld"
       staticContent: "Statischer Inhalt"
       infoText: "Infotext"
+      hintText: "Hinweistext"
       confirmationText: "Bestätigungstext"
       placeholder: "Platzhalter"
       isHidden: "Versteckt (JEXL)"
@@ -63,6 +63,7 @@ caluma:
       dataSource: "Datenquelle"
       formatValidators: "Validierung"
       defaultValue: "Standardwert"
+      meta: "Metainformationen"
 
       general: "Allgemein"
       options: "Optionen"
@@ -73,7 +74,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"
@@ -102,7 +103,7 @@ caluma:
         TextareaQuestion: "Text (mehrzeilig)"
         TableQuestion: "Tabelle"
         FormQuestion: "Formular"
-        FileQuestion: "Datei"
+        FilesQuestion: "Dateien"
         StaticQuestion: "Nichtinteraktiver Inhalt"
         DateQuestion: "Datum"
         DynamicMultipleChoiceQuestion: "Dynamische Mehrfachauswahl"

package/translations/en.yaml

@@ -21,7 +21,6 @@ caluma:
       isArchived: "Archived"
       widgetOverride: "Custom widget"
       isPublished: "Published"
-      archived: "Archived"
       draft: "Draft"
       active: "Active"
       all: "All"
@@ -52,6 +51,7 @@ caluma:
       isRequired: "Required"
       staticContent: "Static content"
       infoText: "Information text"
+      hintText: "Hint text"
       confirmationText: "Confirmation text"
       placeholder: "Placeholder"
       isHidden: "Hidden (JEXL)"
@@ -63,6 +63,7 @@ caluma:
       dataSource: "Data source"
       formatValidators: "Validation"
       defaultValue: "Default value"
+      meta: "Meta information"
 
       general: "General"
       options: "Options"
@@ -73,7 +74,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"
@@ -102,7 +103,7 @@ caluma:
         TextareaQuestion: "Textarea"
         TableQuestion: "Table"
         FormQuestion: "Form"
-        FileQuestion: "File"
+        FilesQuestion: "Files"
         StaticQuestion: "Non-interactive content"
         DateQuestion: "Date"
         DynamicMultipleChoiceQuestion: "Dynamic choices"