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

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

@@ -5,7 +5,7 @@
       ({{group-name @group}})
     {{/if}}
     {{#if @status}}
-      <UkLabel @label={{@status}} class="uk-margin-left uk-text-default" />
+      <UkLabel @label={{@status}} class="uk-margin-left" />
     {{/if}}
   </div>
   {{yield}}

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

@@ -7,10 +7,7 @@
       >
         {{group-name @inquiry.controllingGroups}}
         {{#if this.status}}
-          <UkLabel
-            @label={{this.status}}
-            class="uk-margin-left uk-text-default"
-          />
+          <UkLabel @label={{this.status}} class="uk-margin-left" />
         {{/if}}
       </div>
     {{else if (eq @type "answer")}}

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

@@ -84,6 +84,8 @@ export default class CdInquiryDialogComponent extends Component {
 
     yield this.distribution.createInquiry.perform([this.args.to]);
 
+    yield getObservable(this._inquiries.value).refetch();
+
     this.router.transitionTo(
       "inquiry.detail.index",
       {

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-distribution",
-  "version": "11.0.0-beta.34",
+  "version": "11.0.0-beta.36",
   "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.34",
-    "@projectcaluma/ember-form": "^11.0.0-beta.34",
-    "@projectcaluma/ember-workflow": "^11.0.0-beta.34",
+    "@projectcaluma/ember-core": "^11.0.0-beta.36",
+    "@projectcaluma/ember-form": "^11.0.0-beta.36",
+    "@projectcaluma/ember-workflow": "^11.0.0-beta.36",
     "ember-apollo-client": "~4.0.2",
     "ember-auto-import": "^2.4.3",
     "ember-can": "^4.2.0",
@@ -36,14 +36,14 @@
     "ember-fetch": "^8.1.2",
     "ember-flatpickr": "^3.2.3",
     "ember-intl": "^5.7.2",
-    "ember-resources": "^5.5.0",
+    "ember-resources": "^5.6.0",
     "ember-svg-jar": "^2.4.2",
     "ember-test-selectors": "^6.0.0",
-    "ember-uikit": "^6.1.0",
+    "ember-uikit": "^6.1.1",
     "graphql": "^15.8.0",
     "graphql-tag": "^2.12.6",
     "lodash.merge": "^4.6.2",
-    "luxon": "^3.0.4",
+    "luxon": "^3.1.0",
     "tracked-toolbox": "^1.2.3"
   },
   "devDependencies": {
@@ -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.34",
+    "@projectcaluma/ember-testing": "11.0.0-beta.36",
     "broccoli-asset-rev": "3.0.0",
     "ember-cli": "4.8.0",
     "ember-cli-code-coverage": "1.0.3",
@@ -66,7 +66,7 @@
     "ember-load-initializers": "2.1.2",
     "ember-qunit": "6.0.0",
     "ember-resolver": "8.0.3",
-    "ember-source": "4.8.0",
+    "ember-source": "4.8.1",
     "ember-source-channel-url": "3.0.0",
     "ember-try": "2.0.0",
     "loader.js": "4.7.0",

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"