@projectcaluma/ember-form-builder 9.1.0 → 10.0.3

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-list/item.hbs

@@ -58,7 +58,7 @@
     {{/if}}
 
     <span
-      class="{{if this.showFormLink "uk-width-auto" "uk-width-expand"}}
+      class="{{if this.showFormLink 'uk-width-auto' 'uk-width-expand'}}
         uk-margin-small-right uk-text-small uk-text-muted uk-text-truncate"
     >
       {{@question.label}}
@@ -83,13 +83,13 @@
         uk-tooltip="title: {{if
           this.hidden
           (t
-            (concat "caluma.form-builder.question-list.hidden." this.hiddenType)
+            (concat 'caluma.form-builder.question-list.hidden.' this.hiddenType)
           )
         }}; pos: left"
         class="cfb-form-editor__question-list__item__type
           {{if
             this.hidden
-            "cfb-form-editor__question-list__item__type--hidden"
+            'cfb-form-editor__question-list__item__type--hidden'
           }}"
         @label={{t
           (concat "caluma.form-builder.question.types." @question.__typename)
@@ -105,7 +105,7 @@
         <span
           uk-tooltip="title: {{t
             (concat
-              "caluma.form-builder.question-list.required." this.requiredType
+              'caluma.form-builder.question-list.required.' this.requiredType
             )
           }}; pos: top-left"
           title={{t

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

@@ -42,8 +42,8 @@
       <input
         class="uk-search-input"
         type="search"
-        placeholder="{{t "caluma.form-builder.global.search"}}..."
-        aria-label="{{t "caluma.form-builder.global.search"}}"
+        placeholder="{{t 'caluma.form-builder.global.search'}}..."
+        aria-label="{{t 'caluma.form-builder.global.search'}}"
         value={{this.search}}
         {{on "input" (fn (mut this.search))}}
       />

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

@@ -136,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
@@ -295,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">

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

@@ -31,8 +31,8 @@
       data-test-form-search-input
       class="uk-search-input"
       type="search"
-      placeholder="{{t "caluma.form-builder.global.search"}}..."
-      aria-label="{{t "caluma.form-builder.global.search"}}"
+      placeholder="{{t 'caluma.form-builder.global.search'}}..."
+      aria-label="{{t 'caluma.form-builder.global.search'}}"
       value={{this.search}}
       {{on "input" (fn this.setFilter "search")}}
     />

package/addon/components/cfb-navigation.hbs

@@ -4,7 +4,7 @@
       <LinkTo
         @route={{crumb.routeName}}
         class="uk-text-large uk-text-truncate cfb-navigation__item__link
-          {{if crumb.disabled "uk-disabled"}}"
+          {{if crumb.disabled 'uk-disabled'}}"
       >
         {{crumb.title}}
       </LinkTo>

package/addon/components/cfb-toggle-switch.hbs

@@ -1,4 +1,4 @@
-<div class="uk-flex uk-flex-column {{unless @noMargin "uk-margin"}}">
+<div class="uk-flex uk-flex-column {{unless @noMargin 'uk-margin'}}">
   <@labelComponent />
 
   <div class="uk-form-controls" ...attributes>

package/addon/gql/fragments/{field-question.graphql → field.graphql}

@@ -1,4 +1,10 @@
+# We can not symlink this file so an exact copy exists in another package:
+# packages/form-builder/addon/gql/fragments/field.graphql
+#
+# When changing this file the other must also receive the same changes.
+
 fragment SimpleQuestion on Question {
+  id
   slug
   label
   isRequired
@@ -9,6 +15,7 @@ fragment SimpleQuestion on Question {
     textMinLength: minLength
     textMaxLength: maxLength
     textDefaultAnswer: defaultAnswer {
+      id
       value
     }
     placeholder
@@ -17,6 +24,7 @@ fragment SimpleQuestion on Question {
     textareaMinLength: minLength
     textareaMaxLength: maxLength
     textareaDefaultAnswer: defaultAnswer {
+      id
       value
     }
     placeholder
@@ -25,6 +33,7 @@ fragment SimpleQuestion on Question {
     integerMinValue: minValue
     integerMaxValue: maxValue
     integerDefaultAnswer: defaultAnswer {
+      id
       value
     }
     placeholder
@@ -33,6 +42,7 @@ fragment SimpleQuestion on Question {
     floatMinValue: minValue
     floatMaxValue: maxValue
     floatDefaultAnswer: defaultAnswer {
+      id
       value
     }
     placeholder
@@ -41,6 +51,7 @@ fragment SimpleQuestion on Question {
     choiceOptions: options {
       edges {
         node {
+          id
           slug
           label
           isArchived
@@ -48,6 +59,7 @@ fragment SimpleQuestion on Question {
       }
     }
     choiceDefaultAnswer: defaultAnswer {
+      id
       value
     }
   }
@@ -55,6 +67,7 @@ fragment SimpleQuestion on Question {
     multipleChoiceOptions: options {
       edges {
         node {
+          id
           slug
           label
           isArchived
@@ -62,11 +75,13 @@ fragment SimpleQuestion on Question {
       }
     }
     multipleChoiceDefaultAnswer: defaultAnswer {
+      id
       value
     }
   }
   ... on DateQuestion {
     dateDefaultAnswer: defaultAnswer {
+      id
       value
     }
   }
@@ -84,8 +99,10 @@ fragment SimpleQuestion on Question {
 }
 
 fragment FieldTableQuestion on Question {
+  id
   ... on TableQuestion {
     rowForm {
+      id
       slug
       questions {
         edges {
@@ -96,6 +113,7 @@ fragment FieldTableQuestion on Question {
       }
     }
     tableDefaultAnswer: defaultAnswer {
+      id
       value {
         id
         answers {
@@ -103,6 +121,7 @@ fragment FieldTableQuestion on Question {
             node {
               id
               question {
+                id
                 slug
               }
               ... on StringAnswer {
@@ -129,10 +148,12 @@ fragment FieldTableQuestion on Question {
 }
 
 fragment FieldQuestion on Question {
+  id
   ...SimpleQuestion
   ...FieldTableQuestion
   ... on FormQuestion {
     subForm {
+      id
       slug
       name
       questions {
@@ -140,10 +161,12 @@ fragment FieldQuestion on Question {
           node {
             # This part here limits our query to 2 level deep nested forms. This
             # has to be solved in another way!
+            id
             ...SimpleQuestion
             ...FieldTableQuestion
             ... on FormQuestion {
               subForm {
+                id
                 slug
                 name
                 questions {
@@ -162,3 +185,63 @@ fragment FieldQuestion on Question {
     }
   }
 }
+
+fragment SimpleAnswer on Answer {
+  id
+  question {
+    id
+    slug
+  }
+  ... on StringAnswer {
+    stringValue: value
+  }
+  ... on IntegerAnswer {
+    integerValue: value
+  }
+  ... on FloatAnswer {
+    floatValue: value
+  }
+  ... on ListAnswer {
+    listValue: value
+  }
+  ... on FileAnswer {
+    fileValue: value {
+      id
+      uploadUrl
+      downloadUrl
+      metadata
+      name
+    }
+  }
+  ... on DateAnswer {
+    dateValue: value
+  }
+}
+
+fragment FieldAnswer on Answer {
+  id
+  ...SimpleAnswer
+  ... on TableAnswer {
+    tableValue: value {
+      id
+      form {
+        id
+        slug
+        questions {
+          edges {
+            node {
+              ...FieldQuestion
+            }
+          }
+        }
+      }
+      answers {
+        edges {
+          node {
+            ...SimpleAnswer
+          }
+        }
+      }
+    }
+  }
+}

package/addon/gql/fragments/form-info.graphql

@@ -1,4 +1,5 @@
 fragment FormInfo on Form {
+  id
   name
   slug
   description

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

@@ -1,4 +1,5 @@
 fragment QuestionInfo on Question {
+  id
   slug
   label
   isRequired

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

@@ -1,13 +1,15 @@
-# 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) {
     form {
+      id
       ...FormInfo
       questions(search: $search) {
         edges {
           node {
+            id
             ...QuestionInfo
           }
         }

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

@@ -1,13 +1,15 @@
-# 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) {
     form {
+      id
       ...FormInfo
       questions(search: $search) {
         edges {
           node {
+            id
             ...QuestionInfo
           }
         }

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!
@@ -7,10 +7,12 @@ mutation ReorderFormQuestions(
 ) {
   reorderFormQuestions(input: $input) {
     form {
+      id
       ...FormInfo
       questions(search: $search) {
         edges {
           node {
+            id
             ...QuestionInfo
           }
         }

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

@@ -1,8 +1,9 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/question-info.graphql'
+#import QuestionInfo from '../fragments/question-info.graphql'
 
 mutation SaveActionButtonQuestion($input: SaveActionButtonQuestionInput!) {
   saveActionButtonQuestion(input: $input) {
     question {
+      id
       ...QuestionInfo
       ... on ActionButtonQuestion {
         action

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

@@ -1,10 +1,11 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/question-info.graphql'
+#import QuestionInfo from '../fragments/question-info.graphql'
 
 mutation SaveCalculatedFloatQuestion(
   $input: SaveCalculatedFloatQuestionInput!
 ) {
   saveCalculatedFloatQuestion(input: $input) {
     question {
+      id
       ...QuestionInfo
       ... on CalculatedFloatQuestion {
         calcExpression

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

@@ -1,13 +1,15 @@
-# 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) {
     question {
+      id
       ...QuestionInfo
       ... on ChoiceQuestion {
         options {
           edges {
             node {
+              id
               label
               slug
             }

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

@@ -1,8 +1,9 @@
-# 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) {
     question {
+      id
       ...QuestionInfo
     }
     clientMutationId

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,8 +1,9 @@
-# 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) {
     question {
+      id
       ...QuestionInfo
       ... on DynamicChoiceQuestion {
         dataSource

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

@@ -1,10 +1,11 @@
-# import * from '@projectcaluma/ember-form-builder/gql/fragments/question-info.graphql'
+#import QuestionInfo from '../fragments/question-info.graphql'
 
 mutation SaveDynamicMultipleChoiceQuestion(
   $input: SaveDynamicMultipleChoiceQuestionInput!
 ) {
   saveDynamicMultipleChoiceQuestion(input: $input) {
     question {
+      id
       ...QuestionInfo
       ... on DynamicMultipleChoiceQuestion {
         dataSource

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

@@ -1,8 +1,9 @@
-# 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) {
     question {
+      id
       ...QuestionInfo
     }
     clientMutationId

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

@@ -1,8 +1,9 @@
-# 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) {
     question {
+      id
       ...QuestionInfo
       ... on FloatQuestion {
         floatMinValue: minValue

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

@@ -1,11 +1,13 @@
-# 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) {
     question {
+      id
       ...QuestionInfo
       ... on FormQuestion {
         subForm {
+          id
           slug
         }
       }

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

@@ -1,8 +1,9 @@
-# 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) {
     form {
+      id
       ...FormInfo
     }
     clientMutationId

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

@@ -1,8 +1,9 @@
-# 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) {
     question {
+      id
       ...QuestionInfo
       ... on IntegerQuestion {
         integerMinValue: minValue

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

@@ -1,13 +1,15 @@
-# 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) {
     question {
+      id
       ...QuestionInfo
       ... on MultipleChoiceQuestion {
         options {
           edges {
             node {
+              id
               label
               slug
             }

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

@@ -1,6 +1,7 @@
 mutation SaveOption($input: SaveOptionInput!) {
   saveOption(input: $input) {
     option {
+      id
       label
       slug
     }

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

@@ -1,8 +1,9 @@
-# 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) {
     question {
+      id
       ...QuestionInfo
       ... on StaticQuestion {
         staticContent

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

@@ -1,11 +1,13 @@
-# 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) {
     question {
+      id
       ...QuestionInfo
       ... on TableQuestion {
         rowForm {
+          id
           slug
         }
       }

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

@@ -1,8 +1,9 @@
-# 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) {
     question {
+      id
       ...QuestionInfo
       ... on TextQuestion {
         minLength

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

@@ -1,8 +1,9 @@
-# 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) {
     question {
+      id
       ...QuestionInfo
       ... on TextareaQuestion {
         minLength

package/addon/gql/queries/check-form-slug.graphql

@@ -2,6 +2,7 @@ query CheckFormSlug($slug: String!) {
   allForms(filter: [{ slug: $slug }]) {
     edges {
       node {
+        id
         slug
       }
     }

package/addon/gql/queries/check-question-slug.graphql

@@ -2,6 +2,7 @@ query CheckQuestionSlug($slug: String!) {
   allQuestions(filter: [{ slug: $slug }]) {
     edges {
       node {
+        id
         slug
       }
     }

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

@@ -1,9 +1,10 @@
-# 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 }]) {
     edges {
       node {
+        id
         ...FormInfo
       }
     }

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

@@ -1,11 +1,11 @@
-# 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 }]) {
     edges {
       node {
+        id
         ...QuestionInfo
         ... on IntegerQuestion {
           integerMaxValue: maxValue
@@ -53,6 +53,7 @@ query FormEditorQuestion($slug: String!) {
           options {
             edges {
               node {
+                id
                 label
                 slug
                 isArchived
@@ -68,6 +69,7 @@ query FormEditorQuestion($slug: String!) {
           options {
             edges {
               node {
+                id
                 label
                 slug
                 isArchived
@@ -87,10 +89,12 @@ query FormEditorQuestion($slug: String!) {
         }
         ... on TableQuestion {
           rowForm {
+            id
             slug
             questions {
               edges {
                 node {
+                  id
                   slug
                   label
                 }
@@ -102,6 +106,7 @@ query FormEditorQuestion($slug: String!) {
             tableValue: value {
               id
               form {
+                id
                 slug
                 questions {
                   edges {
@@ -123,6 +128,7 @@ query FormEditorQuestion($slug: String!) {
         }
         ... on FormQuestion {
           subForm {
+            id
             slug
           }
         }

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

@@ -1,9 +1,10 @@
-# 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) {
     edges {
       node {
+        id
         ...FormInfo
       }
     }

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

@@ -1,22 +1,26 @@
-# 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 }]) {
     edges {
       node {
+        id
         slug
         questions(search: $search, isArchived: $archived) {
           edges {
             node {
+              id
               ...QuestionInfo
               ... on FormQuestion {
                 subForm {
+                  id
                   slug
                   name
                 }
               }
               ... on TableQuestion {
                 rowForm {
+                  id
                   slug
                   name
                 }

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
@@ -22,15 +22,18 @@ query SearchQuestion(
     totalCount
     edges {
       node {
+        id
         ...QuestionInfo
         ... on FormQuestion {
           subForm {
+            id
             slug
             name
           }
         }
         ... on TableQuestion {
           rowForm {
+            id
             slug
             name
           }

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.1.0",
+  "version": "10.0.3",
   "description": "Ember engine for building Caluma forms.",
   "keywords": [
     "ember-addon",
@@ -15,18 +15,18 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "@ember/render-modifiers": "^2.0.0",
+    "@ember/render-modifiers": "^2.0.2",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
-    "@projectcaluma/ember-core": "9.2.0",
-    "@projectcaluma/ember-form": "9.3.0",
+    "@projectcaluma/ember-core": "^10.1.0",
+    "@projectcaluma/ember-form": "^10.0.3",
     "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-cli-htmlbars": "^6.0.1",
     "ember-composable-helpers": "^4.5.0",
     "ember-concurrency": "^2.2.0",
     "ember-concurrency-decorators": "^2.0.3",
@@ -34,7 +34,7 @@
     "ember-fetch": "^8.0.4",
     "ember-math-helpers": "^2.18.0",
     "ember-pikaday": "^3.0.0",
-    "ember-power-select": "^4.1.6",
+    "ember-power-select": "^5.0.3",
     "ember-test-selectors": "^6.0.0",
     "ember-uikit": "^4.0.0",
     "ember-validated-form": "^5.0.0",
@@ -47,17 +47,17 @@
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
     "@ember/test-helpers": "2.6.0",
-    "@embroider/test-setup": "0.47.2",
-    "@projectcaluma/ember-testing": "9.0.0",
+    "@embroider/test-setup": "0.48.1",
+    "@projectcaluma/ember-testing": "10.0.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",
     "ember-cli-mirage": "2.2.0",
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
-    "ember-data": "3.28.3",
+    "ember-data": "3.28.4",
     "ember-disable-prototype-extensions": "1.1.3",
     "ember-engines": "0.8.20",
     "ember-export-application-global": "2.0.1",
@@ -65,7 +65,7 @@
     "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",
@@ -73,10 +73,10 @@
     "npm-run-all": "4.1.5",
     "qunit": "2.17.2",
     "qunit-dom": "2.0.0",
-    "webpack": "5.64.0"
+    "webpack": "5.65.0"
   },
   "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"

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"

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/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
-      }
-    }
-  }
-}