@projectcaluma/ember-form-builder 9.0.6 → 10.0.1

package/addon/components/cfb-form-editor/question/validation.js

@@ -3,7 +3,7 @@ import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
 import { dropTask } from "ember-concurrency";
 
-import allFormatValidatorsQuery from "@projectcaluma/ember-form-builder/gql/queries/all-format-validators.graphql";
+import allFormatValidatorsQuery from "@projectcaluma/ember-core/gql/queries/all-format-validators.graphql";
 
 export default class CfbFormEditorQuestionValidation extends Component {
   @queryManager apollo;

package/addon/components/cfb-form-editor/question.hbs

@@ -86,7 +86,9 @@
         {{#if
           (not
             (or
-              (has-question-type f.model "static" "calculated-float")
+              (has-question-type
+                f.model "static" "calculated-float" "action-button"
+              )
               (not (includes f.model.isRequired (array "true" "false")))
             )
           )
@@ -134,25 +136,33 @@
         </div>
       {{/if}}
 
-      <div class="uk-margin">
+      {{#if (has-question-type f.model "action-button")}}
         <f.input
-          @label={{t "caluma.form-builder.question.infoText"}}
+          @label={{t "caluma.form-builder.question.confirmationText"}}
           @name="infoText"
-          @renderComponent={{component
-            "cfb-code-editor"
-            language="markdown"
-            className="uk-margin-remove-bottom"
-          }}
+          @type="textarea"
         />
-        <small class="uk-text-muted">
-          {{t "caluma.form-builder.question.supportsMarkdownPrefix"}}
-          <a
-            target="_blank"
-            rel="noopener noreferrer"
-            href="https://www.markdownguide.org/basic-syntax"
-          >{{t "caluma.form-builder.question.markdown"}}</a>
-        </small>
-      </div>
+      {{else}}
+        <div class="uk-margin">
+          <f.input
+            @label={{t "caluma.form-builder.question.infoText"}}
+            @name="infoText"
+            @renderComponent={{component
+              "cfb-code-editor"
+              language="markdown"
+              className="uk-margin-remove-bottom"
+            }}
+          />
+          <small class="uk-text-muted">
+            {{t "caluma.form-builder.question.supportsMarkdownPrefix"}}
+            <a
+              target="_blank"
+              rel="noopener noreferrer"
+              href="https://www.markdownguide.org/basic-syntax"
+            >{{t "caluma.form-builder.question.markdown"}}</a>
+          </small>
+        </div>
+      {{/if}}
 
       {{#if (has-question-type f.model "text" "textarea" "integer" "float")}}
         <f.input
@@ -208,6 +218,27 @@
         />
       {{/if}}
 
+      {{#if (has-question-type f.model "action-button")}}
+        <f.input
+          @type="select"
+          @options={{this.possibleActions}}
+          @optionLabelPath="label"
+          @optionTargetPath="value"
+          @label={{t "caluma.form-builder.question.action"}}
+          @name="action"
+          @required={{true}}
+        />
+        <f.input
+          @type="select"
+          @options={{this.possibleColors}}
+          @optionLabelPath="label"
+          @optionTargetPath="value"
+          @label={{t "caluma.form-builder.question.color"}}
+          @name="color"
+          @required={{true}}
+        />
+      {{/if}}
+
       {{#if (has-question-type f.model "float")}}
         <div uk-grid class="uk-grid-small uk-child-width-1-2 uk-margin">
           <div>
@@ -272,14 +303,16 @@
         />
       {{/if}}
 
-      <f.input
-        @name="meta.hideLabel"
-        @required={{true}}
-        @label={{t "caluma.form-builder.question.hideLabel"}}
-        @renderComponent={{component "cfb-toggle-switch" size="small"}}
-        @on-update={{changeset-set f.model "meta.hideLabel"}}
-        @value={{changeset-get f.model "meta.hideLabel"}}
-      />
+      {{#if (not (has-question-type f.model "action-button"))}}
+        <f.input
+          @name="meta.hideLabel"
+          @required={{true}}
+          @label={{t "caluma.form-builder.question.hideLabel"}}
+          @renderComponent={{component "cfb-toggle-switch" size="small"}}
+          @on-update={{changeset-set f.model "meta.hideLabel"}}
+          @value={{changeset-get f.model "meta.hideLabel"}}
+        />
+      {{/if}}
 
       {{#if (has-question-type f.model "table")}}
         <div class="uk-margin">
@@ -428,6 +461,16 @@
       </UkButton>
 
       {{#if this.showAdvanced}}
+        {{#if (has-question-type f.model "action-button")}}
+          <f.input
+            @name="validateOnEnter"
+            @required={{true}}
+            @label={{t "caluma.form-builder.question.validateOnEnter"}}
+            @renderComponent={{component "cfb-toggle-switch" size="small"}}
+            class="uk-flex uk-flex-between uk-flex-column"
+          />
+        {{/if}}
+
         <div class="uk-margin">
           <f.input
             @label={{t "caluma.form-builder.question.isHidden"}}
@@ -436,7 +479,13 @@
           />
         </div>
 
-        {{#if (not (has-question-type f.model "static" "calculated-float"))}}
+        {{#if
+          (not
+            (has-question-type
+              f.model "static" "calculated-float" "action-button"
+            )
+          )
+        }}
           <div class="uk-margin">
             <f.input
               @label={{t "caluma.form-builder.question.isRequired"}}

package/addon/components/cfb-form-editor/question.js

@@ -16,6 +16,7 @@ import { hasQuestionType } from "@projectcaluma/ember-core/helpers/has-question-
 import slugify from "@projectcaluma/ember-core/utils/slugify";
 import addFormQuestionMutation from "@projectcaluma/ember-form-builder/gql/mutations/add-form-question.graphql";
 import removeDefaultAnswerMutation from "@projectcaluma/ember-form-builder/gql/mutations/remove-default-answer.graphql";
+import saveActionButtonQuestionMutation from "@projectcaluma/ember-form-builder/gql/mutations/save-action-button-question.graphql";
 import saveCalculatedFloatQuestionMutation from "@projectcaluma/ember-form-builder/gql/mutations/save-calculated-float-question.graphql";
 import saveChoiceQuestionMutation from "@projectcaluma/ember-form-builder/gql/mutations/save-choice-question.graphql";
 import saveDateQuestionMutation from "@projectcaluma/ember-form-builder/gql/mutations/save-date-question.graphql";
@@ -58,8 +59,13 @@ export const TYPES = {
   StaticQuestion: saveStaticQuestionMutation,
   DateQuestion: saveDateQuestionMutation,
   CalculatedFloatQuestion: saveCalculatedFloatQuestionMutation,
+  ActionButtonQuestion: saveActionButtonQuestionMutation,
 };
 
+const ACTIONS = ["COMPLETE", "SKIP"];
+
+const COLORS = ["PRIMARY", "SECONDARY", "DEFAULT"];
+
 const TYPES_ANSWER = {
   StringAnswer: saveDefaultStringAnswerMutation,
   IntegerAnswer: saveDefaultIntegerAnswerMutation,
@@ -101,6 +107,10 @@ export default class CfbFormEditorQuestion extends Component {
             subForm: {},
             meta: {},
             dataSource: "",
+            // action button
+            action: ACTIONS[0],
+            color: COLORS[0],
+            validateOnEnter: false,
             __typename: Object.keys(TYPES)[0],
           },
         },
@@ -157,6 +167,20 @@ export default class CfbFormEditorQuestion extends Component {
     }));
   }
 
+  get possibleActions() {
+    return ACTIONS.map((value) => ({
+      value,
+      label: this.intl.t(`caluma.form-builder.question.actions.${value}`),
+    }));
+  }
+
+  get possibleColors() {
+    return COLORS.map((value) => ({
+      value,
+      label: this.intl.t(`caluma.form-builder.question.colors.${value}`),
+    }));
+  }
+
   get availableOverrides() {
     const type = this.changeset.get("__typename");
     const overrides = this.calumaOptions
@@ -292,6 +316,14 @@ export default class CfbFormEditorQuestion extends Component {
     };
   }
 
+  _getActionButtonQuestionInput(changeset) {
+    return {
+      action: changeset.get("action"),
+      color: changeset.get("color"),
+      validateOnEnter: Boolean(changeset.get("validateOnEnter")),
+    };
+  }
+
   @task
   *saveOptions(changeset) {
     yield all(

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

@@ -1,5 +1,5 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/form-info.graphql'
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/question-info.graphql'
+#import FormInfo from '../fragments/form-info.graphql'
+#import QuestionInfo from '../fragments/question-info.graphql'
 
 mutation AddFormQuestion($input: AddFormQuestionInput!, $search: String) {
   addFormQuestion(input: $input) {

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

@@ -1,5 +1,5 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/form-info.graphql'
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/question-info.graphql'
+#import FormInfo from '../fragments/form-info.graphql'
+#import QuestionInfo from '../fragments/question-info.graphql'
 
 mutation RemoveFormQuestion($input: RemoveFormQuestionInput!, $search: String) {
   removeFormQuestion(input: $input) {

package/addon/gql/mutations/reorder-form-questions.graphql

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

package/addon/gql/mutations/save-action-button-question.graphql

@@ -0,0 +1,15 @@
+#import QuestionInfo from '../fragments/question-info.graphql'
+
+mutation SaveActionButtonQuestion($input: SaveActionButtonQuestionInput!) {
+  saveActionButtonQuestion(input: $input) {
+    question {
+      ...QuestionInfo
+      ... on ActionButtonQuestion {
+        action
+        color
+        validateOnEnter
+      }
+    }
+    clientMutationId
+  }
+}

package/addon/gql/mutations/save-calculated-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 SaveCalculatedFloatQuestion(
   $input: SaveCalculatedFloatQuestionInput!

package/addon/gql/mutations/save-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 SaveChoiceQuestion($input: SaveChoiceQuestionInput!) {
   saveChoiceQuestion(input: $input) {

package/addon/gql/mutations/save-date-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 SaveDateQuestion($input: SaveDateQuestionInput!) {
   saveDateQuestion(input: $input) {

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.6",
+  "version": "10.0.1",
   "description": "Ember engine for building Caluma forms.",
   "keywords": [
     "ember-addon",
@@ -18,8 +18,8 @@
     "@ember/render-modifiers": "^2.0.0",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
-    "@projectcaluma/ember-core": "9.1.0",
-    "@projectcaluma/ember-form": "9.1.2",
+    "@projectcaluma/ember-core": "^10.0.1",
+    "@projectcaluma/ember-form": "^10.0.1",
     "codejar": "^3.5.0",
     "ember-apollo-client": "^3.2.0",
     "ember-auto-import": "^2.2.3",
@@ -32,14 +32,14 @@
     "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": "^5.0.0",
     "graphql": "^15.6.1",
-    "graphql-tag": "^2.12.5",
+    "graphql-tag": "^2.12.6",
     "jexl": "^2.3.0",
     "moment": "^2.29.1",
     "prismjs": "^1.25.0"
@@ -47,10 +47,10 @@
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
     "@ember/test-helpers": "2.6.0",
-    "@embroider/test-setup": "0.47.1",
-    "@projectcaluma/ember-testing": "9.0.0",
+    "@embroider/test-setup": "0.47.2",
+    "@projectcaluma/ember-testing": "9.1.0",
     "broccoli-asset-rev": "3.0.0",
-    "ember-cli": "3.28.3",
+    "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",
@@ -67,16 +67,16 @@
     "ember-resolver": "8.0.3",
     "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.61.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"
@@ -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"
@@ -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/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
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}

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

@@ -1,5 +0,0 @@
-mutation ArchiveForm($input: ArchiveFormInput!) {
-  archiveForm(input: $input) {
-    clientMutationId
-  }
-}

package/addon/gql/mutations/remove-document.graphql

@@ -1,5 +0,0 @@
-mutation RemoveDocument($input: RemoveDocumentInput!) {
-  removeDocument(input: $input) {
-    clientMutationId
-  }
-}

package/addon/gql/queries/all-format-validators.graphql

@@ -1,12 +0,0 @@
-query AllFormatValidators {
-  allFormatValidators {
-    edges {
-      node {
-        slug
-        name
-        regex
-        errorMsg
-      }
-    }
-  }
-}

package/addon/gql/queries/all-work-items.graphql

@@ -1,9 +0,0 @@
-query AllWorkItems($filter: [WorkItemFilterSetType]!) {
-  allWorkItems(filter: $filter) {
-    edges {
-      node {
-        id
-      }
-    }
-  }
-}

package/addon/gql/queries/data-source.graphql

@@ -1,10 +0,0 @@
-query DataSource($name: String!) {
-  dataSource(filter: [{ name: $name }]) {
-    edges {
-      node {
-        label
-        slug
-      }
-    }
-  }
-}

package/addon/gql/queries/get-document-answers.graphql

@@ -1,21 +0,0 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/field-answer.graphql'
-
-query ($id: ID!) {
-  allDocuments(filter: [{ id: $id }]) {
-    edges {
-      node {
-        id
-        form {
-          slug
-        }
-        answers {
-          edges {
-            node {
-              ...FieldAnswer
-            }
-          }
-        }
-      }
-    }
-  }
-}

package/addon/gql/queries/get-document-forms.graphql

@@ -1,20 +0,0 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/field-question.graphql'
-
-query ($slug: String!) {
-  allForms(filter: [{ slug: $slug }]) {
-    edges {
-      node {
-        slug
-        name
-        meta
-        questions {
-          edges {
-            node {
-              ...FieldQuestion
-            }
-          }
-        }
-      }
-    }
-  }
-}

package/addon/gql/queries/get-document-used-dynamic-options.graphql

@@ -1,12 +0,0 @@
-query GetDocumentUsedDynamicOptions($document: ID!, $question: ID!) {
-  allUsedDynamicOptions(
-    filter: [{ document: $document }, { question: $question }]
-  ) {
-    edges {
-      node {
-        slug
-        label
-      }
-    }
-  }
-}

package/addon/gql/queries/get-dynamic-options.graphql

@@ -1,29 +0,0 @@
-query ($question: String!) {
-  allQuestions(filter: [{ slug: $question }], first: 1) {
-    edges {
-      node {
-        slug
-        ... on DynamicChoiceQuestion {
-          dynamicChoiceOptions: options {
-            edges {
-              node {
-                slug
-                label
-              }
-            }
-          }
-        }
-        ... on DynamicMultipleChoiceQuestion {
-          dynamicMultipleChoiceOptions: options {
-            edges {
-              node {
-                slug
-                label
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}

package/addon/gql/queries/get-fileanswer-info.graphql

@@ -1,13 +0,0 @@
-query getFileAnswerInfo($id: ID!) {
-  node(id: $id) {
-    id
-    ... on FileAnswer {
-      fileValue: value {
-        uploadUrl
-        downloadUrl
-        metadata
-        name
-      }
-    }
-  }
-}