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

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

@@ -1,67 +1,113 @@
-<div class="uk-text-center uk-margin-small-top">
-  {{#if (can "send inquiries of distribution")}}
-    <button
-      type="button"
-      class="uk-icon-button uk-button-primary"
-      {{uk-tooltip (t "caluma.distribution.send")}}
-      data-test-send-pending-inquiries
-      {{on "click" (perform this.sendInquiries)}}
-    >
-      {{#if this.sendInquiries.isRunning}}
-        <UkSpinner @ratio={{0.6}} />
-      {{else}}
-        <UkIcon @icon="comment" />
-      {{/if}}
-    </button>
+{{#if
+  (or
+    (can "send inquiries of distribution")
+    (can "create inquiry of distribution")
+    (can "complete distribution")
+    (can "reopen distribution")
+  )
+}}
+  {{#if @useButtons}}
+    {{#if (can "create inquiry of distribution")}}
+      <LinkTo
+        @route="new"
+        class="uk-button uk-button-primary"
+        data-test-new-inquiry
+      >
+        {{t "caluma.distribution.start"}}
+      </LinkTo>
+    {{/if}}
+    {{#if (can "complete distribution")}}
+      <UkButton
+        @onClick={{perform this.completeDistribution}}
+        @label={{t "caluma.distribution.skip"}}
+        @loading={{this.completeDistribution.isRunning}}
+        @disabled={{this.completeDistribution.isRunning}}
+        data-test-complete-distribution
+      />
+    {{/if}}
+    {{#if (can "reopen distribution")}}
+      <UkButton
+        @onClick={{perform this.reopenDistribution}}
+        @label={{t "caluma.distribution.reopen"}}
+        @loading={{this.reopenDistribution.isRunning}}
+        @disabled={{this.reopenDistribution.isRunning}}
+        data-test-reopen-distribution
+      />
+    {{/if}}
+  {{else}}
+    <li class="uk-margin-small">
+      <div class="uk-text-center">
+        {{#if (can "send inquiries of distribution")}}
+          <button
+            type="button"
+            class="uk-icon-button uk-button-primary"
+            {{uk-tooltip (t "caluma.distribution.send")}}
+            data-test-send-pending-inquiries
+            {{on "click" (perform this.sendInquiries)}}
+          >
+            {{#if this.sendInquiries.isRunning}}
+              <UkSpinner @ratio={{0.6}} />
+            {{else}}
+              <UkIcon @icon="comment" />
+            {{/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 "check inquiries of distribution")}}
+          <button
+            type="button"
+            class="uk-icon-button"
+            {{uk-tooltip (t "caluma.distribution.check-inquiries")}}
+            data-test-check-inquiries
+            {{on "click" (perform this.checkInquiries)}}
+          >
+            {{#if this.checkInquiries.isRunning}}
+              <UkSpinner @ratio={{0.6}} />
+            {{else}}
+              <UkIcon @icon="check" />
+            {{/if}}
+          </button>
+        {{/if}}
+        {{#if (can "complete distribution")}}
+          <button
+            type="button"
+            class="uk-icon-button"
+            {{uk-tooltip (t "caluma.distribution.complete")}}
+            data-test-complete-distribution
+            {{on "click" (perform this.completeDistribution)}}
+          >
+            {{#if this.completeDistribution.isRunning}}
+              <UkSpinner @ratio={{0.6}} />
+            {{else}}
+              <UkIcon @icon="lock" />
+            {{/if}}
+          </button>
+        {{/if}}
+        {{#if (can "reopen distribution")}}
+          <button
+            type="button"
+            class="uk-icon-button"
+            {{uk-tooltip (t "caluma.distribution.reopen")}}
+            data-test-reopen-distribution
+            {{on "click" (perform this.reopenDistribution)}}
+          >
+            {{#if this.reopenDistribution.isRunning}}
+              <UkSpinner @ratio={{0.6}} />
+            {{else}}
+              <UkIcon @icon="refresh" />
+            {{/if}}
+          </button>
+        {{/if}}
+      </div>
+    </li>
   {{/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
-          (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 if this.hasInquiries}}
-        <UkIcon @icon="lock" />
-      {{else}}
-        <UkIcon @icon="forward" />
-      {{/if}}
-    </button>
-  {{/if}}
-  {{#if (can "reopen distribution")}}
-    <button
-      type="button"
-      class="uk-icon-button"
-      {{uk-tooltip (t "caluma.distribution.reopen")}}
-      data-test-reopen-distribution
-      {{on "click" (perform this.reopenDistribution)}}
-    >
-      {{#if this.reopenDistribution.isRunning}}
-        <UkSpinner @ratio={{0.6}} />
-      {{else}}
-        <UkIcon @icon="refresh" />
-      {{/if}}
-    </button>
-  {{/if}}
-</div>
+{{/if}}

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

@@ -20,20 +20,12 @@ 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 {
       let confirmText = this.intl.t("caluma.distribution.skip-confirm");
 
-      if (this.hasInquiries) {
+      if (this.distribution.hasInquiries) {
         const incompleteInquiries = yield this.apollo.query(
           {
             query: incompleteInquiriesQuery,
@@ -104,15 +96,20 @@ export default class CdNavigationControlsComponent extends Component {
 
   @dropTask
   *sendInquiries() {
-    if (!(yield confirm(this.intl.t("caluma.distribution.send-confirm")))) {
+    const ids = this.distribution.controls.value.send.edges
+      .filter((edge) => edge.node.status === "SUSPENDED")
+      .map((edge) => decodeId(edge.node.id));
+
+    if (
+      ids.length &&
+      !(yield confirm(
+        this.intl.t("caluma.distribution.send-confirm", { count: ids.length })
+      ))
+    ) {
       return;
     }
 
     try {
-      const ids = this.distribution.controls.value.send.edges.map((edge) =>
-        decodeId(edge.node.id)
-      );
-
       const mutations = ids.map(
         (id, index) => `
         sendInquiry${index}: resumeWorkItem(input: { id: "${id}" }) {
@@ -131,4 +128,22 @@ export default class CdNavigationControlsComponent extends Component {
       this.notification.danger(this.intl.t("caluma.distribution.send-error"));
     }
   }
+
+  @dropTask
+  *checkInquiries() {
+    try {
+      yield this.apollo.mutate({
+        mutation: completeWorkItemMutation,
+        variables: {
+          workItem: decodeId(
+            this.distribution.controls.value?.check.edges[0]?.node.id
+          ),
+        },
+      });
+    } catch (e) {
+      this.notification.danger(
+        this.intl.t("caluma.distribution.check-inquiries-error")
+      );
+    }
+  }
 }

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

@@ -1,17 +1,28 @@
 <li class="uk-width-auto {{if this.isActive 'uk-active'}}">
   <LinkTo @route="inquiry" @model={{this.model}}>
-    {{#let
-      (if
-        (eq @type "addressed")
-        @inquiry.controllingGroupName
-        @inquiry.addressedGroupName
-      )
-      as |name|
-    }}
-      <span class="uk-width-expand uk-text-truncate" title={{name}}>
-        {{name}}
+    {{#if (eq @type "addressed")}}
+      <span
+        class="uk-width-expand uk-text-truncate"
+        title={{t
+          "caluma.distribution.attention-to"
+          subject=@inquiry.controllingGroupName
+          abbr=false
+        }}
+      >
+        {{t
+          "caluma.distribution.attention-to"
+          subject=@inquiry.controllingGroupName
+          abbr=true
+        }}
       </span>
-    {{/let}}
+    {{else}}
+      <span
+        class="uk-width-expand uk-text-truncate"
+        title={{@inquiry.addressedGroupName}}
+      >
+        {{@inquiry.addressedGroupName}}
+      </span>
+    {{/if}}
 
     <CdNavigation::StatusIndicator @inquiry={{@inquiry}} @type={{@type}} />
   </LinkTo>

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

@@ -1,28 +1,22 @@
-<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)}}
-    </span>
-    {{#if this.expanded}}
-      <UkIcon @icon="chevron-down" />
-    {{else}}
-      <UkIcon @icon="chevron-right" />
-    {{/if}}
-  </a>
+{{#if this.inquiries.length}}
+  <li class="uk-margin-small 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)}}
+      </span>
+      {{#if this.expanded}}
+        <UkIcon @icon="chevron-down" />
+      {{else}}
+        <UkIcon @icon="chevron-right" />
+      {{/if}}
+    </a>
 
-  {{#if this.expanded}}
-    {{#if @inquiries.length}}
+    {{#if this.expanded}}
       <ul class="uk-tab uk-tab-left uk-margin-left uk-width-auto">
         {{#each this.inquiries as |inquiry|}}
           <CdNavigation::Item @inquiry={{inquiry}} @type={{@type}} />
         {{/each}}
       </ul>
     {{/if}}
-
-    {{#if (eq @type "controlling")}}
-      <CdNavigation::Controls />
-    {{/if}}
-  {{/if}}
-</li>
+  </li>
+{{/if}}

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

@@ -4,6 +4,7 @@ import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 
 export default class CdNavigationSectionComponent extends Component {
+  @service distribution;
   @service router;
 
   @tracked expanded = true;
@@ -19,23 +20,14 @@ export default class CdNavigationSectionComponent extends Component {
     );
   }
 
+  get inquiries() {
+    return this.distribution.inquiries?.[this.args.type] ?? [];
+  }
+
   @action
   toggle(e) {
     e.preventDefault();
 
     this.expanded = !this.expanded;
   }
-
-  get inquiries() {
-    const sortProperty =
-      this.args.type === "addressed"
-        ? "controllingGroupName"
-        : "addressedGroupName";
-
-    return (
-      this.args.inquiries?.sort((a, b) =>
-        a[sortProperty].localeCompare(b[sortProperty])
-      ) ?? []
-    );
-  }
 }

package/addon/components/cd-navigation.hbs

@@ -1,11 +1,6 @@
 <ul class="uk-tab uk-tab-left uk-margin-remove-bottom uk-width-auto">
-  <CdNavigation::Section
-    @type="controlling"
-    @inquiries={{this.inquiries.controlling}}
-  />
-  <CdNavigation::Section
-    @type="addressed"
-    @inquiries={{this.inquiries.addressed}}
-  />
-  <CdNavigation::Section @type="more" @inquiries={{this.inquiries.more}} />
+  <CdNavigation::Controls />
+  <CdNavigation::Section @type="addressed" />
+  <CdNavigation::Section @type="controlling" />
+  <CdNavigation::Section @type="more" />
 </ul>

package/addon/config.js

@@ -20,6 +20,7 @@ export default function config(target, property) {
           controls: {
             createTask: "create-inquiry",
             completeTask: "complete-distribution",
+            checkTask: "check-inquiries",
           },
           warningPeriod: 3,
           inquiry: {
@@ -56,9 +57,27 @@ export default function config(target, property) {
                   status: "caluma.distribution.answer.buttons.adjust.status",
                 },
               },
+              details: (inquiry) => [
+                {
+                  label: "caluma.distribution.inquiry.created-at",
+                  value: inquiry.createdAt,
+                  type: "date",
+                },
+                {
+                  label: "caluma.distribution.inquiry.assigned-user",
+                  value: inquiry.assignedUsers,
+                  type: "user",
+                },
+                {
+                  label: "caluma.distribution.inquiry.closed-at",
+                  value: inquiry.closedAt,
+                  type: "date",
+                },
+              ],
             },
           },
           new: {
+            defaultDeadlineLeadTime: 30,
             defaultTypes: ["suggestions"],
             types: {
               suggestions: {

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

@@ -0,0 +1,57 @@
+fragment InquiryAnswerStatus on Document {
+  status: answers(filter: [{ question: $statusQuestion }]) {
+    edges {
+      node {
+        id
+        ... on StringAnswer {
+          value
+          selectedOption {
+            slug
+            label
+          }
+        }
+      }
+    }
+  }
+}
+
+fragment InquiryAnswerButtons on Case {
+  workItems(
+    filter: [
+      { tasks: $buttonTasks }
+      { status: CANCELED, invert: true }
+      { status: SKIPPED, invert: true }
+    ]
+  ) {
+    edges {
+      node {
+        id
+        status
+        closedAt
+        task {
+          id
+          slug
+        }
+      }
+    }
+  }
+}
+
+fragment InquiryAnswer on Document {
+  ...InquiryAnswerStatus
+  info: answers(filter: [{ questions: $answerInfoQuestions }]) {
+    edges {
+      node {
+        id
+        question {
+          id
+          label
+          slug
+        }
+        ... on StringAnswer {
+          value
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,26 @@
+fragment InquiryRequestDeadline on Document {
+  deadline: answers(filter: [{ question: $deadlineQuestion }]) {
+    edges {
+      node {
+        id
+        ... on DateAnswer {
+          value
+        }
+      }
+    }
+  }
+}
+
+fragment InquiryRequest on Document {
+  ...InquiryRequestDeadline
+  info: answers(filter: [{ question: $infoQuestion }]) {
+    edges {
+      node {
+        id
+        ... on StringAnswer {
+          value
+        }
+      }
+    }
+  }
+}

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

@@ -1,9 +1,12 @@
-#import InquiryStatusDocument from '../fragments/inquiry.graphql'
+# import InquiryAnswer, InquiryAnswerButtons, InquiryAnswerStatus from '../fragments/inquiry-answer.graphql'
 
 mutation CompleteInquiryWorkItem(
   $workItem: ID!
   $statusQuestion: ID!
   $buttonTasks: [String]!
+  $checkTask: ID!
+  $currentGroup: String!
+  $answerInfoQuestions: [ID]!
 ) {
   completeWorkItem(input: { id: $workItem }) {
     workItem {
@@ -13,23 +16,31 @@ mutation CompleteInquiryWorkItem(
         id
         document {
           id
-          ...InquiryStatusDocument
-        }
-        workItems(filter: [{ tasks: $buttonTasks }, { status: READY }]) {
-          edges {
-            node {
-              id
-              task {
-                id
-                slug
-              }
-            }
-          }
+          ...InquiryAnswer
         }
+        ...InquiryAnswerButtons
         parentWorkItem {
           id
           status
           isRedoable
+          # This is needed to remove the check inquiries button if that work
+          # item is closed automatically after completing an inquiry.
+          case {
+            id
+            workItems(
+              filter: [
+                { task: $checkTask }
+                { addressedGroups: [$currentGroup] }
+              ]
+            ) {
+              edges {
+                node {
+                  id
+                  status
+                }
+              }
+            }
+          }
         }
       }
     }

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

@@ -1,4 +1,4 @@
-#import InquiryStatusDocument from '../fragments/inquiry.graphql'
+# import InquiryAnswerButtons, InquiryAnswerStatus from '../fragments/inquiry-answer.graphql'
 
 mutation ReopenInquiry(
   $workItem: ID!
@@ -14,19 +14,9 @@ mutation ReopenInquiry(
         id
         document {
           id
-          ...InquiryStatusDocument
-        }
-        workItems(filter: [{ tasks: $buttonTasks }, { status: READY }]) {
-          edges {
-            node {
-              id
-              task {
-                id
-                slug
-              }
-            }
-          }
+          ...InquiryAnswerStatus
         }
+        ...InquiryAnswerButtons
       }
     }
   }

package/addon/gql/queries/{control-work-items.graphql → controls.graphql}

@@ -1,7 +1,8 @@
-query ControlWorkItems(
+query Controls(
   $createTask: ID!
   $completeTask: ID!
   $inquiryTask: ID!
+  $checkTask: ID!
   $caseId: ID!
   $currentGroup: String!
 ) {
@@ -50,6 +51,22 @@ query ControlWorkItems(
       }
     }
   }
+  check: allWorkItems(
+    filter: [
+      { case: $caseId }
+      { task: $checkTask }
+      { status: READY }
+      { hasDeadline: true }
+      { addressedGroups: [$currentGroup] }
+    ]
+  ) {
+    edges {
+      node {
+        id
+        status
+      }
+    }
+  }
   case: allCases(filter: [{ id: $caseId }]) {
     edges {
       node {

package/addon/gql/queries/incomplete-inquiries.graphql

@@ -1,4 +1,4 @@
-query InquiryIncomplete($caseId: ID!, $task: ID!) {
+query IncompleteInquiries($caseId: ID!, $task: ID!) {
   allWorkItems(
     filter: [
       { case: $caseId }

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

@@ -1,4 +1,5 @@
-#import InquiryAnswerButtons, InquiryDeadlineDocument, InquiryRequest from '../fragments/inquiry.graphql'
+# import InquiryAnswerButtons from '../fragments/inquiry-answer.graphql'
+# import InquiryRequest, InquiryRequestDeadline from '../fragments/inquiry-request.graphql'
 
 query InquiryAnswer(
   $inquiry: ID!
@@ -13,6 +14,8 @@ query InquiryAnswer(
         status
         addressedGroups
         controllingGroups
+        assignedUsers
+        closedByUser
         createdAt
         closedAt
         task {
@@ -20,6 +23,7 @@ query InquiryAnswer(
           slug
         }
         document {
+          id
           ...InquiryRequest
         }
         childCase {