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

package/addon/components/cd-inquiry-new-form.js

@@ -1,114 +1,15 @@
 import { action } from "@ember/object";
-import { inject as service } from "@ember/service";
-import { macroCondition, isTesting } from "@embroider/macros";
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
-import { queryManager } from "ember-apollo-client";
-import { timeout, restartableTask, dropTask, task } from "ember-concurrency";
-import { trackedTask } from "ember-resources/util/ember-concurrency";
-
-import { decodeId } from "@projectcaluma/ember-core/helpers/decode-id";
-import config from "@projectcaluma/ember-distribution/config";
-
-const toggle = (value, array) => {
-  const set = new Set(array);
-
-  set.delete(value) || set.add(value);
-
-  return [...set];
-};
 
 export default class CdInquiryNewFormComponent extends Component {
-  @service calumaOptions;
-  @service notification;
-  @service intl;
-  @service router;
-  @service distribution;
-
-  @queryManager apollo;
-
-  @config config;
-
+  @tracked edit = false;
   @tracked selectedGroups = [];
 
-  groups = trackedTask(this, this.fetchGroups, () => [
-    this.args.selectedTypes,
-    this.args.search,
-  ]);
-
-  @action
-  updateSelectedTypes(type, e) {
-    e.preventDefault();
-
-    this.args.onChangeSelectedTypes(toggle(type, this.args.selectedTypes));
-  }
-
-  @action
-  updateSelectedGroups(identifier) {
-    this.selectedGroups = toggle(identifier, this.selectedGroups);
-  }
-
   @action
   clearSelectedGroups(e) {
     e.preventDefault();
 
     this.selectedGroups = [];
   }
-
-  @restartableTask
-  *updateSearch(e) {
-    e.preventDefault();
-
-    /* istanbul ignore next */
-    if (macroCondition(isTesting())) {
-      // no timeout
-    } else {
-      yield timeout(500);
-    }
-
-    this.args.onChangeSearch(e.target.value);
-  }
-
-  @dropTask
-  *submit(e) {
-    e.preventDefault();
-
-    if (!this.selectedGroups.length) return;
-
-    yield this.distribution.createInquiry.perform(this.selectedGroups);
-
-    const lastControlling =
-      this.distribution.navigation.value.controlling.edges[0].node;
-
-    // transition to last added inquiry
-    this.router.transitionTo(
-      "inquiry.detail.index",
-      {
-        from: lastControlling.controllingGroups[0],
-        to: lastControlling.addressedGroups[0],
-      },
-      decodeId(lastControlling.id)
-    );
-  }
-
-  @task
-  *fetchGroups(types, search) {
-    // https://github.com/ember-cli/eslint-plugin-ember/issues/1413
-    yield Promise.resolve();
-
-    const typedGroups = yield this.calumaOptions.fetchTypedGroups(
-      types,
-      search
-    );
-
-    return Object.entries(typedGroups)
-      .flatMap(([type, groups]) => {
-        return groups.map((group) => ({
-          identifier: group[this.calumaOptions.groupIdentifierProperty],
-          name: group[this.calumaOptions.groupNameProperty],
-          config: this.config.new.types[type],
-        }));
-      })
-      .sort((a, b) => a.name.localeCompare(b.name));
-  }
 }

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

@@ -1,57 +1,113 @@
-<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
+  (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 "send inquiries of distribution")}}
-    <button
-      type="button"
-      class="uk-icon-button"
-      {{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 "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>
+{{/if}}

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

@@ -23,23 +23,27 @@ export default class CdNavigationControlsComponent extends Component {
   @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.distribution.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;
@@ -92,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}" }) {
@@ -119,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,26 +1,22 @@
-<li class="uk-margin-small-bottom uk-width-auto">
-  <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 @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

@@ -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/components/cd-navigation.hbs

@@ -1,11 +1,13 @@
 <ul class="uk-tab uk-tab-left uk-margin-remove-bottom uk-width-auto">
-  <CdNavigation::Section
-    @type="controlling"
-    @inquiries={{this.inquiries.controlling}}
-  />
+  <CdNavigation::Controls />
+
   <CdNavigation::Section
     @type="addressed"
     @inquiries={{this.inquiries.addressed}}
   />
+  <CdNavigation::Section
+    @type="controlling"
+    @inquiries={{this.inquiries.controlling}}
+  />
   <CdNavigation::Section @type="more" @inquiries={{this.inquiries.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: {
@@ -59,6 +60,7 @@ export default function config(target, property) {
             },
           },
           new: {
+            defaultDeadlineLeadTime: 30,
             defaultTypes: ["suggestions"],
             types: {
               suggestions: {

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

@@ -2,6 +2,7 @@ query ControlWorkItems(
   $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 {
@@ -57,6 +74,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/addon/gql/queries/inquiry-form.graphql

@@ -0,0 +1,26 @@
+#import FieldQuestion, FieldTableQuestion, SimpleQuestion from '@projectcaluma/ember-form/gql/fragments/field.graphql'
+
+query InquiryForm($inquiryTask: String!) {
+  allTasks(filter: [{ slug: $inquiryTask }], first: 1) {
+    edges {
+      node {
+        id
+        ... on CompleteTaskFormTask {
+          form {
+            id
+            slug
+            name
+            meta
+            questions {
+              edges {
+                node {
+                  ...FieldQuestion
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

package/addon/services/distribution.js

@@ -25,6 +25,14 @@ export default class DistributionService extends Service {
     return getOwner(this).lookup("route:application").currentModel;
   }
 
+  get hasInquiries() {
+    return (
+      this.navigation.value?.addressed.edges.length > 0 ||
+      this.navigation.value?.controlling.edges.length > 0 ||
+      this.navigation.value?.more.edges.length > 0
+    );
+  }
+
   controls = trackedTask(this, this.fetchControls, () => [this.caseId]);
   navigation = trackedTask(this, this.fetchNavigation, () => [this.caseId]);
 
@@ -51,6 +59,7 @@ export default class DistributionService extends Service {
         createTask: this.config.controls.createTask,
         completeTask: this.config.controls.completeTask,
         inquiryTask: this.config.inquiry.task,
+        checkTask: this.config.controls.checkTask,
       },
     });
   }
@@ -93,7 +102,7 @@ export default class DistributionService extends Service {
   }
 
   @dropTask
-  *createInquiry(groups) {
+  *createInquiry(groups, context = {}) {
     try {
       // get create inquiry work item to complete
       const createId = decodeId(this.controls.value?.create.edges[0].node.id);
@@ -104,6 +113,7 @@ export default class DistributionService extends Service {
         variables: {
           id: createId,
           context: JSON.stringify({
+            ...context,
             addressed_groups: groups.map(String),
           }),
         },

package/addon/templates/application.hbs

@@ -8,11 +8,13 @@
   </div>
 {{else}}
   <div uk-grid class={{if this.config.ui.stack "uk-grid-small"}}>
-    <div class={{if this.config.ui.stack "uk-width-1-1" "uk-width-1-3"}}>
-      <CdNavigation @caseId={{@model}} />
-    </div>
-    {{#if this.config.ui.stack}}<div class="uk-width-1-1"><hr /></div>{{/if}}
-    <div class={{if this.config.ui.stack "uk-width-1-1" "uk-width-2-3"}}>
+    {{#if this.distribution.hasInquiries}}
+      <div class={{if this.config.ui.stack "uk-width-1-1" "uk-width-1-3"}}>
+        <CdNavigation @caseId={{@model}} />
+      </div>
+      {{#if this.config.ui.stack}}<div class="uk-width-1-1"><hr /></div>{{/if}}
+    {{/if}}
+    <div class="uk-width-expand">
       {{outlet}}
     </div>
   </div>