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

package/addon/abilities/distribution.js

@@ -7,6 +7,7 @@ const hasStatus = (status) => (edge) => edge.node.status === status;
 
 export default class DistributionAbility extends Ability {
   @service distribution;
+  @service calumaOptions;
 
   @config config;
 
@@ -43,6 +44,9 @@ export default class DistributionAbility extends Ability {
     return (
       !this.config.ui.readonly &&
       (this.config.permissions.reopenDistribution?.() ?? true) &&
+      this.distribution.controls.value?.case.edges[0]?.node.parentWorkItem.addressedGroups
+        .map(String)
+        .includes(String(this.calumaOptions.currentGroupId)) &&
       this.distribution.controls.value?.case.edges[0]?.node.parentWorkItem
         .isRedoable
     );

package/addon/abilities/inquiry.js

@@ -61,7 +61,7 @@ export default class InquiryAbility extends Ability {
   get canReopen() {
     return (
       this.model.isRedoable &&
-      this.model?.addressedGroups
+      this.model?.controllingGroups
         .map(String)
         .includes(String(this.calumaOptions.currentGroupId)) &&
       (this.config.permissions.reopenInquiry?.(this.model) ?? true)

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

@@ -1,6 +1,9 @@
 <p class="uk-text-large uk-margin-remove uk-flex uk-flex-middle">
   <div class="uk-width-expand">
     {{@name}}
+    {{#if @group}}
+      ({{group-name @group}})
+    {{/if}}
     {{#if @status}}
       <UkLabel @label={{@status}} class="uk-margin-left" />
     {{/if}}

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

@@ -52,8 +52,6 @@ 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
@@ -70,39 +68,11 @@ 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-inquiry-edit-form.hbs

@@ -6,6 +6,7 @@
   <:default as |content|>
     <CdDocumentHeader
       @name={{content.document.rootForm.raw.name}}
+      @group={{this.inquiry.addressedGroups}}
       @status={{if
         (eq this.inquiry.status "SUSPENDED")
         (t "caluma.distribution.status.draft")
@@ -43,6 +44,14 @@
         >{{t "caluma.distribution.edit.send"}}</UkButton>
       </DocumentValidity>
     {{/if}}
+    {{#if (can "answer inquiry" this.inquiry)}}
+      <LinkTo
+        @route="inquiry.detail.answer"
+        class="uk-button uk-button-primary"
+      >
+        {{t "caluma.distribution.answer.link"}}
+      </LinkTo>
+    {{/if}}
   </:default>
   <:notfound><CdNotfound /></:notfound>
 </CfContent>

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

@@ -1,18 +1,8 @@
 <div class="uk-text-center uk-margin-small-top">
-  {{#if (can "create inquiry of distribution")}}
-    <LinkTo
-      @route="new"
-      class="uk-icon-button"
-      {{uk-tooltip (t "caluma.distribution.new.title")}}
-      data-test-new-inquiry
-    >
-      <UkIcon @icon="plus" />
-    </LinkTo>
-  {{/if}}
   {{#if (can "send inquiries of distribution")}}
     <button
       type="button"
-      class="uk-icon-button"
+      class="uk-icon-button uk-button-primary"
       {{uk-tooltip (t "caluma.distribution.send")}}
       data-test-send-pending-inquiries
       {{on "click" (perform this.sendInquiries)}}
@@ -24,18 +14,38 @@
       {{/if}}
     </button>
   {{/if}}
+  {{#if (can "create inquiry of distribution")}}
+    <LinkTo
+      @route="new"
+      class="uk-icon-button"
+      {{uk-tooltip (t "caluma.distribution.new.title")}}
+      data-test-new-inquiry
+    >
+      <UkIcon @icon="plus" />
+    </LinkTo>
+  {{/if}}
   {{#if (can "complete distribution")}}
     <button
       type="button"
       class="uk-icon-button"
-      {{uk-tooltip (t "caluma.distribution.complete")}}
+      {{uk-tooltip
+        (t
+          (if
+            this.hasInquiries
+            "caluma.distribution.complete"
+            "caluma.distribution.skip"
+          )
+        )
+      }}
       data-test-complete-distribution
       {{on "click" (perform this.completeDistribution)}}
     >
       {{#if this.completeDistribution.isRunning}}
         <UkSpinner @ratio={{0.6}} />
-      {{else}}
+      {{else if this.hasInquiries}}
         <UkIcon @icon="lock" />
+      {{else}}
+        <UkIcon @icon="forward" />
       {{/if}}
     </button>
   {{/if}}

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

@@ -20,26 +20,38 @@ export default class CdNavigationControlsComponent extends Component {
   @queryManager apollo;
   @config config;
 
+  get hasInquiries() {
+    return (
+      this.distribution.navigation.value?.addressed.edges.length > 0 ||
+      this.distribution.navigation.value?.controlling.edges.length > 0 ||
+      this.distribution.navigation.value?.more.edges.length > 0
+    );
+  }
+
   @dropTask
   *completeDistribution() {
     try {
-      const incompleteInquiries = yield this.apollo.query(
-        {
-          query: incompleteInquiriesQuery,
-          variables: {
-            caseId: this.distribution.caseId,
-            task: this.config.inquiry.task,
+      let confirmText = this.intl.t("caluma.distribution.skip-confirm");
+
+      if (this.hasInquiries) {
+        const incompleteInquiries = yield this.apollo.query(
+          {
+            query: incompleteInquiriesQuery,
+            variables: {
+              caseId: this.distribution.caseId,
+              task: this.config.inquiry.task,
+            },
           },
-        },
-        "allWorkItems.totalCount"
-      );
-
-      const confirmText =
-        incompleteInquiries === 0
-          ? this.intl.t("caluma.distribution.complete-confirm-empty")
-          : this.intl.t("caluma.distribution.complete-confirm", {
-              count: incompleteInquiries,
-            });
+          "allWorkItems.totalCount"
+        );
+
+        confirmText =
+          incompleteInquiries === 0
+            ? this.intl.t("caluma.distribution.complete-confirm-empty")
+            : this.intl.t("caluma.distribution.complete-confirm", {
+                count: incompleteInquiries,
+              });
+      }
 
       if (!(yield confirm(confirmText))) {
         return;

package/addon/components/cd-navigation/section.hbs

@@ -1,4 +1,6 @@
-<li class="uk-margin-small-bottom uk-width-auto">
+<li
+  class="uk-margin-small-bottom uk-width-auto {{if this.isActive 'uk-active'}}"
+>
   <a href="" {{on "click" this.toggle}}>
     <span class="uk-width-expand">
       {{t (concat "caluma.distribution.types." @type)}}

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

@@ -1,10 +1,24 @@
 import { action } from "@ember/object";
+import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 
 export default class CdNavigationSectionComponent extends Component {
+  @service router;
+
   @tracked expanded = true;
 
+  get isActive() {
+    return (
+      this.inquiries.find((inquiry) =>
+        this.router.isActive("inquiry", {
+          to: inquiry.addressedGroups[0],
+          from: inquiry.controllingGroups[0],
+        })
+      ) !== undefined
+    );
+  }
+
   @action
   toggle(e) {
     e.preventDefault();
@@ -18,8 +32,10 @@ export default class CdNavigationSectionComponent extends Component {
         ? "controllingGroupName"
         : "addressedGroupName";
 
-    return this.args.inquiries.sort((a, b) =>
-      a[sortProperty].localeCompare(b[sortProperty])
+    return (
+      this.args.inquiries?.sort((a, b) =>
+        a[sortProperty].localeCompare(b[sortProperty])
+      ) ?? []
     );
   }
 }

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

@@ -2,12 +2,15 @@
   <UkIcon
     @icon="clock"
     class="uk-margin-small-right uk-text-{{this.deadline.color}}"
-    {{uk-tooltip (format-date this.deadline.value)}}
+    {{uk-tooltip
+      (format-date this.deadline.value)
+      pos=(if this.config.ui.stack "left" "top")
+    }}
   />
 {{/if}}
 
 <UkIcon
   @icon={{this.status.icon}}
   class="uk-text-{{this.status.color}}"
-  {{uk-tooltip this.status.label}}
+  {{uk-tooltip this.status.label pos=(if this.config.ui.stack "left" "top")}}
 />

package/addon/gql/queries/control-work-items.graphql

@@ -57,6 +57,7 @@ query ControlWorkItems(
         parentWorkItem {
           id
           isRedoable
+          addressedGroups
         }
       }
     }

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

@@ -4,6 +4,7 @@ query InquiryEdit($inquiry: ID!) {
       node {
         id
         status
+        addressedGroups
         controllingGroups
         task {
           id

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-distribution",
-  "version": "11.0.0-beta.28",
+  "version": "11.0.0-beta.29",
   "description": "Ember engine for the Caluma distribution module.",
   "keywords": [
     "ember-addon",
@@ -18,13 +18,14 @@
     "ember-engines": ">= 0.8"
   },
   "dependencies": {
+    "@ember/legacy-built-in-components": "^0.4.1",
     "@ember/string": "^3.0.0",
     "@embroider/macros": "^1.8.3",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@projectcaluma/ember-core": "^11.0.0-beta.28",
-    "@projectcaluma/ember-form": "^11.0.0-beta.28",
-    "@projectcaluma/ember-workflow": "^11.0.0-beta.28",
+    "@projectcaluma/ember-core": "^11.0.0-beta.29",
+    "@projectcaluma/ember-form": "^11.0.0-beta.29",
+    "@projectcaluma/ember-workflow": "^11.0.0-beta.29",
     "ember-apollo-client": "~4.0.2",
     "ember-auto-import": "^2.4.2",
     "ember-can": "^4.2.0",
@@ -35,10 +36,10 @@
     "ember-fetch": "^8.1.2",
     "ember-intl": "^5.7.2",
     "ember-pikaday": "^4.0.0",
-    "ember-resources": "^5.3.2",
+    "ember-resources": "^5.4.0",
     "ember-svg-jar": "^2.3.4",
     "ember-test-selectors": "^6.0.0",
-    "ember-uikit": "^6.0.0",
+    "ember-uikit": "^6.1.0",
     "graphql": "^15.8.0",
     "graphql-tag": "^2.12.6",
     "lodash.merge": "^4.6.2",
@@ -47,12 +48,12 @@
   },
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
-    "@ember/test-helpers": "2.8.1",
+    "@ember/test-helpers": "2.7.0",
     "@embroider/test-setup": "1.8.3",
     "@faker-js/faker": "7.5.0",
-    "@projectcaluma/ember-testing": "11.0.0-beta.28",
+    "@projectcaluma/ember-testing": "11.0.0-beta.29",
     "broccoli-asset-rev": "3.0.0",
-    "ember-cli": "3.28.5",
+    "ember-cli": "4.7.0",
     "ember-cli-code-coverage": "1.0.3",
     "ember-cli-dependency-checker": "3.3.1",
     "ember-cli-inject-live-reload": "2.1.0",
@@ -62,12 +63,10 @@
     "ember-cli-terser": "4.0.2",
     "ember-disable-prototype-extensions": "1.1.3",
     "ember-engines": "0.8.23",
-    "ember-export-application-global": "2.0.1",
     "ember-load-initializers": "2.1.2",
-    "ember-maybe-import-regenerator": "1.0.0",
     "ember-qunit": "5.1.5",
     "ember-resolver": "8.0.3",
-    "ember-source": "3.28.9",
+    "ember-source": "4.7.0",
     "ember-source-channel-url": "3.0.0",
     "ember-try": "2.0.0",
     "loader.js": "4.7.0",
@@ -75,11 +74,11 @@
     "npm-run-all": "4.1.5",
     "qunit": "2.19.1",
     "qunit-dom": "2.0.0",
-    "sass": "1.54.9",
+    "sass": "1.55.0",
     "webpack": "5.74.0"
   },
   "engines": {
-    "node": "12.* || 14.* || >= 16"
+    "node": "14.* || >= 16"
   },
   "ember": {
     "edition": "octane"

package/translations/de.yaml

@@ -4,6 +4,7 @@ caluma:
     start: "Starten"
     send: "Offene Anfragen versenden"
     complete: "Zirkulation abschliessen"
+    skip: "Zirkulation überspringen"
     reopen: "Zirkulation wiedereröffnen"
     send-confirm: "Wollen Sie wirklich alle offenen Anfragen versenden?"
     complete-confirm:
@@ -11,9 +12,11 @@ caluma:
       in der aktuellen Zirkulation. Wenn Sie die Zirkulation abschliessen, werden
       alle verbleibenden offenen Anfragen abgebrochen. Möchten Sie fortfahren?"
     complete-confirm-empty: "Möchten Sie die Zirkulation wirklich abschliessen?"
+    skip-confirm: "Wollen Sie die Zirkulation wirklich überspringen?"
     reopen-confirm: "Wollen Sie die Zirkulation wirklich wiedereröffnen?"
     send-error: "Fehler beim Versenden der offenen Anfragen"
     complete-error: "Fehler beim Abschliessen der Zirkulation"
+    skip-error: "Fehler beim Überspringen der Zirkulation"
     reopen-error: "Fehler beim Wiedereröffnen der Zirkulation"
 
     more: "mehr"
@@ -27,7 +30,7 @@ caluma:
 
     edit:
       link: "Bearbeiten"
-      send: "Senden"
+      send: "Aktuelle Anfrage versenden"
       send-error: "Fehler beim Senden der Anfrage"
       send-not-allowed: "Sie sind nicht berechtigt diese Anfrage zu versenden."
 

package/translations/en.yaml

@@ -4,6 +4,7 @@ caluma:
     start: "Start"
     send: "Send pending inquiries"
     complete: "Complete circulation"
+    skip: "Skip circulation"
     send-confirm: "Do you really want to send all pending inquiries?"
     reopen: "Reopen circulation"
     complete-confirm:
@@ -12,9 +13,11 @@ caluma:
       distribution. Completing the distribution will cause all remaining
       pending inquiries to be canceled. Would you like to continue?"
     complete-confirm-empty: "Do you really want to complete the distribution?"
+    skip-confirm: "Do you really want to skip the distribution?"
     reopen-confirm: "Do you really want to reopen the distribution?"
     send-error: "Error while sending pending inquiries"
     complete-error: "Error while completing the distribution"
+    skip-error: "Error while skipping the distribution"
     reopen-error: "Error while reopening the distribution"
 
     more: "more"
@@ -28,7 +31,7 @@ caluma:
 
     edit:
       link: "Edit"
-      send: "Send"
+      send: "Send current inquiry"
       send-error: "Error while sending the inquiry"
       send-not-allowed: "You are not allowed to send this inquiry."
 

package/translations/fr.yaml

@@ -3,7 +3,8 @@ caluma:
     empty: "Aucune demande n'a encore été créée."
     start: "Lancer"
     send: "Envoyer les demandes ouvertes"
-    complete: "Terminer la circulation"
+    complete: "Clore la circulation"
+    skip: "Sauter la procédure de circulation"
     send-confirm: "Voulez-vous vraiment envoyer toutes les demandes ouvertes ?"
     reopen: "Rouvrir la procédure de circulation"
     complete-confirm:
@@ -11,9 +12,11 @@ caluma:
       attente</b> sur la distribution actuelle. Si vous terminez la distribution,
       toutes les demandes en attente seront annulées. Voulez-vous continuer ?"
     complete-confirm-empty: "Vous voulez vraiment fermer 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"
-    complete-error: "Erreur lors de la terminaison de la circulation"
+    complete-error: "Erreur lors de la clôture de la circulation"
+    skip-error: "Erreur lors du saut de la circulation"
     reopen-error: "Erreur lors de la réouverture de la circulation"
 
     more: "plus"
@@ -27,7 +30,7 @@ caluma:
 
     edit:
       link: "Modifier"
-      send: "Envoyer"
+      send: "Envoyer la demande actuelle"
       send-error: "Erreur lors de l'envoi de la demande"
       send-not-allowed: "Vous n'êtes pas autorisé à envoyer cette demande."