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

package/addon/abilities/inquiry.js

@@ -4,101 +4,131 @@ import { DateTime } from "luxon";
 
 import config from "@projectcaluma/ember-distribution/config";
 
+/**
+ * This class contains all permission definitions for inquiries. To improve
+ * performance there are a few helpers and rules for optimal permission
+ * computation. The permissions need to be ordered by how expensive their
+ * computation is: the least expensive first and the most expensive last and so
+ * on:
+ *
+ * 1. Static config properties (e.g. `enableReminders`)
+ * 2. Base permission which checks for the correct task and the readonly config
+ * 3. Simple work item property checks (e.g. `isReady` or `isSuspended`)
+ * 4. Addressed / controlling group affiliation (e.g. `isAddressed` or `isControlling`)
+ * 5. All other computations (e.g. whether the deadline is overdue)
+ * 6. Custom permissions served by the host app (using `hasCustomPermission`)
+ */
 export default class InquiryAbility extends Ability {
   @service calumaOptions;
 
   @config config;
 
-  get canEdit() {
+  hasCustomPermission(permissionName, ...args) {
+    return this.config.permissions[permissionName]?.(...args) ?? true;
+  }
+
+  get hasBasePermission() {
     return (
       !this.config.ui.readonly &&
-      this.model?.task.slug === this.config.inquiry.task &&
-      ["SUSPENDED", "READY"].includes(this.model?.status) &&
-      this.model?.controllingGroups
-        .map(String)
-        .includes(String(this.calumaOptions.currentGroupId))
+      this.model?.task.slug === this.config.inquiry.task
+    );
+  }
+
+  get isReady() {
+    return this.model.status === "READY";
+  }
+
+  get isSuspended() {
+    return this.model.status === "SUSPENDED";
+  }
+
+  get isAddressed() {
+    return this.model.addressedGroups
+      .map(String)
+      .includes(String(this.calumaOptions.currentGroupId));
+  }
+
+  get isControlling() {
+    return this.model.controllingGroups
+      .map(String)
+      .includes(String(this.calumaOptions.currentGroupId));
+  }
+
+  get canEdit() {
+    return (
+      this.hasBasePermission &&
+      // Since editing in the status ready has the same character as sending an
+      // inquiry, we need to make sure that permission would be given
+      (this.isSuspended ||
+        (this.isReady &&
+          this.hasCustomPermission("sendInquiry", this.model))) &&
+      this.isControlling
     );
   }
 
   get canSend() {
     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))
+      this.hasBasePermission &&
+      this.isSuspended &&
+      this.isControlling &&
+      this.hasCustomPermission("sendInquiry", this.model)
     );
   }
 
   get canWithdraw() {
     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))
+      this.hasBasePermission &&
+      this.isSuspended &&
+      this.isControlling &&
+      this.hasCustomPermission("withdrawInquiry", this.model)
     );
   }
 
   get canAnswer() {
-    return (
-      !this.config.ui.readonly &&
-      this.model?.task.slug === this.config.inquiry.task &&
-      this.model?.status === "READY" &&
-      this.model?.addressedGroups
-        .map(String)
-        .includes(String(this.calumaOptions.currentGroupId))
-    );
+    return this.hasBasePermission && this.isReady && this.isAddressed;
   }
 
   get canEditAnswerForm() {
     return (
-      !this.config.ui.readonly &&
       this.canAnswer &&
-      this.model?.childCase.workItems.edges.some(
-        (edge) => edge.node.task.__typename === "CompleteWorkflowFormTask"
+      this.model.childCase.workItems.edges.some(
+        (edge) =>
+          edge.node.status === "READY" &&
+          edge.node.task.__typename === "CompleteWorkflowFormTask"
       )
     );
   }
 
   get canCompleteChildWorkItem() {
     return (
-      this.config.permissions.completeInquiryChildWorkItem?.(
+      this.hasBasePermission &&
+      this.hasCustomPermission(
+        "completeInquiryChildWorkItem",
         this.model,
         this.task
-      ) ?? true
+      )
     );
   }
 
   get canReopen() {
     return (
+      this.hasBasePermission &&
       this.model.isRedoable &&
-      this.model?.controllingGroups
-        .map(String)
-        .includes(String(this.calumaOptions.currentGroupId)) &&
-      (this.config.permissions.reopenInquiry?.(this.model) ?? true)
+      this.isControlling &&
+      this.hasCustomPermission("reopenInquiry", this.model)
     );
   }
 
   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)
+      this.hasBasePermission &&
+      this.isReady &&
+      this.isControlling &&
+      DateTime.fromISO(
+        this.model.document?.deadline.edges[0]?.node.value
+      ).diffNow("days").days <= 0 &&
+      this.hasCustomPermission("sendReminder", this.model)
     );
   }
 }

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

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,11 @@ 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": {

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

@@ -28,6 +28,7 @@ fragment InquiryAnswerButtons on Case {
         id
         status
         closedAt
+        closedByUser
         task {
           id
           slug
@@ -39,6 +40,7 @@ fragment InquiryAnswerButtons on Case {
 
 fragment InquiryAnswer on Document {
   ...InquiryAnswerStatus
+  modifiedContentAt
   info: answers(filter: [{ questions: $answerInfoQuestions }]) {
     edges {
       node {

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.33",
+  "version": "11.0.0-beta.35",
   "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.33",
-    "@projectcaluma/ember-form": "^11.0.0-beta.33",
-    "@projectcaluma/ember-workflow": "^11.0.0-beta.33",
+    "@projectcaluma/ember-core": "^11.0.0-beta.35",
+    "@projectcaluma/ember-form": "^11.0.0-beta.35",
+    "@projectcaluma/ember-workflow": "^11.0.0-beta.35",
     "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.33",
+    "@projectcaluma/ember-testing": "11.0.0-beta.35",
     "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

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

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

@@ -15,7 +15,7 @@ caluma:
       demandes ouvertes}} </b> sur la circulation actuelle. Si vous clôturez la
       circulation, toutes les demandes ouvertes seront annulées. Voulez-vous
       continuer ?"
-    complete-confirm-empty: "Vous voulez vraiment fermer la circulation ?"
+    complete-confirm-empty: "Vous voulez vraiment clore la circulation ?"
     skip-confirm: "Vous voulez vraiment sauter la circulation ?"
     reopen-confirm: "Vous voulez vraiment rouvrir la circulation ?"
     send-error: "Erreur lors de l'envoi des demandes ouvertes"
@@ -77,11 +77,11 @@ caluma:
       title: "Nouvelle demande"
       search: "Chercher..."
       suggestions: "Propositions"
-      empty: "Aucune services n'a été trouvée"
+      empty: "Aucune service n'a été trouvée"
       groups: "{count} {count, plural, =1 {service} other {services}}"
       selected: "{count, plural, =1 {sélectionné} other {sélectionnés}}"
       reset: "Réinitialiser"
-      create-draft: "Créer un brouillon"
+      create-draft: "Créer le brouillon"
       continue: "Continuer"
       back: "Retour"
       error: "Error lors de la création {count, plural, =1 {de la demande} other {des demandes}}"
@@ -90,7 +90,7 @@ caluma:
       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.
+      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"
 
@@ -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"