@projectcaluma/ember-distribution 11.0.0-beta.25 → 11.0.0-beta.28

package/addon/abilities/inquiry.js

@@ -1,5 +1,6 @@
 import { inject as service } from "@ember/service";
 import { Ability } from "ember-can";
+import { DateTime } from "luxon";
 
 import config from "@projectcaluma/ember-distribution/config";
 
@@ -56,4 +57,32 @@ export default class InquiryAbility extends Ability {
       ) ?? true
     );
   }
+
+  get canReopen() {
+    return (
+      this.model.isRedoable &&
+      this.model?.addressedGroups
+        .map(String)
+        .includes(String(this.calumaOptions.currentGroupId)) &&
+      (this.config.permissions.reopenInquiry?.(this.model) ?? true)
+    );
+  }
+
+  get canSendReminder() {
+    const deadline = DateTime.fromISO(
+      this.model.document?.deadline.edges[0]?.node.value
+    );
+
+    return (
+      !this.config.ui.readonly &&
+      this.config.enableReminders &&
+      this.model?.task.slug === this.config.inquiry.task &&
+      this.model?.status === "READY" &&
+      this.model?.controllingGroups
+        .map(String)
+        .includes(String(this.calumaOptions.currentGroupId)) &&
+      deadline.diffNow("days").days <= 0 &&
+      (this.config.permissions.sendReminder?.(this.model) ?? true)
+    );
+  }
 }

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

@@ -77,7 +77,47 @@
           </LinkTo>
         </li>
       {{/if}}
+      {{#if (and (eq @type "answer") (can "reopen inquiry" @inquiry))}}
+        <li>
+          <a href="" {{on "click" (perform this.reopen)}} data-test-reopen>
+            {{t "caluma.distribution.reopen-inquiry.link"}}
+          </a>
+        </li>
+      {{/if}}
     {{/unless}}
+    {{#if (can "send reminder inquiry" @inquiry)}}
+      <li>
+        <a
+          data-test-send-reminder
+          href=""
+          {{on "click" (perform this.sendReminder)}}
+        >
+          {{t "caluma.distribution.reminder.link"}}
+        </a>
+        <div
+          uk-dropdown="mode: hover; pos: bottom"
+          class="uk-padding-small uk-width-small"
+        >
+          <div class="uk-text-center uk-text-bold uk-margin-small-bottom">
+            {{t "caluma.distribution.reminder.title"}}
+          </div>
+          {{#if @inquiry.meta.reminders}}
+            <div class="uk-height-max-small uk-overflow-auto">
+              {{#each @inquiry.meta.reminders as |reminder|}}
+                <div class="uk-text-center uk-text-small uk-text-muted">
+                  {{format-date reminder}}
+                  {{format-time reminder hour="2-digit" minute="2-digit"}}
+                </div>
+              {{/each}}
+            </div>
+          {{else}}
+            <div class="uk-text-center">
+              {{t "caluma.distribution.reminder.no-reminders"}}
+            </div>
+          {{/if}}
+        </div>
+      </li>
+    {{/if}}
   </ul>
 
   {{#if this.requestInfo}}

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

@@ -4,9 +4,12 @@ import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
 import { dropTask } from "ember-concurrency";
 import { confirm } from "ember-uikit";
+import { DateTime } from "luxon";
 
 import { decodeId } from "@projectcaluma/ember-core/helpers/decode-id";
 import config from "@projectcaluma/ember-distribution/config";
+import reopenInquiryMutation from "@projectcaluma/ember-distribution/gql/mutations/reopen-inquiry.graphql";
+import updateInquiryMetaMutation from "@projectcaluma/ember-distribution/gql/mutations/update-inquiry-meta.graphql";
 import withdrawInquiryMutation from "@projectcaluma/ember-distribution/gql/mutations/withdraw-inquiry.graphql";
 import inquiryAnswerStatus from "@projectcaluma/ember-distribution/utils/inquiry-answer-status";
 
@@ -14,6 +17,7 @@ export default class CdInquiryDialogInquiryPartComponent extends Component {
   @service notification;
   @service router;
   @service intl;
+  @service calumaOptions;
 
   @queryManager apollo;
 
@@ -73,4 +77,70 @@ export default class CdInquiryDialogInquiryPartComponent extends Component {
       );
     }
   }
+
+  @dropTask
+  *reopen(e) {
+    e.preventDefault();
+
+    /* istanbul ignore next */
+    if (
+      !(yield confirm(
+        this.intl.t("caluma.distribution.reopen-inquiry.confirm")
+      ))
+    ) {
+      return;
+    }
+
+    try {
+      yield this.apollo.mutate({
+        mutation: reopenInquiryMutation,
+        variables: {
+          workItem: decodeId(this.args.inquiry.id),
+          statusQuestion: this.config.inquiry.answer.statusQuestion,
+          buttonTasks: Object.keys(this.config.inquiry.answer.buttons),
+        },
+      });
+    } catch (error) {
+      this.notification.danger(
+        this.intl.t("caluma.distribution.reopen-inquiry.error")
+      );
+    }
+  }
+
+  @dropTask
+  *sendReminder(e) {
+    e.preventDefault();
+
+    if (!(yield confirm(this.intl.t("caluma.distribution.reminder.confirm")))) {
+      return;
+    }
+
+    try {
+      yield this.calumaOptions.sendReminderDistributionInquiry(
+        decodeId(this.args.inquiry.id)
+      );
+
+      this.notification.success(
+        this.intl.t("caluma.distribution.reminder.success")
+      );
+
+      yield this.apollo.mutate({
+        mutation: updateInquiryMetaMutation,
+        variables: {
+          inquiry: decodeId(this.args.inquiry.id),
+          meta: JSON.stringify({
+            ...this.args.inquiry.meta,
+            reminders: [
+              DateTime.now().toISO(),
+              ...(this.args.inquiry.meta.reminders ?? []),
+            ],
+          }),
+        },
+      });
+    } catch (error) {
+      this.notification.danger(
+        this.intl.t("caluma.distribution.reminder.error")
+      );
+    }
+  }
 }

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

@@ -52,6 +52,8 @@ export default class CdInquiryDialogComponent extends Component {
       },
     });
 
+    this._setRedoableStates(response.allWorkItems);
+
     /**
      * Sadly this is necessary to handle what happens after the withdraw task in
      * the inquiry part component because the mutation triggers a refresh of the
@@ -68,11 +70,39 @@ export default class CdInquiryDialogComponent extends Component {
       if (allWorkItems.edges.every((edge) => edge.node.status === "CANCELED")) {
         this.router.transitionTo("index");
       }
+
+      /**
+       * Get work item that was redoable in the previous calulation and is now
+       * not anymore. This indicates that the work item was redone which should
+       * result in a transition to the answer view.
+       */
+      const redoneWorkItem = this._redoableStates.find((stateObj) => {
+        const updatedWorkItem = allWorkItems.edges.find(
+          (edge) => decodeId(edge.node.id) === stateObj.id
+        );
+
+        return (
+          stateObj.isRedoable && !(updatedWorkItem?.node.isRedoable ?? true)
+        );
+      });
+
+      if (redoneWorkItem) {
+        this.router.transitionTo("inquiry.detail.answer", redoneWorkItem.id);
+      }
+
+      this._setRedoableStates(allWorkItems);
     });
 
     return response;
   }
 
+  _setRedoableStates(allWorkItems) {
+    this._redoableStates = allWorkItems.edges.map((edge) => ({
+      id: decodeId(edge.node.id),
+      isRedoable: edge.node.isRedoable,
+    }));
+  }
+
   @dropTask
   *createInquiry(e) {
     e.preventDefault();

package/addon/components/cd-navigation/controls.js

@@ -8,7 +8,7 @@ import { gql } from "graphql-tag";
 import { decodeId } from "@projectcaluma/ember-core/helpers/decode-id";
 import config from "@projectcaluma/ember-distribution/config";
 import completeWorkItemMutation from "@projectcaluma/ember-distribution/gql/mutations/complete-work-item.graphql";
-import redoWorkItemMutation from "@projectcaluma/ember-distribution/gql/mutations/redo-work-item.graphql";
+import reopenDistributionMutation from "@projectcaluma/ember-distribution/gql/mutations/reopen-distribution.graphql";
 import incompleteInquiriesQuery from "@projectcaluma/ember-distribution/gql/queries/incomplete-inquiries.graphql";
 
 export default class CdNavigationControlsComponent extends Component {
@@ -55,6 +55,8 @@ export default class CdNavigationControlsComponent extends Component {
         },
       });
 
+      yield this.config.hooks.postCompleteDistribution?.();
+
       yield this.distribution.refetch();
       this.router.transitionTo("index");
     } catch (e) {
@@ -76,7 +78,7 @@ export default class CdNavigationControlsComponent extends Component {
       );
 
       yield this.apollo.mutate({
-        mutation: redoWorkItemMutation,
+        mutation: reopenDistributionMutation,
         variables: {
           workItem: distributionWorkItemId,
         },

package/addon/config.js

@@ -69,6 +69,8 @@ export default function config(target, property) {
             },
           },
           permissions: {},
+          hooks: {},
+          enableReminders: true,
         },
         getOwner(this).lookup("service:calumaOptions")?.distribution ?? {}
       );

package/addon/gql/fragments/inquiry.graphql

@@ -67,10 +67,12 @@ fragment InquiryDialog on WorkItem {
   createdAt
   closedAt
   status
+  isRedoable
   task {
     id
     slug
   }
+  meta
   document {
     ...InquiryRequest
   }

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

@@ -29,6 +29,7 @@ mutation CompleteInquiryWorkItem(
         parentWorkItem {
           id
           status
+          isRedoable
         }
       }
     }

package/addon/gql/mutations/{redo-work-item.graphql → reopen-distribution.graphql}

@@ -1,4 +1,4 @@
-mutation RedoWorkItem($workItem: ID!) {
+mutation ReopenDistribution($workItem: ID!) {
   redoWorkItem(input: { id: $workItem }) {
     workItem {
       id

package/addon/gql/mutations/reopen-inquiry.graphql

@@ -0,0 +1,33 @@
+#import InquiryStatusDocument from '../fragments/inquiry.graphql'
+
+mutation ReopenInquiry(
+  $workItem: ID!
+  $statusQuestion: ID!
+  $buttonTasks: [String]!
+) {
+  redoWorkItem(input: { id: $workItem }) {
+    workItem {
+      id
+      status
+      isRedoable
+      childCase {
+        id
+        document {
+          id
+          ...InquiryStatusDocument
+        }
+        workItems(filter: [{ tasks: $buttonTasks }, { status: READY }]) {
+          edges {
+            node {
+              id
+              task {
+                id
+                slug
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

package/addon/gql/mutations/update-inquiry-meta.graphql

@@ -0,0 +1,8 @@
+mutation UpdateInquiryMeta($inquiry: ID!, $meta: JSONString!) {
+  saveWorkItem(input: { workItem: $inquiry, meta: $meta }) {
+    workItem {
+      id
+      meta
+    }
+  }
+}

package/addon/utils/inquiry-deadline.js

@@ -21,7 +21,7 @@ function decorator(
       const value = inquiry.document?.deadline.edges[0]?.node.value;
       const isDone = ["COMPLETED", "SKIPPED"].includes(inquiry.status);
 
-      const { days: diff } = DateTime.fromISO(value).diffNow("days").toObject();
+      const diff = DateTime.fromISO(value).diffNow("days").days;
 
       const isOverdue = !isDone && diff <= 0;
       const isWarning = !isDone && diff <= this.config.warningPeriod;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-distribution",
-  "version": "11.0.0-beta.25",
+  "version": "11.0.0-beta.28",
   "description": "Ember engine for the Caluma distribution module.",
   "keywords": [
     "ember-addon",
@@ -22,35 +22,35 @@
     "@embroider/macros": "^1.8.3",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@projectcaluma/ember-core": "^11.0.0-beta.25",
-    "@projectcaluma/ember-form": "^11.0.0-beta.25",
-    "@projectcaluma/ember-workflow": "^11.0.0-beta.25",
+    "@projectcaluma/ember-core": "^11.0.0-beta.28",
+    "@projectcaluma/ember-form": "^11.0.0-beta.28",
+    "@projectcaluma/ember-workflow": "^11.0.0-beta.28",
     "ember-apollo-client": "~4.0.2",
     "ember-auto-import": "^2.4.2",
     "ember-can": "^4.2.0",
     "ember-cli-babel": "^7.26.11",
-    "ember-cli-htmlbars": "^6.1.0",
-    "ember-concurrency": "^2.3.2",
+    "ember-cli-htmlbars": "^6.1.1",
+    "ember-concurrency": "^2.3.7",
     "ember-engines-router-service": "^0.3.0",
     "ember-fetch": "^8.1.2",
     "ember-intl": "^5.7.2",
     "ember-pikaday": "^4.0.0",
-    "ember-resources": "^5.3.0",
+    "ember-resources": "^5.3.2",
     "ember-svg-jar": "^2.3.4",
     "ember-test-selectors": "^6.0.0",
     "ember-uikit": "^6.0.0",
     "graphql": "^15.8.0",
     "graphql-tag": "^2.12.6",
     "lodash.merge": "^4.6.2",
-    "luxon": "^3.0.2",
+    "luxon": "^3.0.3",
     "tracked-toolbox": "^1.2.3"
   },
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
     "@ember/test-helpers": "2.8.1",
     "@embroider/test-setup": "1.8.3",
-    "@faker-js/faker": "7.4.0",
-    "@projectcaluma/ember-testing": "11.0.0-beta.25",
+    "@faker-js/faker": "7.5.0",
+    "@projectcaluma/ember-testing": "11.0.0-beta.28",
     "broccoli-asset-rev": "3.0.0",
     "ember-cli": "3.28.5",
     "ember-cli-code-coverage": "1.0.3",
@@ -75,7 +75,7 @@
     "npm-run-all": "4.1.5",
     "qunit": "2.19.1",
     "qunit-dom": "2.0.0",
-    "sass": "1.54.5",
+    "sass": "1.54.9",
     "webpack": "5.74.0"
   },
   "engines": {

package/translations/de.yaml

@@ -61,6 +61,14 @@ caluma:
       create-draft: "Entwurf erstellen"
       error: "Fehler beim Erstellen der {count, plural, =1 {Anfragen} other {Anfrage}}"
 
+    reminder:
+      link: "Erinnerung versenden"
+      confirm: "Wollen Sie wirklich eine Erinnerung für diese Anfrage versenden?"
+      title: "Versendete Erinnerungen"
+      no-reminders: "Es wurden noch keine Erinnerungen für diese Anfrage versendet."
+      success: "Die Erinnerung wurde erfolgreich versendet"
+      error: "Fehler beim Versenden der Erinnerung"
+
     types:
       controlling: "Angefordert"
       addressed: "Zu beantworten"
@@ -85,3 +93,8 @@ caluma:
       confirm: "Wollen Sie die Anfrage wirklich zurückziehen?"
       error: "Fehler beim Zurückziehen der Anfrage"
       status: "Zurückgezogen"
+
+    reopen-inquiry:
+      link: "Wiedereröffnen"
+      confirm: "Wollen Sie die Anfrage wirklich wiedereröffnen?"
+      error: "Fehler beim Wiedereröffnen der Anfrage"

package/translations/en.yaml

@@ -62,6 +62,14 @@ caluma:
       create-draft: "Create draft"
       error: "Error while creating the {count, plural, =1 {inquiry} other {inquiries}}"
 
+    reminder:
+      link: "Send reminder"
+      confirm: "Do you really want to send a reminder for this inquiry?"
+      title: "Sent reminders"
+      no-reminders: "No reminders have been sent for this inquiry yet."
+      success: "The reminder has been sent successfully"
+      error: "Error while sending the reminder"
+
     types:
       controlling: "Requested"
       addressed: "To answer"
@@ -86,3 +94,8 @@ caluma:
       confirm: "Do you really want to withdraw the inquiry?"
       error: "Error while withdrawing the inquiry"
       status: "Withdrawn"
+
+    reopen-inquiry:
+      link: "Reopen"
+      confirm: "Do you really want to reopen the inquiry?"
+      error: "Error while reopening the inquiry"

package/translations/fr.yaml

@@ -61,6 +61,14 @@ caluma:
       create-draft: "Créer un brouillon"
       error: "Error lors de la création {count, plural, =1 {de la demande} other {des demandes}}"
 
+    reminder:
+      link: "Envoyer un rappel"
+      confirm: "Voulez-vous vraiment envoyer un rappel pour cette demande ?"
+      title: "Rappels envoyés"
+      no-reminders: Aucun rappel n'a encore été envoyé pour cette demande.
+      success: "Le rappel a été envoyé avec succès"
+      error: "Erreur lors de l'envoi du rappel"
+
     types:
       controlling: "Demandé"
       addressed: "A répondre"
@@ -85,3 +93,8 @@ caluma:
       confirm: "Voulez-vous vraiment retirer la demande ?"
       error: "Erreur lors du retrait de la demande"
       status: "Retirée"
+
+    reopen-inquiry:
+      link: "Rouvrir"
+      confirm: "Voulez-vous vraiment rouvrir la demande ?"
+      error: "Erreur lors de la réouverture de la demande"