@projectcaluma/ember-form-builder 9.0.5 → 10.0.0

package/addon/gql/mutations/save-default-date-answer.graphql

@@ -1,9 +1,5 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/field-answer.graphql'
-
-mutation ($input: SaveDefaultDateAnswerInput!) {
+mutation SaveDefaultDateAnswer($input: SaveDefaultDateAnswerInput!) {
   saveDefaultDateAnswer(input: $input) {
-    answer {
-      ...FieldAnswer
-    }
+    clientMutationId
   }
 }

package/addon/gql/mutations/save-default-float-answer.graphql

@@ -1,9 +1,5 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/field-answer.graphql'
-
-mutation ($input: SaveDefaultFloatAnswerInput!) {
+mutation SaveDefaultFloatAnswer($input: SaveDefaultFloatAnswerInput!) {
   saveDefaultFloatAnswer(input: $input) {
-    answer {
-      ...FieldAnswer
-    }
+    clientMutationId
   }
 }

package/addon/gql/mutations/save-default-integer-answer.graphql

@@ -1,9 +1,5 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/field-answer.graphql'
-
-mutation ($input: SaveDefaultIntegerAnswerInput!) {
+mutation SaveDefaultIntegerAnswer($input: SaveDefaultIntegerAnswerInput!) {
   saveDefaultIntegerAnswer(input: $input) {
-    answer {
-      ...FieldAnswer
-    }
+    clientMutationId
   }
 }

package/addon/gql/mutations/save-default-list-answer.graphql

@@ -1,9 +1,5 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/field-answer.graphql'
-
-mutation ($input: SaveDefaultListAnswerInput!) {
+mutation SaveDefaultListAnswer($input: SaveDefaultListAnswerInput!) {
   saveDefaultListAnswer(input: $input) {
-    answer {
-      ...FieldAnswer
-    }
+    clientMutationId
   }
 }

package/addon/gql/mutations/save-default-string-answer.graphql

@@ -1,9 +1,5 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/field-answer.graphql'
-
-mutation ($input: SaveDefaultStringAnswerInput!) {
+mutation SaveDefaultStringAnswer($input: SaveDefaultStringAnswerInput!) {
   saveDefaultStringAnswer(input: $input) {
-    answer {
-      ...FieldAnswer
-    }
+    clientMutationId
   }
 }

package/addon/gql/mutations/save-default-table-answer.graphql

@@ -1,9 +1,5 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/field-answer.graphql'
-
-mutation ($input: SaveDefaultTableAnswerInput!) {
+mutation SaveDefaultTableAnswer($input: SaveDefaultTableAnswerInput!) {
   saveDefaultTableAnswer(input: $input) {
-    answer {
-      ...FieldAnswer
-    }
+    clientMutationId
   }
 }

package/addon/gql/mutations/save-dynamic-choice-question.graphql

@@ -1,4 +1,4 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/question-info.graphql'
+#import QuestionInfo from '../fragments/question-info.graphql'
 
 mutation SaveDynamicChoiceQuestion($input: SaveDynamicChoiceQuestionInput!) {
   saveDynamicChoiceQuestion(input: $input) {

package/addon/gql/mutations/save-dynamic-multiple-choice-question.graphql

@@ -1,4 +1,4 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/question-info.graphql'
+#import QuestionInfo from '../fragments/question-info.graphql'
 
 mutation SaveDynamicMultipleChoiceQuestion(
   $input: SaveDynamicMultipleChoiceQuestionInput!

package/addon/gql/mutations/save-file-question.graphql

@@ -1,4 +1,4 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/question-info.graphql'
+#import QuestionInfo from '../fragments/question-info.graphql'
 
 mutation SaveFileQuestion($input: SaveFileQuestionInput!) {
   saveFileQuestion(input: $input) {

package/addon/gql/mutations/save-float-question.graphql

@@ -1,4 +1,4 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/question-info.graphql'
+#import QuestionInfo from '../fragments/question-info.graphql'
 
 mutation SaveFloatQuestion($input: SaveFloatQuestionInput!) {
   saveFloatQuestion(input: $input) {

package/addon/gql/mutations/save-form-question.graphql

@@ -1,4 +1,4 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/question-info.graphql'
+#import QuestionInfo from '../fragments/question-info.graphql'
 
 mutation SaveFormQuestion($input: SaveFormQuestionInput!) {
   saveFormQuestion(input: $input) {

package/addon/gql/mutations/save-form.graphql

@@ -1,4 +1,4 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/form-info.graphql'
+#import FormInfo from '../fragments/form-info.graphql'
 
 mutation SaveForm($input: SaveFormInput!) {
   saveForm(input: $input) {

package/addon/gql/mutations/save-integer-question.graphql

@@ -1,4 +1,4 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/question-info.graphql'
+#import QuestionInfo from '../fragments/question-info.graphql'
 
 mutation SaveIntegerQuestion($input: SaveIntegerQuestionInput!) {
   saveIntegerQuestion(input: $input) {

package/addon/gql/mutations/save-multiple-choice-question.graphql

@@ -1,4 +1,4 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/question-info.graphql'
+#import QuestionInfo from '../fragments/question-info.graphql'
 
 mutation SaveMultipleChoiceQuestion($input: SaveMultipleChoiceQuestionInput!) {
   saveMultipleChoiceQuestion(input: $input) {

package/addon/gql/mutations/save-static-question.graphql

@@ -1,4 +1,4 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/question-info.graphql'
+#import QuestionInfo from '../fragments/question-info.graphql'
 
 mutation SaveStaticQuestion($input: SaveStaticQuestionInput!) {
   saveStaticQuestion(input: $input) {

package/addon/gql/mutations/save-table-question.graphql

@@ -1,4 +1,4 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/question-info.graphql'
+#import QuestionInfo from '../fragments/question-info.graphql'
 
 mutation SaveTableQuestion($input: SaveTableQuestionInput!) {
   saveTableQuestion(input: $input) {

package/addon/gql/mutations/save-text-question.graphql

@@ -1,4 +1,4 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/question-info.graphql'
+#import QuestionInfo from '../fragments/question-info.graphql'
 
 mutation SaveTextQuestion($input: SaveTextQuestionInput!) {
   saveTextQuestion(input: $input) {

package/addon/gql/mutations/save-textarea-question.graphql

@@ -1,4 +1,4 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/question-info.graphql'
+#import QuestionInfo from '../fragments/question-info.graphql'
 
 mutation SaveTextareaQuestion($input: SaveTextareaQuestionInput!) {
   saveTextareaQuestion(input: $input) {

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

@@ -1,4 +1,4 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/form-info.graphql'
+#import FormInfo from '../fragments/form-info.graphql'
 
 query FormEditorGeneral($slug: String!) {
   allForms(filter: [{ slug: $slug }]) {

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

@@ -1,6 +1,5 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/question-info.graphql'
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/field-question.graphql'
-# import SimpleAnswer from '@projectcaluma/ember-form-builder/gql/fragments/field-answer.graphql'
+#import QuestionInfo from '../fragments/question-info.graphql'
+#import FieldQuestion, FieldTableQuestion, SimpleAnswer, SimpleQuestion from '../fragments/field.graphql'
 
 query FormEditorQuestion($slug: String!) {
   allQuestions(filter: [{ slug: $slug }]) {
@@ -132,6 +131,11 @@ query FormEditorQuestion($slug: String!) {
         ... on CalculatedFloatQuestion {
           calcExpression
         }
+        ... on ActionButtonQuestion {
+          action
+          color
+          validateOnEnter
+        }
       }
     }
   }

package/addon/gql/queries/form-list.graphql

@@ -1,4 +1,4 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/form-info.graphql'
+#import FormInfo from '../fragments/form-info.graphql'
 
 query FormList($filter: [FormFilterSetType], $order: [FormOrderSetType]) {
   allForms(filter: $filter, order: $order) {

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

@@ -1,4 +1,4 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/question-info.graphql'
+#import QuestionInfo from '../fragments/question-info.graphql'
 
 query SearchFormQuestion($slug: String!, $search: String, $archived: Boolean) {
   allForms(filter: [{ slug: $slug }]) {

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

@@ -1,4 +1,4 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/question-info.graphql'
+#import QuestionInfo from '../fragments/question-info.graphql'
 
 query SearchQuestion(
   $search: String

package/addon/routes/edit/questions/edit.js

@@ -2,7 +2,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 gql from "graphql-tag";
+import { gql } from "graphql-tag";
 
 import { navigationTitle } from "@projectcaluma/ember-form-builder/decorators";
 

package/addon/routes/edit.js

@@ -2,7 +2,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 gql from "graphql-tag";
+import { gql } from "graphql-tag";
 
 import { navigationTitle } from "@projectcaluma/ember-form-builder/decorators";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form-builder",
-  "version": "9.0.5",
+  "version": "10.0.0",
   "description": "Ember engine for building Caluma forms.",
   "keywords": [
     "ember-addon",
@@ -18,39 +18,39 @@
     "@ember/render-modifiers": "^2.0.0",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
-    "@projectcaluma/ember-core": "9.0.3",
-    "@projectcaluma/ember-form": "9.1.1",
+    "@projectcaluma/ember-core": "^10.0.0",
+    "@projectcaluma/ember-form": "^10.0.0",
     "codejar": "^3.5.0",
     "ember-apollo-client": "^3.2.0",
-    "ember-auto-import": "^2.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": "^5.7.1",
+    "ember-cli-htmlbars": "^6.0.0",
     "ember-composable-helpers": "^4.5.0",
-    "ember-concurrency": "^2.1.2",
+    "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.17.3",
+    "ember-math-helpers": "^2.18.0",
     "ember-pikaday": "^3.0.0",
-    "ember-power-select": "^4.1.6",
+    "ember-power-select": "^4.1.7",
     "ember-test-selectors": "^6.0.0",
     "ember-uikit": "^4.0.0",
-    "ember-validated-form": "^3.0.3",
-    "graphql": "^15.6.0",
-    "graphql-tag": "^2.12.5",
+    "ember-validated-form": "^5.0.0",
+    "graphql": "^15.6.1",
+    "graphql-tag": "^2.12.6",
     "jexl": "^2.3.0",
     "moment": "^2.29.1",
     "prismjs": "^1.25.0"
   },
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
-    "@ember/test-helpers": "2.5.0",
-    "@embroider/test-setup": "0.45.0",
-    "@projectcaluma/ember-testing": "9.0.0",
+    "@ember/test-helpers": "2.6.0",
+    "@embroider/test-setup": "0.47.2",
+    "@projectcaluma/ember-testing": "9.1.0",
     "broccoli-asset-rev": "3.0.0",
-    "ember-cli": "3.28.1",
+    "ember-cli": "3.28.4",
     "ember-cli-code-coverage": "1.0.3",
     "ember-cli-dependency-checker": "3.2.0",
     "ember-cli-inject-live-reload": "2.1.0",
@@ -59,24 +59,24 @@
     "ember-cli-terser": "4.0.2",
     "ember-data": "3.28.3",
     "ember-disable-prototype-extensions": "1.1.3",
-    "ember-engines": "0.8.19",
+    "ember-engines": "0.8.20",
     "ember-export-application-global": "2.0.1",
     "ember-load-initializers": "2.1.2",
     "ember-maybe-import-regenerator": "1.0.0",
-    "ember-qunit": "5.1.4",
+    "ember-qunit": "5.1.5",
     "ember-resolver": "8.0.3",
-    "ember-source": "3.28.1",
+    "ember-source": "3.28.6",
     "ember-source-channel-url": "3.0.0",
-    "ember-try": "1.4.0",
+    "ember-try": "2.0.0",
     "faker": "5.5.3",
     "loader.js": "4.7.0",
     "npm-run-all": "4.1.5",
     "qunit": "2.17.2",
     "qunit-dom": "2.0.0",
-    "webpack": "5.58.0"
+    "webpack": "5.64.1"
   },
   "engines": {
-    "node": "10.* || >= 12"
+    "node": "12.* || 14.* || >= 16"
   },
   "ember": {
     "edition": "octane"

package/translations/de.yaml

@@ -52,6 +52,7 @@ caluma:
       isRequired: "Pflichtfeld"
       staticContent: "Statischer Inhalt"
       infoText: "Infotext"
+      confirmationText: "Bestätigungstext"
       placeholder: "Platzhalter"
       isHidden: "Versteckt (JEXL)"
       widgetOverride: "Anzeigetyp"
@@ -75,8 +76,8 @@ caluma:
       choose: "-- bitte wählen --"
       search-placeholder: "Hier tippen um zu suchen"
       search-empty: "Keine Formulare gefunden"
-      columnsToDisplay: "Spalten zur Anzeige auswählen"
-      calcExpression: "Berechnungsformel"
+      columnsToDisplay: "Spalten zur Anzeige im Formular"
+      calcExpression: "Berechnungsformel (JEXL)"
 
       new: "Neue Frage"
 
@@ -107,12 +108,25 @@ caluma:
         DynamicMultipleChoiceQuestion: "Dynamische Mehrfachauswahl"
         DynamicChoiceQuestion: "Dynamische Einzelauswahl"
         CalculatedFloatQuestion: "Berechnung (Gleitkommazahl)"
+        ActionButtonQuestion: "Aktionsbutton"
+
+      confirmText: "Bestätigungstext"
+      action: "Aktion"
+      color: "Farbe"
+      validateOnEnter: "Validierung beim Betreten des Fensters"
+
+      actions:
+        COMPLETE: "Abschliessen"
+        SKIP: "Überspringen"
+
+      colors:
+        PRIMARY: "Primär"
+        SECONDARY: "Sekundär"
+        DEFAULT: "Standard"
 
       widgetOverrides:
         powerselect: "Power Select"
         hidden: "Versteckt"
-        dummy-one: "Dummy One"
-        dummy-two: "Dummy Two"
 
       not-found: "Keine Frage mit dem Slug '{slug}' gefunden"
 

package/translations/en.yaml

@@ -52,6 +52,7 @@ caluma:
       isRequired: "Required"
       staticContent: "Static content"
       infoText: "Information text"
+      confirmationText: "Confirmation text"
       placeholder: "Placeholder"
       isHidden: "Hidden (JEXL)"
       widgetOverride: "Widget type"
@@ -75,8 +76,8 @@ caluma:
       choose: "-- please choose --"
       search-placeholder: "Type here to search forms"
       search-empty: "Search didn't match any forms"
-      columnsToDisplay: "Select columns to be shown"
-      calcExpression: "Calculation formula"
+      columnsToDisplay: "Columns to be shown in the form"
+      calcExpression: "Calculation formula (JEXL)"
 
       new: "New question"
 
@@ -107,12 +108,25 @@ caluma:
         DynamicMultipleChoiceQuestion: "Dynamic choices"
         DynamicChoiceQuestion: "Dynamic choice"
         CalculatedFloatQuestion: "Calculation (float)"
+        ActionButtonQuestion: "Action button"
+
+      confirmText: "Confirm text"
+      action: "Action"
+      color: "Color"
+      validateOnEnter: "Validate on entering the viewport"
+
+      actions:
+        COMPLETE: "Complete"
+        SKIP: "Skip"
+
+      colors:
+        PRIMARY: "Primary"
+        SECONDARY: "Secondary"
+        DEFAULT: "Default"
 
       widgetOverrides:
         powerselect: "Power Select"
         hidden: "Hidden"
-        dummy-one: "Dummy One"
-        dummy-two: "Dummy Two"
 
       not-found: "No question with slug '{slug}' found"
 

package/addon/components/cfb-float-input/input.js

@@ -1,12 +0,0 @@
-import InputComponent from "ember-validated-form/components/validated-input/types/-themes/uikit/input";
-
-export default InputComponent.extend({
-  init(...args) {
-    this._super(...args);
-
-    this.set("type", "number");
-  },
-
-  attributeBindings: ["step"],
-  step: "any",
-});

package/addon/components/cfb-label.js

@@ -1,5 +0,0 @@
-import LabelComponent from "ember-validated-form/components/validated-input/-themes/uikit/label";
-
-export default LabelComponent.extend({
-  classNames: ["uk-flex", "uk-flex-between"],
-});

package/addon/gql/fragments/field-answer.graphql

@@ -1,57 +0,0 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/field-question.graphql'
-
-fragment SimpleAnswer on Answer {
-  id
-  question {
-    slug
-  }
-  ... on StringAnswer {
-    stringValue: value
-  }
-  ... on IntegerAnswer {
-    integerValue: value
-  }
-  ... on FloatAnswer {
-    floatValue: value
-  }
-  ... on ListAnswer {
-    listValue: value
-  }
-  ... on FileAnswer {
-    fileValue: value {
-      uploadUrl
-      downloadUrl
-      metadata
-      name
-    }
-  }
-  ... on DateAnswer {
-    dateValue: value
-  }
-}
-
-fragment FieldAnswer on Answer {
-  ...SimpleAnswer
-  ... on TableAnswer {
-    tableValue: value {
-      id
-      form {
-        slug
-        questions {
-          edges {
-            node {
-              ...FieldQuestion
-            }
-          }
-        }
-      }
-      answers {
-        edges {
-          node {
-            ...SimpleAnswer
-          }
-        }
-      }
-    }
-  }
-}

package/addon/gql/fragments/field-question.graphql

@@ -1,159 +0,0 @@
-fragment SimpleQuestion on Question {
-  slug
-  label
-  isRequired
-  isHidden
-  meta
-  infoText
-  ... on TextQuestion {
-    textMinLength: minLength
-    textMaxLength: maxLength
-    textDefaultAnswer: defaultAnswer {
-      value
-    }
-    placeholder
-  }
-  ... on TextareaQuestion {
-    textareaMinLength: minLength
-    textareaMaxLength: maxLength
-    textareaDefaultAnswer: defaultAnswer {
-      value
-    }
-    placeholder
-  }
-  ... on IntegerQuestion {
-    integerMinValue: minValue
-    integerMaxValue: maxValue
-    integerDefaultAnswer: defaultAnswer {
-      value
-    }
-    placeholder
-  }
-  ... on FloatQuestion {
-    floatMinValue: minValue
-    floatMaxValue: maxValue
-    floatDefaultAnswer: defaultAnswer {
-      value
-    }
-    placeholder
-  }
-  ... on ChoiceQuestion {
-    choiceOptions: options {
-      edges {
-        node {
-          slug
-          label
-          isArchived
-        }
-      }
-    }
-    choiceDefaultAnswer: defaultAnswer {
-      value
-    }
-  }
-  ... on MultipleChoiceQuestion {
-    multipleChoiceOptions: options {
-      edges {
-        node {
-          slug
-          label
-          isArchived
-        }
-      }
-    }
-    multipleChoiceDefaultAnswer: defaultAnswer {
-      value
-    }
-  }
-  ... on DateQuestion {
-    dateDefaultAnswer: defaultAnswer {
-      value
-    }
-  }
-  ... on StaticQuestion {
-    staticContent
-  }
-  ... on CalculatedFloatQuestion {
-    calcExpression
-  }
-}
-
-fragment FieldTableQuestion on Question {
-  ... on TableQuestion {
-    rowForm {
-      slug
-      questions {
-        edges {
-          node {
-            ...SimpleQuestion
-          }
-        }
-      }
-    }
-    tableDefaultAnswer: defaultAnswer {
-      value {
-        id
-        answers {
-          edges {
-            node {
-              id
-              question {
-                slug
-              }
-              ... on StringAnswer {
-                stringValue: value
-              }
-              ... on IntegerAnswer {
-                integerValue: value
-              }
-              ... on FloatAnswer {
-                floatValue: value
-              }
-              ... on ListAnswer {
-                listValue: value
-              }
-              ... on DateAnswer {
-                dateValue: value
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-fragment FieldQuestion on Question {
-  ...SimpleQuestion
-  ...FieldTableQuestion
-  ... on FormQuestion {
-    subForm {
-      slug
-      name
-      questions {
-        edges {
-          node {
-            # This part here limits our query to 2 level deep nested forms. This
-            # has to be solved in another way!
-            ...SimpleQuestion
-            ...FieldTableQuestion
-            ... on FormQuestion {
-              subForm {
-                slug
-                name
-                questions {
-                  edges {
-                    node {
-                      ...SimpleQuestion
-                      ...FieldTableQuestion
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}