@projectcaluma/ember-distribution 11.0.0-beta.30 → 11.0.0-beta.32

package/addon/services/distribution.js

@@ -1,14 +1,17 @@
-import { getOwner } from "@ember/application";
 import Service, { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
 import { queryManager, getObservable } from "ember-apollo-client";
 import { dropTask } from "ember-concurrency";
 import { trackedTask } from "ember-resources/util/ember-concurrency";
+import { cached } from "tracked-toolbox";
 
 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 controlWorkItemsQuery from "@projectcaluma/ember-distribution/gql/queries/control-work-items.graphql";
-import inquiryNavigationQuery from "@projectcaluma/ember-distribution/gql/queries/inquiry-navigation.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";
 
 export default class DistributionService extends Service {
   @service("-scheduler") scheduler;
@@ -21,9 +24,7 @@ export default class DistributionService extends Service {
 
   @config config;
 
-  get caseId() {
-    return getOwner(this).lookup("route:application").currentModel;
-  }
+  @tracked caseId;
 
   get hasInquiries() {
     return (
@@ -52,7 +53,7 @@ export default class DistributionService extends Service {
   @dropTask
   *fetchControls(caseId) {
     return yield this.apollo.watchQuery({
-      query: controlWorkItemsQuery,
+      query: controlsQuery,
       variables: {
         caseId,
         currentGroup: String(this.calumaOptions.currentGroupId),
@@ -67,14 +68,13 @@ export default class DistributionService extends Service {
   @dropTask
   *fetchNavigation(caseId) {
     const response = yield this.apollo.watchQuery({
-      query: inquiryNavigationQuery,
+      query: navigationQuery,
       variables: {
         caseId,
         task: this.config.inquiry.task,
         currentGroup: String(this.calumaOptions.currentGroupId),
         statusQuestion: this.config.inquiry.answer.statusQuestion,
         deadlineQuestion: this.config.inquiry.deadlineQuestion,
-        includeNavigationData: true,
       },
     });
 
@@ -107,6 +107,22 @@ 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,
@@ -117,6 +133,7 @@ export default class DistributionService extends Service {
             addressed_groups: groups.map(String),
           }),
         },
+        refetchQueries,
       });
 
       // refetch navigation and controls data
@@ -127,4 +144,49 @@ export default class DistributionService extends Service {
       );
     }
   }
+
+  @cached
+  get inquiries() {
+    const findGroupName = (identifiers) => {
+      const group = this.scheduler.groupCache.find((group) =>
+        identifiers
+          .map(String)
+          .includes(String(group[this.calumaOptions.groupIdentifierProperty]))
+      );
+
+      return group?.[this.calumaOptions.groupNameProperty] ?? "";
+    };
+
+    return Object.entries(this.navigation.value ?? {}).reduce(
+      (inquiries, [key, objects]) => {
+        return {
+          ...inquiries,
+          // Don't return any data until the internal scheduler has cached
+          // groups since we don't want to render empty navigation items
+          [key]: this.scheduler.groupCache.length
+            ? uniqueByGroups(
+                objects.edges.map((edge) => ({
+                  ...edge.node,
+                  // Populate the work item with the names of the involved
+                  // groups so the <DistributionNavigation::Section /> component
+                  // can sort by them
+                  addressedGroupName: findGroupName(edge.node.addressedGroups),
+                  controllingGroupName: findGroupName(
+                    edge.node.controllingGroups
+                  ),
+                }))
+              ).sort((a, b) => {
+                const sortProperty =
+                  key === "addressed"
+                    ? "controllingGroupName"
+                    : "addressedGroupName";
+
+                return a[sortProperty].localeCompare(b[sortProperty]);
+              })
+            : [],
+        };
+      },
+      {}
+    );
+  }
 }

package/addon/templates/application.hbs

@@ -10,7 +10,7 @@
   <div uk-grid class={{if this.config.ui.stack "uk-grid-small"}}>
     {{#if this.distribution.hasInquiries}}
       <div class={{if this.config.ui.stack "uk-width-1-1" "uk-width-1-3"}}>
-        <CdNavigation @caseId={{@model}} />
+        <CdNavigation />
       </div>
       {{#if this.config.ui.stack}}<div class="uk-width-1-1"><hr /></div>{{/if}}
     {{/if}}

package/addon/templates/inquiry/index.hbs

@@ -1,5 +1 @@
-<CdInquiryDialog
-  @from={{@model.from}}
-  @to={{@model.to}}
-  @caseId={{@model.case}}
-/>
+<CdInquiryDialog @from={{@model.from}} @to={{@model.to}} />

package/addon/templates/new.hbs

@@ -1,7 +1,6 @@
 <CdInquiryNewForm
   @selectedTypes={{this.selectedTypes}}
   @search={{this.search}}
-  @caseId={{@model}}
   @onChangeSelectedTypes={{fn (mut this.selectedTypes)}}
   @onChangeSearch={{fn (mut this.search)}}
 />

package/addon/utils/inquiry-deadline.js

@@ -19,7 +19,9 @@ function decorator(
     get() {
       const inquiry = get(this, inquiryProperty);
       const value = inquiry.document?.deadline.edges[0]?.node.value;
-      const isDone = ["COMPLETED", "SKIPPED"].includes(inquiry.status);
+      const isDone = ["COMPLETED", "SKIPPED", "CANCELED"].includes(
+        inquiry.status
+      );
 
       const diff = DateTime.fromISO(value).diffNow("days").days;
 

package/app/styles/_answer-form.scss

@@ -2,3 +2,7 @@
   border-left: 5px solid $global-border;
   padding-left: $global-gutter - 5px;
 }
+
+.inquiry-answer-form__side-bar {
+  max-width: 25%;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-distribution",
-  "version": "11.0.0-beta.30",
+  "version": "11.0.0-beta.32",
   "description": "Ember engine for the Caluma distribution module.",
   "keywords": [
     "ember-addon",
@@ -10,7 +10,7 @@
   "homepage": "https://docs.caluma.io/ember-caluma",
   "repository": "github:projectcaluma/ember-caluma",
   "scripts": {
-    "test": "npm-run-all test:*",
+    "test": "npm-run-all --print-name \"lint\" \"test:*\"",
     "test:ember": "ember test",
     "test:ember-compatibility": "ember try:each"
   },
@@ -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.30",
-    "@projectcaluma/ember-form": "^11.0.0-beta.30",
-    "@projectcaluma/ember-workflow": "^11.0.0-beta.30",
+    "@projectcaluma/ember-core": "^11.0.0-beta.32",
+    "@projectcaluma/ember-form": "^11.0.0-beta.32",
+    "@projectcaluma/ember-workflow": "^11.0.0-beta.32",
     "ember-apollo-client": "~4.0.2",
     "ember-auto-import": "^2.4.3",
     "ember-can": "^4.2.0",
@@ -34,10 +34,10 @@
     "ember-concurrency": "^2.3.7",
     "ember-engines-router-service": "^0.3.0",
     "ember-fetch": "^8.1.2",
+    "ember-flatpickr": "^3.2.3",
     "ember-intl": "^5.7.2",
-    "ember-pikaday": "^4.0.0",
     "ember-resources": "^5.4.0",
-    "ember-svg-jar": "^2.4.0",
+    "ember-svg-jar": "^2.4.1",
     "ember-test-selectors": "^6.0.0",
     "ember-uikit": "^6.1.0",
     "graphql": "^15.8.0",
@@ -51,9 +51,9 @@
     "@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.30",
+    "@projectcaluma/ember-testing": "11.0.0-beta.32",
     "broccoli-asset-rev": "3.0.0",
-    "ember-cli": "4.7.0",
+    "ember-cli": "4.8.0",
     "ember-cli-code-coverage": "1.0.3",
     "ember-cli-dependency-checker": "3.3.1",
     "ember-cli-inject-live-reload": "2.1.0",
@@ -78,7 +78,7 @@
     "webpack": "5.74.0"
   },
   "engines": {
-    "node": "14.* || >= 16"
+    "node": "14.* || 16.* || >= 18"
   },
   "ember": {
     "edition": "octane"

package/translations/de.yaml

@@ -29,12 +29,17 @@ caluma:
     more: "mehr"
     less: "weniger"
 
-    last-modified: "Zuletzt bearbeitet von {user} am {date} um {time}"
     details: "Details"
     not-allowed-hint:
       "Sie können jedoch das Formular bearbeiten und die Eingabedaten werden
       automatisch gespeichert."
 
+    inquiry:
+      created-at: "Erstellt am"
+      closed-at: "Beantwortet am"
+      deadline: "Frist"
+      assigned-user: "Verantwortliche Person"
+
     edit:
       link: "Bearbeiten"
       send: "Aktuelle Anfrage versenden"
@@ -64,6 +69,10 @@ caluma:
         revise:
           label: "Überarbeiten"
 
+      details:
+        show: "Details anzeigen"
+        hide: "Details verstecken"
+
     new:
       title: "Neue Anfrage"
       search: "Suchen..."

package/translations/en.yaml

@@ -8,7 +8,7 @@ caluma:
     reopen: "Reopen circulation"
     check-inquiries: "Mark inquiries as checked"
     send-confirm:
-      "Do you really want to send <b>{other, plural, =1 {one pending inquiry}
+      "Do you really want to send <b>{count, plural, =1 {one pending inquiry}
       other {{count} pending inquiries}}</b>?"
     complete-confirm:
       "There {count, plural, =1 {is <b>one pending inquiry} other {are
@@ -29,12 +29,17 @@ caluma:
     more: "more"
     less: "less"
 
-    last-modified: "Last modified by {user} on {date} at {time}"
     details: "Details"
     not-allowed-hint:
       "However, you can edit the form and the input will be saved
       automatically."
 
+    inquiry:
+      created-at: "Created at"
+      closed-at: "Answered at"
+      deadline: "Deadline"
+      assigned-user: "Assigned user"
+
     edit:
       link: "Edit"
       send: "Send current inquiry"
@@ -64,6 +69,10 @@ caluma:
         revise:
           label: "Revise"
 
+      details:
+        show: "Show details"
+        hide: "Hide details"
+
     new:
       title: "New inquiry"
       search: "Search..."

package/translations/fr.yaml

@@ -29,12 +29,17 @@ caluma:
     more: "plus"
     less: "moins"
 
-    last-modified: "Dernière modification par {user} le {date} à {time}"
     details: "Détails"
     not-allowed-hint:
       "Vous pouvez toutefois modifier le formulaire et les données seront
       automatiquement enregistrées."
 
+    inquiry:
+      created-at: "Créé le"
+      closed-at: "Répondu le"
+      deadline: "Délai"
+      assigned-user: "Personne responsable"
+
     edit:
       link: "Modifier"
       send: "Envoyer la demande actuelle"
@@ -64,6 +69,10 @@ caluma:
         revise:
           label: "Réviser"
 
+      details:
+        show: "Afficher les détails"
+        hide: "Cacher les détails"
+
     new:
       title: "Nouvelle demande"
       search: "Chercher..."

package/addon/components/cd-navigation.js

@@ -1,53 +0,0 @@
-import { inject as service } from "@ember/service";
-import Component from "@glimmer/component";
-import { queryManager } from "ember-apollo-client";
-
-import config from "@projectcaluma/ember-distribution/config";
-import uniqueByGroups from "@projectcaluma/ember-distribution/utils/unique-by-groups";
-
-export default class CdNavigationComponent extends Component {
-  @service("-scheduler") scheduler;
-  @service calumaOptions;
-  @service distribution;
-
-  @config config;
-
-  @queryManager apollo;
-
-  get inquiries() {
-    const findGroupName = (identifiers) => {
-      const group = this.scheduler.groupCache.find((group) =>
-        identifiers
-          .map(String)
-          .includes(String(group[this.calumaOptions.groupIdentifierProperty]))
-      );
-
-      return group?.[this.calumaOptions.groupNameProperty] ?? "";
-    };
-
-    return Object.entries(this.distribution.navigation.value ?? {}).reduce(
-      (inquiries, [key, objects]) => {
-        return {
-          ...inquiries,
-          // Don't return any data until the internal scheduler has cached
-          // groups since we don't want to render empty navigation items
-          [key]: this.scheduler.groupCache.length
-            ? uniqueByGroups(
-                objects.edges.map((edge) => ({
-                  ...edge.node,
-                  // Populate the work item with the names of the involved
-                  // groups so the <DistributionNavigation::Section /> component
-                  // can sort by them
-                  addressedGroupName: findGroupName(edge.node.addressedGroups),
-                  controllingGroupName: findGroupName(
-                    edge.node.controllingGroups
-                  ),
-                }))
-              )
-            : [],
-        };
-      },
-      {}
-    );
-  }
-}

package/addon/gql/fragments/inquiry.graphql

@@ -1,117 +0,0 @@
-fragment InquiryAnswerButtons on Case {
-  workItems(filter: [{ tasks: $buttonTasks }, { status: READY }]) {
-    edges {
-      node {
-        id
-        status
-        task {
-          id
-          slug
-        }
-      }
-    }
-  }
-}
-
-fragment InquiryDeadlineDocument on Document {
-  id
-  deadline: answers(filter: [{ question: $deadlineQuestion }]) {
-    edges {
-      node {
-        id
-        ... on DateAnswer {
-          value
-        }
-      }
-    }
-  }
-}
-
-fragment InquiryStatusDocument on Document {
-  id
-  status: answers(filter: [{ question: $statusQuestion }]) {
-    edges {
-      node {
-        id
-        ... on StringAnswer {
-          value
-          selectedOption {
-            slug
-            label
-          }
-        }
-      }
-    }
-  }
-}
-
-fragment InquiryRequest on Document {
-  id
-  ...InquiryDeadlineDocument
-  info: answers(filter: [{ question: $infoQuestion }]) {
-    edges {
-      node {
-        id
-        ... on StringAnswer {
-          value
-        }
-      }
-    }
-  }
-}
-
-fragment InquiryDialog on WorkItem {
-  id
-  addressedGroups
-  controllingGroups
-  createdAt
-  closedAt
-  status
-  isRedoable
-  task {
-    id
-    slug
-  }
-  meta
-  document {
-    ...InquiryRequest
-  }
-  childCase {
-    id
-    ...InquiryAnswerButtons
-    document {
-      ...InquiryStatusDocument
-      info: answers(filter: [{ questions: $answerInfoQuestions }]) {
-        edges {
-          node {
-            id
-            question {
-              id
-              label
-              slug
-            }
-            ... on StringAnswer {
-              value
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-fragment Inquiry on WorkItem {
-  id
-  status
-  addressedGroups
-  controllingGroups
-  document @include(if: $includeNavigationData) {
-    ...InquiryDeadlineDocument
-  }
-  childCase @include(if: $includeNavigationData) {
-    id
-    document {
-      ...InquiryStatusDocument
-    }
-  }
-}

package/addon/modifiers/pikaday.js

@@ -1,2 +0,0 @@
-import "ember-pikaday/pikaday.css";
-export { default } from "ember-pikaday/modifiers/pikaday";