@projectcaluma/ember-form 9.3.0 → 10.0.3

package/addon/components/cf-content.js

@@ -5,8 +5,8 @@ import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
 import { dropTask } from "ember-concurrency-decorators";
 
-import getDocumentAnswersQuery from "@projectcaluma/ember-form/gql/queries/get-document-answers.graphql";
-import getDocumentFormsQuery from "@projectcaluma/ember-form/gql/queries/get-document-forms.graphql";
+import getDocumentAnswersQuery from "@projectcaluma/ember-form/gql/queries/document-answers.graphql";
+import getDocumentFormsQuery from "@projectcaluma/ember-form/gql/queries/document-forms.graphql";
 import { parseDocument } from "@projectcaluma/ember-form/lib/parsers";
 
 /**

package/addon/components/cf-field/input/action-button.hbs

@@ -5,7 +5,7 @@
     as |isValid validate|
   >
     <WorkItemButton
-      @workItemId={{@field.document.workItemUuid}}
+      @workItemId={{this.workItem}}
       @mutation={{this.action}}
       @label={{@field.question.label}}
       @disabled={{and (not-eq isValid null) (not isValid)}}

package/addon/components/cf-field/input/action-button.js

@@ -23,6 +23,13 @@ export default class CfFieldInputActionButtonComponent extends Component {
     );
   }
 
+  get workItem() {
+    return (
+      this.args.context?.actionButtonWorkItemId ||
+      this.args.field.document.workItemUuid
+    );
+  }
+
   get action() {
     return this.args.field.question.action.toLowerCase();
   }

package/addon/components/cf-field/input/checkbox.hbs

@@ -1,6 +1,6 @@
 {{#each @field.options as |option i|}}
   {{#if (gt i 0)}}<br />{{/if}}
-  <label class="cf-checkbox_label {{if @field.isInvalid "uk-form-danger"}}">
+  <label class="cf-checkbox_label {{if @field.isInvalid 'uk-form-danger'}}">
     <input
       class="uk-checkbox uk-margin-small-right"
       type="checkbox"

package/addon/components/cf-field/input/file.js

@@ -4,7 +4,7 @@ import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
 
 import removeAnswerMutation from "@projectcaluma/ember-form/gql/mutations/remove-answer.graphql";
-import getFileAnswerInfoQuery from "@projectcaluma/ember-form/gql/queries/get-fileanswer-info.graphql";
+import getFileAnswerInfoQuery from "@projectcaluma/ember-form/gql/queries/fileanswer-info.graphql";
 
 export default class CfFieldInputFileComponent extends Component {
   @service intl;

package/addon/components/cf-field/input/float.hbs

@@ -2,8 +2,8 @@
   type="number"
   step="0.001"
   class="uk-input
-    {{if @field.isInvalid "uk-form-danger"}}
-    {{if this.disabled "uk-disabled"}}"
+    {{if @field.isInvalid 'uk-form-danger'}}
+    {{if this.disabled 'uk-disabled'}}"
   readonly={{this.disabled}}
   name={{@field.pk}}
   id={{@field.pk}}

package/addon/components/cf-field/input/integer.hbs

@@ -2,8 +2,8 @@
   type="number"
   step="1"
   class="uk-input
-    {{if @field.isInvalid "uk-form-danger"}}
-    {{if @disabled "uk-disabled"}}"
+    {{if @field.isInvalid 'uk-form-danger'}}
+    {{if @disabled 'uk-disabled'}}"
   name={{@field.pk}}
   id={{@field.pk}}
   value={{@field.answer.value}}

package/addon/components/cf-field/input/text.hbs

@@ -1,8 +1,8 @@
 <input
   type="text"
   class="uk-input
-    {{if @field.isInvalid "uk-form-danger"}}
-    {{if @disabled "uk-disabled"}}"
+    {{if @field.isInvalid 'uk-form-danger'}}
+    {{if @disabled 'uk-disabled'}}"
   name={{@field.pk}}
   id={{@field.pk}}
   value={{@field.answer.value}}

package/addon/components/cf-field/input/textarea.hbs

@@ -1,7 +1,7 @@
 <textarea
   class="uk-textarea
-    {{if @field.isInvalid "uk-form-danger"}}
-    {{if @disabled "uk-disabled"}}"
+    {{if @field.isInvalid 'uk-form-danger'}}
+    {{if @disabled 'uk-disabled'}}"
   name={{@field.pk}}
   id={{@field.pk}}
   placeholder={{@field.question.placeholder}}

package/addon/components/cf-field-value.js

@@ -3,7 +3,7 @@ import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
 import moment from "moment";
 
-import getFileAnswerInfoQuery from "@projectcaluma/ember-form/gql/queries/get-fileanswer-info.graphql";
+import getFileAnswerInfoQuery from "@projectcaluma/ember-form/gql/queries/fileanswer-info.graphql";
 
 export default class CfFieldValueComponent extends Component {
   @queryManager apollo;

package/addon/components/cf-navigation-item.hbs

@@ -1,6 +1,6 @@
 <li
   class="cf-navigation__item uk-width-auto
-    {{if (or @item.active @item.childrenActive) "uk-active"}}"
+    {{if (or @item.active @item.childrenActive) 'uk-active'}}"
 >
   <LinkTo @query={{hash displayedForm=@item.slug}}>
     {{#if (and @useAsHeading this.active)}}
@@ -19,7 +19,7 @@
     {{/if}}
     <span
       class="cf-navigation__item__icon cf-navigation__item__icon--{{@item.state}}
-        {{if @item.dirty "cf-navigation__item__icon--dirty"}}"
+        {{if @item.dirty 'cf-navigation__item__icon--dirty'}}"
     ></span>
   </LinkTo>
 

package/addon/components/document-validity.js

@@ -37,11 +37,9 @@ export default class DocumentValidity extends Component {
 
   @restartableTask
   *_validate() {
-    yield Promise.all(
-      this.args.document.fields.map((field) => {
-        return field.validate.linked().perform();
-      })
-    );
+    for (const field of this.args.document.fields) {
+      yield field.validate.linked().perform();
+    }
 
     if (this.isValid) {
       this.args.onValid?.();

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/mutations/save-document-date-answer.graphql

@@ -1,6 +1,6 @@
-# import * from '@projectcaluma/ember-form/gql/fragments/field-answer.graphql'
+#import * from '../fragments/field.graphql'
 
-mutation ($input: SaveDocumentDateAnswerInput!) {
+mutation SaveDocumentDateAnswer($input: SaveDocumentDateAnswerInput!) {
   saveDocumentDateAnswer(input: $input) {
     answer {
       ...FieldAnswer

package/addon/gql/mutations/save-document-file-answer.graphql

@@ -1,6 +1,6 @@
-# import * from '@projectcaluma/ember-form/gql/fragments/field-answer.graphql'
+#import * from '../fragments/field.graphql'
 
-mutation ($input: SaveDocumentFileAnswerInput!) {
+mutation SaveDocumentFileAnswer($input: SaveDocumentFileAnswerInput!) {
   saveDocumentFileAnswer(input: $input) {
     answer {
       ...FieldAnswer

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

@@ -1,6 +1,6 @@
-# import * from '@projectcaluma/ember-form/gql/fragments/field-answer.graphql'
+#import * from '../fragments/field.graphql'
 
-mutation ($input: SaveDocumentFloatAnswerInput!) {
+mutation SaveDocumentFloatAnswer($input: SaveDocumentFloatAnswerInput!) {
   saveDocumentFloatAnswer(input: $input) {
     answer {
       ...FieldAnswer

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

@@ -1,6 +1,6 @@
-# import * from '@projectcaluma/ember-form/gql/fragments/field-answer.graphql'
+#import * from '../fragments/field.graphql'
 
-mutation ($input: SaveDocumentIntegerAnswerInput!) {
+mutation SaveDocumentIntegerAnswer($input: SaveDocumentIntegerAnswerInput!) {
   saveDocumentIntegerAnswer(input: $input) {
     answer {
       ...FieldAnswer

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

@@ -1,6 +1,6 @@
-# import * from '@projectcaluma/ember-form/gql/fragments/field-answer.graphql'
+#import * from '../fragments/field.graphql'
 
-mutation ($input: SaveDocumentListAnswerInput!) {
+mutation SaveDocumentListAnswer($input: SaveDocumentListAnswerInput!) {
   saveDocumentListAnswer(input: $input) {
     answer {
       ...FieldAnswer

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

@@ -1,6 +1,6 @@
-# import * from '@projectcaluma/ember-form/gql/fragments/field-answer.graphql'
+#import * from '../fragments/field.graphql'
 
-mutation ($input: SaveDocumentStringAnswerInput!) {
+mutation SaveDocumentStringAnswer($input: SaveDocumentStringAnswerInput!) {
   saveDocumentStringAnswer(input: $input) {
     answer {
       ...FieldAnswer

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

@@ -1,6 +1,6 @@
-# import * from '@projectcaluma/ember-form/gql/fragments/field-answer.graphql'
+#import * from '../fragments/field.graphql'
 
-mutation ($input: SaveDocumentTableAnswerInput!) {
+mutation SaveDocumentTableAnswer($input: SaveDocumentTableAnswerInput!) {
   saveDocumentTableAnswer(input: $input) {
     answer {
       ...FieldAnswer

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

@@ -1,6 +1,6 @@
-# import * from '@projectcaluma/ember-form/gql/fragments/field-answer.graphql'
+#import * from '../fragments/field.graphql'
 
-mutation ($input: SaveDocumentInput!) {
+mutation SaveDocument($input: SaveDocumentInput!) {
   saveDocument(input: $input) {
     document {
       id
@@ -12,6 +12,7 @@ mutation ($input: SaveDocumentInput!) {
         }
       }
       form {
+        id
         slug
         questions {
           edges {

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

@@ -0,0 +1,38 @@
+#import * from '../fragments/field.graphql'
+
+query DocumentAnswers($id: ID!) {
+  allDocuments(filter: [{ id: $id }]) {
+    edges {
+      node {
+        id
+        form {
+          id
+          slug
+        }
+        workItem {
+          id
+        }
+        case {
+          id
+          workItems {
+            edges {
+              node {
+                id
+                task {
+                  id
+                }
+              }
+            }
+          }
+        }
+        answers {
+          edges {
+            node {
+              ...FieldAnswer
+            }
+          }
+        }
+      }
+    }
+  }
+}

package/addon/gql/queries/{get-document-forms.graphql → document-forms.graphql}

@@ -1,9 +1,10 @@
-# import * from '@projectcaluma/ember-form/gql/fragments/field-question.graphql'
+#import FieldQuestion, FieldTableQuestion, SimpleQuestion from '../fragments/field.graphql'
 
-query ($slug: String!) {
+query DocumentForms($slug: String!) {
   allForms(filter: [{ slug: $slug }]) {
     edges {
       node {
+        id
         slug
         name
         meta

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

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

package/addon/gql/queries/{get-dynamic-options.graphql → dynamic-options.graphql}

@@ -1,7 +1,8 @@
-query ($question: String!) {
+query DynamicOptions($question: String!) {
   allQuestions(filter: [{ slug: $question }], first: 1) {
     edges {
       node {
+        id
         slug
         ... on DynamicChoiceQuestion {
           dynamicChoiceOptions: options {

package/addon/gql/queries/{get-fileanswer-info.graphql → fileanswer-info.graphql}

@@ -1,8 +1,9 @@
-query getFileAnswerInfo($id: ID!) {
+query FileAnswerInfo($id: ID!) {
   node(id: $id) {
     id
     ... on FileAnswer {
       fileValue: value {
+        id
         uploadUrl
         downloadUrl
         metadata

package/addon/lib/document.js

@@ -83,9 +83,21 @@ export default Base.extend({
     return decodeId(this.raw.id);
   }),
 
-  workItemUuid: computed("raw.workItem.id", function () {
-    return this.raw.workItem ? decodeId(this.raw.workItem.id) : null;
-  }),
+  workItemUuid: computed(
+    "raw.{workItem.id,case.workItems.edges.[]}",
+    function () {
+      // The document is either directly attached to a work item (via
+      // CompleteTaskFormTask) or it's the case document and therefore
+      // indirectly attached to a work item (via CompleteWorkflowFormTask)
+      const rawId =
+        this.raw.workItem?.id ||
+        this.raw.case?.workItems.edges.find(
+          (edge) => edge.node.task.__typename === "CompleteWorkflowFormTask"
+        )?.node.id;
+
+      return rawId ? decodeId(rawId) : null;
+    }
+  ),
 
   /**
    * The root form of this document
@@ -234,7 +246,7 @@ export default Base.extend({
     }
 
     if (field.hidden || [undefined, null].includes(field.value)) {
-      return field.question.isMultipleChoice ? [] : null;
+      return defaultValue ?? field.question.isMultipleChoice ? [] : null;
     }
 
     if (field.question.__typename === "TableQuestion") {

package/addon/lib/field.js

@@ -19,7 +19,7 @@ import saveDocumentIntegerAnswerMutation from "@projectcaluma/ember-form/gql/mut
 import saveDocumentListAnswerMutation from "@projectcaluma/ember-form/gql/mutations/save-document-list-answer.graphql";
 import saveDocumentStringAnswerMutation from "@projectcaluma/ember-form/gql/mutations/save-document-string-answer.graphql";
 import saveDocumentTableAnswerMutation from "@projectcaluma/ember-form/gql/mutations/save-document-table-answer.graphql";
-import getDocumentUsedDynamicOptionsQuery from "@projectcaluma/ember-form/gql/queries/get-document-used-dynamic-options.graphql";
+import getDocumentUsedDynamicOptionsQuery from "@projectcaluma/ember-form/gql/queries/document-used-dynamic-options.graphql";
 import Base from "@projectcaluma/ember-form/lib/base";
 import {
   nestedDependencyParents,
@@ -564,7 +564,7 @@ export default Base.extend({
     "fieldset.field.hidden",
     "jexlContext",
     "optionalDependencies.@each.{hidden,value}",
-    "question.isRequired",
+    "question.{__typename,isRequired}",
     "pk",
     function () {
       if (

package/addon/lib/question.js

@@ -5,7 +5,7 @@ import { camelize } from "@ember/string";
 import { queryManager } from "ember-apollo-client";
 import { task } from "ember-concurrency";
 
-import getDynamicOptions from "@projectcaluma/ember-form/gql/queries/get-dynamic-options.graphql";
+import getDynamicOptions from "@projectcaluma/ember-form/gql/queries/dynamic-options.graphql";
 import Base from "@projectcaluma/ember-form/lib/base";
 
 const getValue = (answer) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form",
-  "version": "9.3.0",
+  "version": "10.0.3",
   "description": "Ember addon for rendering Caluma forms.",
   "keywords": [
     "ember-addon"
@@ -16,19 +16,19 @@
   "dependencies": {
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
-    "@projectcaluma/ember-core": "9.2.0",
+    "@projectcaluma/ember-core": "^10.1.0",
     "ember-apollo-client": "^3.2.0",
     "ember-auto-import": "^2.2.3",
     "ember-cli-babel": "^7.26.6",
-    "ember-cli-htmlbars": "^6.0.0",
+    "ember-cli-htmlbars": "^6.0.1",
     "ember-cli-showdown": "^6.0.0",
     "ember-composable-helpers": "^4.5.0",
     "ember-fetch": "^8.0.4",
-    "ember-in-viewport": "^3.10.3",
+    "ember-in-viewport": "^4.0.0",
     "ember-intl": "^5.7.0",
     "ember-math-helpers": "^2.18.0",
     "ember-pikaday": "^3.0.0",
-    "ember-power-select": "^4.1.6",
+    "ember-power-select": "^5.0.3",
     "ember-uikit": "^4.0.0",
     "graphql": "^15.6.1",
     "jexl": "^2.3.0",
@@ -39,11 +39,11 @@
   "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",
-    "@projectcaluma/ember-workflow": "9.0.3",
+    "@embroider/test-setup": "0.48.1",
+    "@projectcaluma/ember-testing": "10.0.0",
+    "@projectcaluma/ember-workflow": "10.0.2",
     "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",
@@ -56,7 +56,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",
@@ -65,10 +65,10 @@
     "qunit": "2.17.2",
     "qunit-dom": "2.0.0",
     "uuid": "8.3.2",
-    "webpack": "5.64.0"
+    "webpack": "5.65.0"
   },
   "engines": {
-    "node": "10.* || >= 12"
+    "node": "12.* || 14.* || >= 16"
   },
   "ember": {
     "edition": "octane"

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

@@ -1,57 +0,0 @@
-# import * from '@projectcaluma/ember-form/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/queries/get-document-answers.graphql

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