@projectcaluma/ember-form-builder 10.0.0 → 11.0.0-beta.1

package/addon/gql/fragments/field.graphql

@@ -0,0 +1,247 @@
+# 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
+  isHidden
+  meta
+  infoText
+  ... on TextQuestion {
+    textMinLength: minLength
+    textMaxLength: maxLength
+    textDefaultAnswer: defaultAnswer {
+      id
+      value
+    }
+    placeholder
+  }
+  ... on TextareaQuestion {
+    textareaMinLength: minLength
+    textareaMaxLength: maxLength
+    textareaDefaultAnswer: defaultAnswer {
+      id
+      value
+    }
+    placeholder
+  }
+  ... on IntegerQuestion {
+    integerMinValue: minValue
+    integerMaxValue: maxValue
+    integerDefaultAnswer: defaultAnswer {
+      id
+      value
+    }
+    placeholder
+  }
+  ... on FloatQuestion {
+    floatMinValue: minValue
+    floatMaxValue: maxValue
+    floatDefaultAnswer: defaultAnswer {
+      id
+      value
+    }
+    placeholder
+  }
+  ... on ChoiceQuestion {
+    choiceOptions: options {
+      edges {
+        node {
+          id
+          slug
+          label
+          isArchived
+        }
+      }
+    }
+    choiceDefaultAnswer: defaultAnswer {
+      id
+      value
+    }
+  }
+  ... on MultipleChoiceQuestion {
+    multipleChoiceOptions: options {
+      edges {
+        node {
+          id
+          slug
+          label
+          isArchived
+        }
+      }
+    }
+    multipleChoiceDefaultAnswer: defaultAnswer {
+      id
+      value
+    }
+  }
+  ... on DateQuestion {
+    dateDefaultAnswer: defaultAnswer {
+      id
+      value
+    }
+  }
+  ... on StaticQuestion {
+    staticContent
+  }
+  ... on CalculatedFloatQuestion {
+    calcExpression
+  }
+  ... on ActionButtonQuestion {
+    action
+    color
+    validateOnEnter
+  }
+}
+
+fragment FieldTableQuestion on Question {
+  id
+  ... on TableQuestion {
+    rowForm {
+      id
+      slug
+      questions {
+        edges {
+          node {
+            ...SimpleQuestion
+          }
+        }
+      }
+    }
+    tableDefaultAnswer: defaultAnswer {
+      id
+      value {
+        id
+        answers {
+          edges {
+            node {
+              id
+              question {
+                id
+                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 {
+  id
+  ...SimpleQuestion
+  ...FieldTableQuestion
+  ... on FormQuestion {
+    subForm {
+      id
+      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!
+            id
+            ...SimpleQuestion
+            ...FieldTableQuestion
+            ... on FormQuestion {
+              subForm {
+                id
+                slug
+                name
+                questions {
+                  edges {
+                    node {
+                      ...SimpleQuestion
+                      ...FieldTableQuestion
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+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

@@ -4,10 +4,12 @@
 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

@@ -4,10 +4,12 @@
 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

@@ -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

@@ -3,6 +3,7 @@
 mutation SaveActionButtonQuestion($input: SaveActionButtonQuestionInput!) {
   saveActionButtonQuestion(input: $input) {
     question {
+      id
       ...QuestionInfo
       ... on ActionButtonQuestion {
         action

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

@@ -5,6 +5,7 @@ mutation SaveCalculatedFloatQuestion(
 ) {
   saveCalculatedFloatQuestion(input: $input) {
     question {
+      id
       ...QuestionInfo
       ... on CalculatedFloatQuestion {
         calcExpression

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

@@ -3,11 +3,13 @@
 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

@@ -3,6 +3,7 @@
 mutation SaveDateQuestion($input: SaveDateQuestionInput!) {
   saveDateQuestion(input: $input) {
     question {
+      id
       ...QuestionInfo
     }
     clientMutationId

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

@@ -3,6 +3,7 @@
 mutation SaveDynamicChoiceQuestion($input: SaveDynamicChoiceQuestionInput!) {
   saveDynamicChoiceQuestion(input: $input) {
     question {
+      id
       ...QuestionInfo
       ... on DynamicChoiceQuestion {
         dataSource

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

@@ -5,6 +5,7 @@ mutation SaveDynamicMultipleChoiceQuestion(
 ) {
   saveDynamicMultipleChoiceQuestion(input: $input) {
     question {
+      id
       ...QuestionInfo
       ... on DynamicMultipleChoiceQuestion {
         dataSource

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

@@ -3,6 +3,7 @@
 mutation SaveFileQuestion($input: SaveFileQuestionInput!) {
   saveFileQuestion(input: $input) {
     question {
+      id
       ...QuestionInfo
     }
     clientMutationId

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

@@ -3,6 +3,7 @@
 mutation SaveFloatQuestion($input: SaveFloatQuestionInput!) {
   saveFloatQuestion(input: $input) {
     question {
+      id
       ...QuestionInfo
       ... on FloatQuestion {
         floatMinValue: minValue

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

@@ -3,9 +3,11 @@
 mutation SaveFormQuestion($input: SaveFormQuestionInput!) {
   saveFormQuestion(input: $input) {
     question {
+      id
       ...QuestionInfo
       ... on FormQuestion {
         subForm {
+          id
           slug
         }
       }

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

@@ -3,6 +3,7 @@
 mutation SaveForm($input: SaveFormInput!) {
   saveForm(input: $input) {
     form {
+      id
       ...FormInfo
     }
     clientMutationId

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

@@ -3,6 +3,7 @@
 mutation SaveIntegerQuestion($input: SaveIntegerQuestionInput!) {
   saveIntegerQuestion(input: $input) {
     question {
+      id
       ...QuestionInfo
       ... on IntegerQuestion {
         integerMinValue: minValue

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

@@ -3,11 +3,13 @@
 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

@@ -3,6 +3,7 @@
 mutation SaveStaticQuestion($input: SaveStaticQuestionInput!) {
   saveStaticQuestion(input: $input) {
     question {
+      id
       ...QuestionInfo
       ... on StaticQuestion {
         staticContent

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

@@ -3,9 +3,11 @@
 mutation SaveTableQuestion($input: SaveTableQuestionInput!) {
   saveTableQuestion(input: $input) {
     question {
+      id
       ...QuestionInfo
       ... on TableQuestion {
         rowForm {
+          id
           slug
         }
       }

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

@@ -3,6 +3,7 @@
 mutation SaveTextQuestion($input: SaveTextQuestionInput!) {
   saveTextQuestion(input: $input) {
     question {
+      id
       ...QuestionInfo
       ... on TextQuestion {
         minLength

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

@@ -3,6 +3,7 @@
 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

@@ -4,6 +4,7 @@ query FormEditorGeneral($slug: String!) {
   allForms(filter: [{ slug: $slug }]) {
     edges {
       node {
+        id
         ...FormInfo
       }
     }

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

@@ -5,6 +5,7 @@ query FormEditorQuestion($slug: String!) {
   allQuestions(filter: [{ slug: $slug }]) {
     edges {
       node {
+        id
         ...QuestionInfo
         ... on IntegerQuestion {
           integerMaxValue: maxValue
@@ -52,6 +53,7 @@ query FormEditorQuestion($slug: String!) {
           options {
             edges {
               node {
+                id
                 label
                 slug
                 isArchived
@@ -67,6 +69,7 @@ query FormEditorQuestion($slug: String!) {
           options {
             edges {
               node {
+                id
                 label
                 slug
                 isArchived
@@ -86,10 +89,12 @@ query FormEditorQuestion($slug: String!) {
         }
         ... on TableQuestion {
           rowForm {
+            id
             slug
             questions {
               edges {
                 node {
+                  id
                   slug
                   label
                 }
@@ -101,6 +106,7 @@ query FormEditorQuestion($slug: String!) {
             tableValue: value {
               id
               form {
+                id
                 slug
                 questions {
                   edges {
@@ -122,6 +128,7 @@ query FormEditorQuestion($slug: String!) {
         }
         ... on FormQuestion {
           subForm {
+            id
             slug
           }
         }

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

@@ -4,6 +4,7 @@ query FormList($filter: [FormFilterSetType], $order: [FormOrderSetType]) {
   allForms(filter: $filter, order: $order) {
     edges {
       node {
+        id
         ...FormInfo
       }
     }

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

@@ -4,19 +4,23 @@ 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

@@ -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

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

package/addon/routes/edit.js

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