@projectcaluma/ember-distribution 11.0.0-beta.31 → 11.0.0-beta.33

package/addon/abilities/inquiry.js

@@ -21,11 +21,27 @@ export default class InquiryAbility extends Ability {
   }
 
   get canSend() {
-    return this.config.permissions.sendInquiry?.(this.model) ?? true;
+    return (
+      !this.config.ui.readonly &&
+      this.model?.task.slug === this.config.inquiry.task &&
+      this.model?.status === "SUSPENDED" &&
+      (this.config.permissions.sendInquiry?.(this.model) ?? true) &&
+      this.model?.controllingGroups
+        .map(String)
+        .includes(String(this.calumaOptions.currentGroupId))
+    );
   }
 
   get canWithdraw() {
-    return this.config.permissions.withdrawInquiry?.(this.model) ?? true;
+    return (
+      !this.config.ui.readonly &&
+      this.model?.task.slug === this.config.inquiry.task &&
+      this.model?.status === "SUSPENDED" &&
+      (this.config.permissions.withdrawInquiry?.(this.model) ?? true) &&
+      this.model?.controllingGroups
+        .map(String)
+        .includes(String(this.calumaOptions.currentGroupId))
+    );
   }
 
   get canAnswer() {

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

@@ -128,21 +128,28 @@
     >
       {{#if (and (eq @type "answer") @inquiry.assignedUsers.length)}}
         <li {{uk-tooltip (t "caluma.distribution.inquiry.assigned-user")}}>
-          {{user-name @inquiry.assignedUsers}}
+          <span>{{user-name @inquiry.assignedUsers}}</span>
+        </li>
+      {{/if}}
+      {{#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}}
-      <li
-        {{uk-tooltip
-          (if
-            (eq @type "answer")
-            (t "caluma.distribution.inquiry.closed-at")
-            (t "caluma.distribution.inquiry.created-at")
-          )
-        }}
-      >
-        {{format-date this.date}}
-        {{format-time this.date hour="2-digit" minute="2-digit"}}
-      </li>
     </ul>
 
   </div>

package/addon/config.js

@@ -46,6 +46,7 @@ export default function config(target, property) {
                   color: "primary",
                   label: "caluma.distribution.answer.buttons.confirm.label",
                   status: "caluma.distribution.answer.buttons.confirm.status",
+                  willCompleteInquiry: true,
                 },
                 "revise-inquiry-answer": {
                   color: "default",
@@ -59,8 +60,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 +69,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-distribution",
-  "version": "11.0.0-beta.31",
+  "version": "11.0.0-beta.33",
   "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.31",
-    "@projectcaluma/ember-form": "^11.0.0-beta.31",
-    "@projectcaluma/ember-workflow": "^11.0.0-beta.31",
+    "@projectcaluma/ember-core": "^11.0.0-beta.33",
+    "@projectcaluma/ember-form": "^11.0.0-beta.33",
+    "@projectcaluma/ember-workflow": "^11.0.0-beta.33",
     "ember-apollo-client": "~4.0.2",
     "ember-auto-import": "^2.4.3",
     "ember-can": "^4.2.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.31",
+    "@projectcaluma/ember-testing": "11.0.0-beta.33",
     "broccoli-asset-rev": "3.0.0",
     "ember-cli": "4.8.0",
     "ember-cli-code-coverage": "1.0.3",

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"

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"

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"