@projectcaluma/ember-form 9.1.1 → 10.0.0

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

@@ -1,3 +1,4 @@
+import { dasherize } from "@ember/string";
 import Component from "@glimmer/component";
 
 const mapping = {
@@ -25,7 +26,7 @@ export default class CfFieldInputComponent extends Component {
 
     return (
       typename &&
-      (mapping[typename] || typename.replace(/Question$/, "").toLowerCase())
+      (mapping[typename] || dasherize(typename.replace(/Question$/, "")))
     );
   }
 }

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

@@ -2,8 +2,8 @@
   <UkButton
     @color="link"
     @label={{this.value.label}}
-    @on-click={{fn this.download value.fileAnswerId}}
+    @on-click={{fn this.download this.value.fileAnswerId}}
   />
 {{else}}
-  {{value.label}}
+  {{this.value.label}}
 {{/if}}

package/addon/components/cf-field.hbs

@@ -16,21 +16,23 @@
         {{/let}}
       </div>
 
-      {{#if @field.question.infoText}}
+      {{#if (and @field.question.infoText this.infoTextVisible)}}
         <CfField::info @text={{@field.question.infoText}} />
       {{/if}}
 
-      <div
-        class="cf-field__icon uk-padding-remove-vertical uk-flex uk-flex-middle uk-flex-center"
-      >
-        {{#if @field.save.isRunning}}
-          <UkSpinner class="uk-animation-fade" />
-        {{else if (or field.save.last.isError field.isInvalid)}}
-          <UkIcon @icon="warning" class="uk-animation-fade uk-text-danger" />
-        {{else if @field.save.last.isSuccessful}}
-          <UkIcon @icon="check" class="uk-animation-fade uk-text-success" />
-        {{/if}}
-      </div>
+      {{#if this.saveIndicatorVisible}}
+        <div
+          class="cf-field__icon uk-padding-remove-vertical uk-flex uk-flex-middle uk-flex-center"
+        >
+          {{#if @field.save.isRunning}}
+            <UkSpinner class="uk-animation-fade" />
+          {{else if (or @field.save.last.isError @field.isInvalid)}}
+            <UkIcon @icon="warning" class="uk-animation-fade uk-text-danger" />
+          {{else if @field.save.last.isSuccessful}}
+            <UkIcon @icon="check" class="uk-animation-fade uk-text-success" />
+          {{/if}}
+        </div>
+      {{/if}}
     </div>
 
     {{#if @field.errors.length}}

package/addon/components/cf-field.js

@@ -29,10 +29,18 @@ export default class CfFieldComponent extends Component {
   get labelVisible() {
     return (
       !this.args.field?.question.meta.hideLabel &&
-      !hasQuestionType(this.args.field?.question, "static")
+      !hasQuestionType(this.args.field?.question, "static", "action-button")
     );
   }
 
+  get infoTextVisible() {
+    return !hasQuestionType(this.args.field?.question, "action-button");
+  }
+
+  get saveIndicatorVisible() {
+    return !hasQuestionType(this.args.field?.question, "action-button");
+  }
+
   /**
    * Task to save a field. This will set the passed value to the answer and
    * save the field to the API after a timeout off 500 milliseconds.

package/addon/components/document-validity.js

@@ -1,5 +1,6 @@
 import { action } from "@ember/object";
 import Component from "@glimmer/component";
+import { restartableTask } from "ember-concurrency-decorators";
 
 /**
  * Component to check the validity of a document
@@ -34,11 +35,11 @@ export default class DocumentValidity extends Component {
     return this.args.document.fields.every((f) => f.isValid);
   }
 
-  @action
-  async validate() {
-    await Promise.all(
-      this.args.document.fields.map((field) => field.validate.perform())
-    );
+  @restartableTask
+  *_validate() {
+    for (const field of this.args.document.fields) {
+      yield field.validate.linked().perform();
+    }
 
     if (this.isValid) {
       this.args.onValid?.();
@@ -48,4 +49,9 @@ export default class DocumentValidity extends Component {
 
     return this.isValid;
   }
+
+  @action
+  validate() {
+    return this._validate.perform();
+  }
 }

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

@@ -76,6 +76,11 @@ fragment SimpleQuestion on Question {
   ... on CalculatedFloatQuestion {
     calcExpression
   }
+  ... on ActionButtonQuestion {
+    action
+    color
+    validateOnEnter
+  }
 }
 
 fragment FieldTableQuestion on Question {
@@ -157,3 +162,59 @@ fragment FieldQuestion on Question {
     }
   }
 }
+
+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/remove-answer.graphql

@@ -0,0 +1,7 @@
+mutation RemoveAnswer($input: RemoveAnswerInput!) {
+  removeAnswer(input: $input) {
+    answer {
+      id
+    }
+  }
+}

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

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

@@ -1,6 +1,6 @@
-# import * from '@projectcaluma/ember-form/gql/fragments/field-answer.graphql'
+#import * from '../fragments/field.graphql'
 
-query ($id: ID!) {
+query GetDocumentAnswers($id: ID!) {
   allDocuments(filter: [{ id: $id }]) {
     edges {
       node {
@@ -8,6 +8,22 @@ query ($id: ID!) {
         form {
           slug
         }
+        workItem {
+          id
+        }
+        case {
+          id
+          workItems {
+            edges {
+              node {
+                id
+                task {
+                  id
+                }
+              }
+            }
+          }
+        }
         answers {
           edges {
             node {

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

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

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

@@ -1,4 +1,4 @@
-query ($question: String!) {
+query GetDynamicOptions($question: String!) {
   allQuestions(filter: [{ slug: $question }], first: 1) {
     edges {
       node {

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

@@ -1,4 +1,4 @@
-query getFileAnswerInfo($id: ID!) {
+query GetFileAnswerInfo($id: ID!) {
   node(id: $id) {
     id
     ... on FileAnswer {

package/addon/lib/document.js

@@ -83,6 +83,22 @@ export default Base.extend({
     return decodeId(this.raw.id);
   }),
 
+  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
    *
@@ -230,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

@@ -553,8 +553,9 @@ export default Base.extend({
    *
    * The field is optional if:
    * - The form question field of the fieldset is hidden
-   * - All depending field (used in the expression) are hidden
+   * - All depending fields (used in the expression) are hidden
    * - The evaluated `question.isRequired` expression returns `false`
+   * - The question type is FormQuestion or CalculatedFloatQuestion
    *
    * @property {Boolean} optional
    */
@@ -563,11 +564,14 @@ export default Base.extend({
     "fieldset.field.hidden",
     "jexlContext",
     "optionalDependencies.@each.{hidden,value}",
-    "question.isRequired",
+    "question.{__typename,isRequired}",
     "pk",
     function () {
       if (
         this.fieldset.field?.hidden ||
+        ["FormQuestion", "CalculatedFloatQuestion"].includes(
+          this.question.__typename
+        ) ||
         (this.optionalDependencies.length &&
           this.optionalDependencies.every(fieldIsHidden))
       ) {
@@ -932,4 +936,15 @@ export default Base.extend({
   _validateCalculatedFloatQuestion() {
     return resolve(true);
   },
+
+  /**
+   * Dummy method for the validation of work item button fields
+   *
+   * @method _validateActionButtonQuestion
+   * @return {RSVP.Promise}
+   * @private
+   */
+  _validateActionButtonQuestion() {
+    return resolve(true);
+  },
 });

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

@@ -0,0 +1 @@
+export { default } from "@projectcaluma/ember-form/components/cf-field/input/action-button";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form",
-  "version": "9.1.1",
+  "version": "10.0.0",
   "description": "Ember addon for rendering Caluma forms.",
   "keywords": [
     "ember-addon"
@@ -16,21 +16,21 @@
   "dependencies": {
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
-    "@projectcaluma/ember-core": "9.0.3",
+    "@projectcaluma/ember-core": "^10.0.0",
     "ember-apollo-client": "^3.2.0",
-    "ember-auto-import": "^2.2.0",
+    "ember-auto-import": "^2.2.3",
     "ember-cli-babel": "^7.26.6",
-    "ember-cli-htmlbars": "^5.7.1",
+    "ember-cli-htmlbars": "^6.0.0",
     "ember-cli-showdown": "^6.0.0",
     "ember-composable-helpers": "^4.5.0",
     "ember-fetch": "^8.0.4",
-    "ember-in-viewport": "^3.10.2",
+    "ember-in-viewport": "^3.10.3",
     "ember-intl": "^5.7.0",
-    "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-uikit": "^4.0.0",
-    "graphql": "^15.6.0",
+    "graphql": "^15.6.1",
     "jexl": "^2.3.0",
     "lodash.clonedeep": "^4.5.0",
     "lodash.isequal": "^4.5.0",
@@ -38,11 +38,12 @@
   },
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
-    "@ember/test-helpers": "2.5.0",
-    "@embroider/test-setup": "0.45.0",
-    "@projectcaluma/ember-testing": "9.0.0",
+    "@ember/test-helpers": "2.6.0",
+    "@embroider/test-setup": "0.47.2",
+    "@projectcaluma/ember-testing": "9.1.0",
+    "@projectcaluma/ember-workflow": "9.0.3",
     "broccoli-asset-rev": "3.0.0",
-    "ember-cli": "3.28.1",
+    "ember-cli": "3.28.4",
     "ember-cli-code-coverage": "1.0.3",
     "ember-cli-dependency-checker": "3.2.0",
     "ember-cli-inject-live-reload": "2.1.0",
@@ -53,21 +54,21 @@
     "ember-export-application-global": "2.0.1",
     "ember-load-initializers": "2.1.2",
     "ember-maybe-import-regenerator": "1.0.0",
-    "ember-qunit": "5.1.4",
+    "ember-qunit": "5.1.5",
     "ember-resolver": "8.0.3",
-    "ember-source": "3.28.1",
+    "ember-source": "3.28.6",
     "ember-source-channel-url": "3.0.0",
-    "ember-try": "1.4.0",
+    "ember-try": "2.0.0",
     "faker": "5.5.3",
     "loader.js": "4.7.0",
     "npm-run-all": "4.1.5",
     "qunit": "2.17.2",
     "qunit-dom": "2.0.0",
     "uuid": "8.3.2",
-    "webpack": "5.58.0"
+    "webpack": "5.64.1"
   },
   "engines": {
-    "node": "10.* || >= 12"
+    "node": "12.* || 14.* || >= 16"
   },
   "ember": {
     "edition": "octane"

package/translations/de.yaml

@@ -1,24 +1,12 @@
 caluma:
-  caluma-query:
-    work-item:
-      status:
-        READY: "Offen"
-        COMPLETED: "Erledigt"
-        CANCELED: "Abgebrochen"
-        SKIPPED: "Übersprungen"
-
-    case:
-      status:
-        RUNNING: "In Bearbeitung"
-        COMPLETED: "Abgeschlossen"
-        CANCELED: "Abgebrochen"
   form:
     optional: "Optional"
     save: "Speichern"
     delete: "Löschen"
     edit: "Bearbeiten"
-    selectFile: "Klicken um Datei hochzuladen"
-    changeFile: "Klicken um andere Datei hochzuladen"
+    cancel: "Abbrechen"
+    close: "Schliessen"
+    selectFile: "Durchsuchen..."
     deleteRow: "Möchten Sie diese Zeile wirklich löschen?"
     addRow: "Zeile hinzufügen"
     optionNotAvailable: "Diese Option ist nicht mehr verfügbar"

package/translations/en.yaml

@@ -1,24 +1,12 @@
 caluma:
-  caluma-query:
-    work-item:
-      status:
-        READY: "Pending"
-        COMPLETED: "Completed"
-        CANCELED: "Canceled"
-        SKIPPED: "Skipped"
-    case:
-      status:
-        RUNNING: "Pending"
-        COMPLETED: "Completed"
-        CANCELED: "Canceled"
-
   form:
     optional: "Optional"
     save: "Save"
     delete: "Delete"
     edit: "Edit"
-    selectFile: "Click to upload a file"
-    changeFile: "Click to upload a different file"
+    cancel: "Cancel"
+    close: "Close"
+    selectFile: "Browse..."
     deleteRow: "Do you really want to delete this row?"
     addRow: "Add row"
     optionNotAvailable: "This option is not available anymore"

package/translations/fr.yaml

@@ -1,25 +1,12 @@
 caluma:
-  caluma-query:
-    work-item:
-      status:
-        READY: "En attente"
-        COMPLETED: "Terminé"
-        CANCELED: "Annulé"
-        SKIPPED: "Sauté"
-
-    case:
-      status:
-        RUNNING: "En cours"
-        COMPLETED: "Terminé"
-        CANCELED: "Annulé"
-
   form:
     optional: "optional"
     save: "sauvegarder"
     delete: "supprimer"
     edit: "modifier"
-    selectFile: "cliquez pour télécharger le ficher"
-    changeFile: "cliquez pour télécharger un autre fichier"
+    cancel: "annuler"
+    close: "fermer"
+    selectFile: "Sélectionner..."
     deleteRow: "Voulez-vous supprimer cette ligne?"
     addRow: "Ajouter une ligne"
     optionNotAvailable: "Cette option n'est plus disponible"

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