@projectcaluma/ember-distribution 11.0.0-beta.32 → 11.0.0-beta.34

package/addon/components/cd-document-header.hbs

@@ -1,11 +1,11 @@
 <div class="uk-text-large uk-flex uk-flex-middle" data-test-document-header>
-  <div class="uk-width-expand">
+  <div class="uk-width-expand uk-flex-inline uk-flex-middle">
     {{@name}}
     {{#if @group}}
       ({{group-name @group}})
     {{/if}}
     {{#if @status}}
-      <UkLabel @label={{@status}} class="uk-margin-left" />
+      <UkLabel @label={{@status}} class="uk-margin-left uk-text-default" />
     {{/if}}
   </div>
   {{yield}}

package/addon/components/cd-inquiry-answer-form.hbs

@@ -92,6 +92,7 @@
                 @onClick={{fn
                   (perform this.completeWorkItem)
                   buttonConfig.workItemId
+                  buttonConfig.willCompleteInquiry
                   validate
                 }}
               >{{buttonConfig.label}}</UkButton>
@@ -115,6 +116,7 @@
               @onClick={{fn
                 (perform this.completeWorkItem)
                 buttonConfig.workItemId
+                buttonConfig.willCompleteInquiry
                 null
               }}
             >{{buttonConfig.label}}</UkButton>

package/addon/components/cd-inquiry-answer-form.js

@@ -2,7 +2,7 @@ import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
-import { queryManager, getObservable } from "ember-apollo-client";
+import { queryManager } from "ember-apollo-client";
 import { dropTask } from "ember-concurrency";
 import { trackedTask } from "ember-resources/util/ember-concurrency";
 
@@ -55,6 +55,7 @@ export default class CdInquiryAnswerFormComponent extends Component {
               isFormButton:
                 edge.node.task.__typename === "CompleteWorkflowFormTask",
               label: this.intl.t(config.label),
+              willCompleteInquiry: config.willCompleteInquiry ?? false,
             }
           : null;
       })
@@ -84,7 +85,7 @@ export default class CdInquiryAnswerFormComponent extends Component {
   }
 
   @dropTask
-  *completeWorkItem(workItem, validate = () => true) {
+  *completeWorkItem(workItem, willCompleteInquiry, validate = () => true) {
     try {
       if (typeof validate === "function" && !(yield validate())) return;
 
@@ -95,12 +96,14 @@ export default class CdInquiryAnswerFormComponent extends Component {
           statusQuestion: this.config.inquiry.answer.statusQuestion,
           buttonTasks: Object.keys(this.config.inquiry.answer.buttons),
           checkTask: this.config.controls.checkTask,
+          createTask: this.config.controls.createTask,
+          inquiryTask: this.config.inquiry.task,
           currentGroup: String(this.calumaOptions.currentGroupId),
           answerInfoQuestions: this.config.inquiry.answer.infoQuestions,
+          willCompleteInquiry,
         },
       });
 
-      yield getObservable(this._inquiry.value)?.refetch();
       yield this.router.transitionTo("inquiry.index");
     } catch (error) {
       this.notification.danger(

package/addon/components/cd-inquiry-dialog/inquiry-part.hbs

@@ -2,14 +2,15 @@
   <div class="uk-flex uk-flex-middle uk-text-large" data-test-title>
     {{#if (eq @type "request")}}
       <UkIcon @icon="forward" class="uk-margin-small-right" />
-      <div class="uk-width-expand uk-margin-small-right">
+      <div
+        class="uk-width-expand uk-margin-small-right uk-flex-inline uk-flex-middle"
+      >
         {{group-name @inquiry.controllingGroups}}
-        {{#if
-          (and
-            (can "answer inquiry" @inquiry) (not @disabled) this.answerStatus
-          )
-        }}
-          <UkLabel @label={{this.answerStatus}} class="uk-margin-left" />
+        {{#if this.status}}
+          <UkLabel
+            @label={{this.status}}
+            class="uk-margin-left uk-text-default"
+          />
         {{/if}}
       </div>
     {{else if (eq @type "answer")}}
@@ -131,20 +132,25 @@
           <span>{{user-name @inquiry.assignedUsers}}</span>
         </li>
       {{/if}}
-      <li
-        {{uk-tooltip
-          (if
-            (eq @type "answer")
-            (t "caluma.distribution.inquiry.closed-at")
-            (t "caluma.distribution.inquiry.created-at")
-          )
-        }}
-      >
-        <span>
-          {{format-date this.date}}
-          {{format-time this.date hour="2-digit" minute="2-digit"}}
-        </span>
-      </li>
+      {{#if (eq @type "answer")}}
+        <li {{uk-tooltip (t "caluma.distribution.inquiry.closed-at")}}>
+          <span>
+            {{format-date @inquiry.closedAt}}
+            {{format-time @inquiry.closedAt hour="2-digit" minute="2-digit"}}
+          </span>
+        </li>
+      {{else if (and (eq @type "request") @inquiry.childCase.createdAt)}}
+        <li {{uk-tooltip (t "caluma.distribution.inquiry.sent-at")}}>
+          <span>
+            {{format-date @inquiry.childCase.createdAt}}
+            {{format-time
+              @inquiry.childCase.createdAt
+              hour="2-digit"
+              minute="2-digit"
+            }}
+          </span>
+        </li>
+      {{/if}}
     </ul>
 
   </div>

package/addon/components/cd-inquiry-dialog/inquiry-part.js

@@ -18,6 +18,7 @@ export default class CdInquiryDialogInquiryPartComponent extends Component {
   @service router;
   @service intl;
   @service calumaOptions;
+  @service abilities;
 
   @queryManager apollo;
 
@@ -25,6 +26,25 @@ export default class CdInquiryDialogInquiryPartComponent extends Component {
 
   @inquiryAnswerStatus answerStatus;
 
+  get status() {
+    if (!this.args.type === "request" || this.args.disabled) {
+      return null;
+    }
+
+    const inquiry = this.args.inquiry;
+
+    if (
+      inquiry.status === "SUSPENDED" &&
+      this.abilities.can("edit inquiry", inquiry)
+    ) {
+      return this.intl.t("caluma.distribution.status.draft");
+    } else if (this.abilities.can("answer inquiry", inquiry)) {
+      return this.answerStatus;
+    }
+
+    return null;
+  }
+
   get date() {
     const key = this.args.type === "request" ? "createdAt" : "closedAt";
 

package/addon/components/cd-inquiry-dialog.js

@@ -24,7 +24,12 @@ export default class CdInquiryDialogComponent extends Component {
   }
 
   get inquiries() {
-    return this._inquiries.value?.allWorkItems.edges.map((edge) => edge.node);
+    return this._inquiries.value?.allWorkItems.edges
+      .map((edge) => edge.node)
+      .filter(
+        // suspended inquiries should only be visible to its creator
+        (node) => this.currentGroupIsCreator || node.status !== "SUSPENDED"
+      );
   }
 
   _inquiries = trackedTask(this, this.fetchDialog, () => [
@@ -38,6 +43,7 @@ export default class CdInquiryDialogComponent extends Component {
   *fetchDialog(from, to, caseId, config) {
     const response = yield this.apollo.watchQuery({
       query: inquiryDialogQuery,
+      fetchPolicy: "cache-and-network",
       variables: {
         from,
         to,

package/addon/components/cd-navigation/status-indicator.js

@@ -14,6 +14,9 @@ export default class CdNavigationStatusIndicatorComponent extends Component {
   @inquiryDeadline deadline;
 
   get showDeadlineIndicator() {
-    return this.deadline.isOverdue || this.deadline.isWarning;
+    return (
+      ["addressed", "controlling"].includes(this.args.type) &&
+      (this.deadline.isOverdue || this.deadline.isWarning)
+    );
   }
 }

package/addon/config.js

@@ -6,6 +6,7 @@ export const INQUIRY_STATUS = {
   DRAFT: "draft",
   SKIPPED: "skipped",
   SENT: "sent",
+  IN_PROGRESS: "in-progress",
   POSITIVE: "positive",
   NEGATIVE: "negative",
   NEEDS_INTERACTION: "needs-interaction",
@@ -45,7 +46,12 @@ export default function config(target, property) {
                 "confirm-inquiry-answer": {
                   color: "primary",
                   label: "caluma.distribution.answer.buttons.confirm.label",
-                  status: "caluma.distribution.answer.buttons.confirm.status",
+                  status: {
+                    label: "caluma.distribution.answer.buttons.confirm.status",
+                    color: { addressed: "muted", controlling: "emphasis" },
+                    icon: "user",
+                  },
+                  willCompleteInquiry: true,
                 },
                 "revise-inquiry-answer": {
                   color: "default",
@@ -59,8 +65,8 @@ export default function config(target, property) {
               },
               details: (inquiry) => [
                 {
-                  label: "caluma.distribution.inquiry.created-at",
-                  value: inquiry.createdAt,
+                  label: "caluma.distribution.inquiry.sent-at",
+                  value: inquiry.childCase?.createdAt,
                   type: "date",
                 },
                 {
@@ -68,11 +74,15 @@ export default function config(target, property) {
                   value: inquiry.assignedUsers,
                   type: "user",
                 },
-                {
-                  label: "caluma.distribution.inquiry.closed-at",
-                  value: inquiry.closedAt,
-                  type: "date",
-                },
+                ...(inquiry.closedAt
+                  ? [
+                      {
+                        label: "caluma.distribution.inquiry.closed-at",
+                        value: inquiry.closedAt,
+                        type: "date",
+                      },
+                    ]
+                  : []),
               ],
             },
           },

package/addon/gql/mutations/complete-inquiry-work-item.graphql

@@ -4,9 +4,12 @@ mutation CompleteInquiryWorkItem(
   $workItem: ID!
   $statusQuestion: ID!
   $buttonTasks: [String]!
-  $checkTask: ID!
+  $checkTask: String!
+  $inquiryTask: ID!
+  $createTask: String!
   $currentGroup: String!
   $answerInfoQuestions: [ID]!
+  $willCompleteInquiry: Boolean = false
 ) {
   completeWorkItem(input: { id: $workItem }) {
     workItem {
@@ -14,22 +17,26 @@ mutation CompleteInquiryWorkItem(
       status
       case {
         id
+        status
         document {
           id
           ...InquiryAnswer
         }
         ...InquiryAnswerButtons
-        parentWorkItem {
+        # If the work item that will be completed also completes the inquiry
+        # itself, we need to fetch certain work items that were completed /
+        # canceled in the side effect layer and the inquiry itself
+        parentWorkItem @include(if: $willCompleteInquiry) {
           id
           status
           isRedoable
-          # This is needed to remove the check inquiries button if that work
-          # item is closed automatically after completing an inquiry.
+          closedByUser
+          closedAt
           case {
             id
-            workItems(
+            controls: workItems(
               filter: [
-                { task: $checkTask }
+                { tasks: [$checkTask, $createTask] }
                 { addressedGroups: [$currentGroup] }
               ]
             ) {
@@ -40,6 +47,19 @@ mutation CompleteInquiryWorkItem(
                 }
               }
             }
+            inquiries: workItems(
+              filter: [
+                { task: $inquiryTask }
+                { controllingGroups: [$currentGroup] }
+              ]
+            ) {
+              edges {
+                node {
+                  id
+                  isRedoable
+                }
+              }
+            }
           }
         }
       }

package/addon/gql/queries/inquiry-answer.graphql

@@ -16,7 +16,6 @@ query InquiryAnswer(
         controllingGroups
         assignedUsers
         closedByUser
-        createdAt
         closedAt
         task {
           id
@@ -29,10 +28,9 @@ query InquiryAnswer(
         childCase {
           id
           status
+          createdAt
           document {
             id
-            modifiedContentAt
-            modifiedContentByUser
           }
           ...InquiryAnswerButtons
         }

package/addon/gql/queries/inquiry-dialog.graphql

@@ -6,7 +6,6 @@ fragment DialogInquiry on WorkItem {
   addressedGroups
   controllingGroups
   assignedUsers
-  createdAt
   closedAt
   status
   isRedoable
@@ -21,6 +20,7 @@ fragment DialogInquiry on WorkItem {
   }
   childCase {
     id
+    createdAt
     ...InquiryAnswerButtons
     document {
       id

package/addon/gql/queries/inquiry-edit.graphql

@@ -12,8 +12,6 @@ query InquiryEdit($inquiry: ID!) {
         }
         document {
           id
-          modifiedContentAt
-          modifiedContentByUser
         }
       }
     }

package/addon/gql/queries/navigation.graphql

@@ -1,4 +1,4 @@
-# import InquiryAnswerStatus from '../fragments/inquiry-answer.graphql'
+# import InquiryAnswerStatus, InquiryAnswerButtons from '../fragments/inquiry-answer.graphql'
 # import InquiryRequestDeadline from '../fragments/inquiry-request.graphql'
 
 fragment NavigationInquiry on WorkItem {
@@ -14,8 +14,10 @@ fragment NavigationInquiry on WorkItem {
     id
     document {
       id
+      modifiedContentAt
       ...InquiryAnswerStatus
     }
+    ...InquiryAnswerButtons
   }
 }
 
@@ -25,6 +27,7 @@ query Navigation(
   $deadlineQuestion: ID
   $currentGroup: String!
   $caseId: ID!
+  $buttonTasks: [String]!
 ) {
   controlling: allWorkItems(
     filter: [

package/addon/services/distribution.js

@@ -9,7 +9,6 @@ import { decodeId } from "@projectcaluma/ember-core/helpers/decode-id";
 import config from "@projectcaluma/ember-distribution/config";
 import createInquiryMutation from "@projectcaluma/ember-distribution/gql/mutations/create-inquiry.graphql";
 import controlsQuery from "@projectcaluma/ember-distribution/gql/queries/controls.graphql";
-import inquiryDialogQuery from "@projectcaluma/ember-distribution/gql/queries/inquiry-dialog.graphql";
 import navigationQuery from "@projectcaluma/ember-distribution/gql/queries/navigation.graphql";
 import uniqueByGroups from "@projectcaluma/ember-distribution/utils/unique-by-groups";
 
@@ -75,6 +74,7 @@ export default class DistributionService extends Service {
         currentGroup: String(this.calumaOptions.currentGroupId),
         statusQuestion: this.config.inquiry.answer.statusQuestion,
         deadlineQuestion: this.config.inquiry.deadlineQuestion,
+        buttonTasks: Object.keys(this.config.inquiry.answer.buttons),
       },
     });
 
@@ -107,22 +107,6 @@ export default class DistributionService extends Service {
       // get create inquiry work item to complete
       const createId = decodeId(this.controls.value?.create.edges[0].node.id);
 
-      // refetch dialog queries of the groups that will have a new inquiry
-      const refetchQueries = groups.map((group) => ({
-        query: inquiryDialogQuery,
-        variables: {
-          from: String(this.calumaOptions.currentGroupId),
-          to: String(group),
-          caseId: this.caseId,
-          task: this.config.inquiry.task,
-          infoQuestion: this.config.inquiry.infoQuestion,
-          deadlineQuestion: this.config.inquiry.deadlineQuestion,
-          statusQuestion: this.config.inquiry.answer.statusQuestion,
-          answerInfoQuestions: this.config.inquiry.answer.infoQuestions,
-          buttonTasks: Object.keys(this.config.inquiry.answer.buttons),
-        },
-      }));
-
       // create new inquiries
       yield this.apollo.mutate({
         mutation: createInquiryMutation,
@@ -133,7 +117,6 @@ export default class DistributionService extends Service {
             addressed_groups: groups.map(String),
           }),
         },
-        refetchQueries,
       });
 
       // refetch navigation and controls data

package/addon/utils/inquiry-answer-status.js

@@ -26,7 +26,9 @@ function decorator(
         this.config.inquiry.answer.buttons
       ).find(([task]) => readyWorkItems.includes(task))?.[1];
 
-      return buttonConfig?.status ? this.intl.t(buttonConfig.status) : null;
+      return buttonConfig?.status
+        ? this.intl.t(buttonConfig.status.label ?? buttonConfig.status)
+        : null;
     },
   };
 }

package/addon/utils/inquiry-status.js

@@ -8,6 +8,7 @@ export const ICON_MAP = {
   [INQUIRY_STATUS.DRAFT]: "commenting",
   [INQUIRY_STATUS.SKIPPED]: "lock",
   [INQUIRY_STATUS.SENT]: "comment",
+  [INQUIRY_STATUS.IN_PROGRESS]: "file-edit",
   [INQUIRY_STATUS.POSITIVE]: "check",
   [INQUIRY_STATUS.NEGATIVE]: "close",
   [INQUIRY_STATUS.NEEDS_INTERACTION]: "file-text",
@@ -17,6 +18,7 @@ export const COLOR_MAP = {
   [INQUIRY_STATUS.DRAFT]: "muted",
   [INQUIRY_STATUS.SKIPPED]: "muted",
   [INQUIRY_STATUS.SENT]: "emphasis",
+  [INQUIRY_STATUS.IN_PROGRESS]: { addressed: "muted", controlling: "emphasis" },
   [INQUIRY_STATUS.POSITIVE]: "success",
   [INQUIRY_STATUS.NEGATIVE]: "danger",
   [INQUIRY_STATUS.NEEDS_INTERACTION]: "warning",
@@ -41,16 +43,51 @@ function decorator(
   return {
     get() {
       const inquiry = get(this, inquiryProperty);
-      const isAddressed = get(this, inquiryTypeProperty) === "addressed";
+      const inquiryType = get(this, inquiryTypeProperty);
+      const isAddressed = inquiryType === "addressed";
+      const isControlling = inquiryType === "controlling";
+
       const isDraft = isAddressed
         ? inquiry.status === "READY"
         : inquiry.status === "SUSPENDED";
       const isSent = !isAddressed && inquiry.status === "READY";
       const isSkipped = inquiry.status === "SKIPPED";
+      const isInProgress =
+        (isAddressed || isControlling) &&
+        inquiry.status === "READY" &&
+        inquiry.childCase?.document?.modifiedContentAt;
+
+      const buttonConfig = this.config.inquiry.answer.buttons;
+      const inquiryAnswerStatus =
+        buttonConfig &&
+        (isAddressed || isControlling) &&
+        inquiry.status === "READY"
+          ? inquiry?.childCase?.workItems.edges
+              .filter((edge) => edge.node.status === "READY")
+              .map((edge) => {
+                const config = buttonConfig[edge.node.task.slug]?.status;
+                if (!config?.icon) {
+                  return null;
+                }
+
+                return {
+                  ...config,
+                  label: this.intl.t(config.label),
+                  color: config.color[inquiryType] ?? config.color,
+                };
+              })
+              .filter(Boolean)[0]
+          : null;
+
+      if (inquiryAnswerStatus) {
+        return inquiryAnswerStatus;
+      }
 
       const answer = inquiry.childCase?.document.status.edges[0]?.node;
       const slug = isSkipped
         ? INQUIRY_STATUS.SKIPPED
+        : isInProgress
+        ? INQUIRY_STATUS.IN_PROGRESS
         : isDraft
         ? INQUIRY_STATUS.DRAFT
         : isSent
@@ -63,7 +100,7 @@ function decorator(
           !isSkipped && !isDraft && !isSent
             ? answer?.selectedOption.label
             : this.intl.t(`caluma.distribution.status.${slug}`),
-        color: COLOR_MAP[slug],
+        color: COLOR_MAP[slug][inquiryType] ?? COLOR_MAP[slug],
         icon: ICON_MAP[slug],
       };
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-distribution",
-  "version": "11.0.0-beta.32",
+  "version": "11.0.0-beta.34",
   "description": "Ember engine for the Caluma distribution module.",
   "keywords": [
     "ember-addon",
@@ -23,9 +23,9 @@
     "@embroider/macros": "^1.9.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@projectcaluma/ember-core": "^11.0.0-beta.32",
-    "@projectcaluma/ember-form": "^11.0.0-beta.32",
-    "@projectcaluma/ember-workflow": "^11.0.0-beta.32",
+    "@projectcaluma/ember-core": "^11.0.0-beta.34",
+    "@projectcaluma/ember-form": "^11.0.0-beta.34",
+    "@projectcaluma/ember-workflow": "^11.0.0-beta.34",
     "ember-apollo-client": "~4.0.2",
     "ember-auto-import": "^2.4.3",
     "ember-can": "^4.2.0",
@@ -36,8 +36,8 @@
     "ember-fetch": "^8.1.2",
     "ember-flatpickr": "^3.2.3",
     "ember-intl": "^5.7.2",
-    "ember-resources": "^5.4.0",
-    "ember-svg-jar": "^2.4.1",
+    "ember-resources": "^5.5.0",
+    "ember-svg-jar": "^2.4.2",
     "ember-test-selectors": "^6.0.0",
     "ember-uikit": "^6.1.0",
     "graphql": "^15.8.0",
@@ -51,7 +51,7 @@
     "@ember/test-helpers": "2.7.0",
     "@embroider/test-setup": "1.8.3",
     "@faker-js/faker": "7.6.0",
-    "@projectcaluma/ember-testing": "11.0.0-beta.32",
+    "@projectcaluma/ember-testing": "11.0.0-beta.34",
     "broccoli-asset-rev": "3.0.0",
     "ember-cli": "4.8.0",
     "ember-cli-code-coverage": "1.0.3",
@@ -72,7 +72,7 @@
     "loader.js": "4.7.0",
     "miragejs": "0.1.45",
     "npm-run-all": "4.1.5",
-    "qunit": "2.19.2",
+    "qunit": "2.19.3",
     "qunit-dom": "2.0.0",
     "sass": "1.55.0",
     "webpack": "5.74.0"

package/translations/de.yaml

@@ -35,7 +35,7 @@ caluma:
       automatisch gespeichert."
 
     inquiry:
-      created-at: "Erstellt am"
+      sent-at: "Versendet am"
       closed-at: "Beantwortet am"
       deadline: "Frist"
       assigned-user: "Verantwortliche Person"
@@ -103,6 +103,7 @@ caluma:
       draft: "Entwurf"
       skipped: "Vorzeitig beendet"
       sent: "Versendet"
+      in-progress: "In Bearbeitung"
       positive: "Positiv"
       negative: "Negativ"
       needs-interaction: "Aktion erforderlich"

package/translations/en.yaml

@@ -35,7 +35,7 @@ caluma:
       automatically."
 
     inquiry:
-      created-at: "Created at"
+      sent-at: "Sent at"
       closed-at: "Answered at"
       deadline: "Deadline"
       assigned-user: "Assigned user"
@@ -103,6 +103,7 @@ caluma:
       draft: "Draft"
       skipped: "Aborted"
       sent: "Sent"
+      in-progress: "In Progress"
       positive: "Positive"
       negative: "Negative"
       needs-interaction: "Needs interaction"

package/translations/fr.yaml

@@ -35,7 +35,7 @@ caluma:
       automatiquement enregistrées."
 
     inquiry:
-      created-at: "Créé le"
+      sent-at: "Envoyé le"
       closed-at: "Répondu le"
       deadline: "Délai"
       assigned-user: "Personne responsable"
@@ -103,6 +103,7 @@ caluma:
       draft: "Brouillon"
       skipped: "Terminé prématurément"
       sent: "Envoyé"
+      in-progress: "En cours"
       positive: "Positif"
       negative: "Negatif"
       needs-interaction: "Action nécessaire"