@projectcaluma/ember-distribution 1.0.0-beta.3 → 1.0.0-beta.6

package/CHANGELOG.md

@@ -1,3 +1,40 @@
+# [@projectcaluma/ember-distribution-v1.0.0-beta.6](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-distribution-v1.0.0-beta.5...@projectcaluma/ember-distribution-v1.0.0-beta.6) (2022-03-24)
+
+
+### Bug Fixes
+
+* **embroider:** add missing dependency on @ember/string ([3a6e6bb](https://github.com/projectcaluma/ember-caluma/commit/3a6e6bb39a8c1a40a2ae00b3d4ea00606a755e25))
+
+
+### Features
+
+* **distribution:** add functionality to send all pending inquiries ([d769953](https://github.com/projectcaluma/ember-caluma/commit/d769953d5a0ea196943426c8499ba87b77a42e61))
+* **distribution:** add functionality to withdraw an inquiry ([c278895](https://github.com/projectcaluma/ember-caluma/commit/c2788957c0fb228c167ca9236fda4850717f5817))
+
+# [@projectcaluma/ember-distribution-v1.0.0-beta.5](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-distribution-v1.0.0-beta.4...@projectcaluma/ember-distribution-v1.0.0-beta.5) (2022-03-11)
+
+
+### Bug Fixes
+
+* **distribution:** fix sorting after group names in navigation ([2299d3b](https://github.com/projectcaluma/ember-caluma/commit/2299d3b0e265204ab6747dbdc6a8b64fc22f247f))
+* **distribution:** redirect to edit form after inquiry creation ([0a2c404](https://github.com/projectcaluma/ember-caluma/commit/0a2c40404fdb1258fb8d51a2809a03b335c7c78a))
+
+# [@projectcaluma/ember-distribution-v1.0.0-beta.4](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-distribution-v1.0.0-beta.3...@projectcaluma/ember-distribution-v1.0.0-beta.4) (2022-02-16)
+
+
+### Bug Fixes
+
+* **distribution:** show controls if no inquiries exist yet ([5c73b6d](https://github.com/projectcaluma/ember-caluma/commit/5c73b6d0a870fd0e34d96af3fa34095733fe9fd9))
+* **pikaday:** add pikaday modifier reexport in engines ([c13d302](https://github.com/projectcaluma/ember-caluma/commit/c13d3021bb8fe82e1245a60182af01287c507697))
+
+
+### Features
+
+* **distribution:** add config variable to stack the UI ([2ad285a](https://github.com/projectcaluma/ember-caluma/commit/2ad285a24bf5fb45d15fe237e3f420dd1f1d94f2))
+* **distribution:** add index page when no inquiries exist ([689089c](https://github.com/projectcaluma/ember-caluma/commit/689089c8f28146a33346f382fe69e7ca1b588d97))
+* **distribution:** add proper 404 handling ([73e62e6](https://github.com/projectcaluma/ember-caluma/commit/73e62e671a9425fc549d7057dd653d1dc59883aa))
+* **distribution:** remove distribution top level route ([6f396da](https://github.com/projectcaluma/ember-caluma/commit/6f396daf2881f07cdddaac6c7ca784db2b8777d3))
+
 # [@projectcaluma/ember-distribution-v1.0.0-beta.3](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-distribution-v1.0.0-beta.2...@projectcaluma/ember-distribution-v1.0.0-beta.3) (2022-02-07)
 
 

package/addon/abilities/distribution.js

@@ -0,0 +1,31 @@
+import { inject as service } from "@ember/service";
+import { Ability } from "ember-can";
+
+const hasStatus = (status) => (edge) => edge.node.status === status;
+
+export default class DistributionAbility extends Ability {
+  @service distribution;
+
+  get canSendInquiries() {
+    return (
+      this.distribution.controls.value?.send.edges.filter(
+        hasStatus("SUSPENDED")
+      ).length > 0
+    );
+  }
+
+  get canCreateInquiry() {
+    return (
+      this.distribution.controls.value?.create.edges.filter(hasStatus("READY"))
+        .length > 0
+    );
+  }
+
+  get canComplete() {
+    return (
+      this.distribution.controls.value?.complete.edges.filter(
+        hasStatus("READY")
+      ).length > 0
+    );
+  }
+}

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

@@ -1,17 +1,22 @@
 <div class="uk-text-center uk-margin-small-top">
-  {{#if this.canCreate}}
-    <IconButton @route="distribution.new" @icon="plus" />
+  {{#if (can "create inquiry of distribution")}}
+    <IconButton @route="new" @icon="plus" />
   {{/if}}
-  <IconButton
-    @icon="paper-plane-outline"
-    @fromSvgJar={{true}}
-    @gutterTop={{4}}
-    @gutterRight={{6}}
-    @gutterLeft={{4}}
-    @gutterBottom={{4}}
-    @onClick={{this.noop}}
-  />
-  {{#if this.canComplete}}
+  {{#if (can "send inquiries of distribution")}}
+    <IconButton
+      @title={{t "caluma.distribution.send"}}
+      @icon="paper-plane-outline"
+      @fromSvgJar={{true}}
+      @gutterTop={{4}}
+      @gutterRight={{6}}
+      @gutterLeft={{4}}
+      @gutterBottom={{4}}
+      @onClick={{perform this.sendInquiries}}
+      @loading={{this.sendInquiries.isRunning}}
+      data-test-send-pending-inquiries
+    />
+  {{/if}}
+  {{#if (can "complete distribution")}}
     <IconButton
       @icon="lock-closed-outline"
       @fromSvgJar={{true}}

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

@@ -3,43 +3,49 @@ import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
 import { dropTask } from "ember-concurrency";
-import { useTask } from "ember-resources";
+import { confirm } from "ember-uikit";
+import { gql } from "graphql-tag";
 
-import config from "@projectcaluma/ember-distribution/config";
-import controlWorkItemsQuery from "@projectcaluma/ember-distribution/gql/queries/control-work-items.graphql";
+import { decodeId } from "@projectcaluma/ember-core/helpers/decode-id";
 
 export default class DistributionNavigationControlsComponent extends Component {
-  @service calumaOptions;
+  @service distribution;
+  @service intl;
 
   @queryManager apollo;
 
-  @config config;
-
-  workItems = useTask(this, this.fetchWorkItems, () => []);
-
-  get canCreate() {
-    return this.workItems.value?.create.edges.length > 0;
-  }
-
-  get canComplete() {
-    return this.workItems.value?.complete.edges.length > 0;
-  }
-
   @action
   noop(e) {
     e.preventDefault();
   }
 
   @dropTask
-  *fetchWorkItems() {
-    return yield this.apollo.watchQuery({
-      query: controlWorkItemsQuery,
-      variables: {
-        caseId: this.args.caseId,
-        currentGroup: String(this.calumaOptions.currentGroupId),
-        createTask: this.config.controls.createTask,
-        completeTask: this.config.controls.completeTask,
-      },
-    });
+  *sendInquiries() {
+    if (!(yield confirm(this.intl.t("caluma.distribution.send-confirm")))) {
+      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}" }) {
+          workItem {
+            id
+            status
+          }
+        }
+      `
+      );
+
+      const mutation = gql`mutation SendInquiries {${mutations.join("\n")}}`;
+
+      yield this.apollo.mutate({ mutation });
+    } catch (e) {
+      this.notification.danger(this.intl.t("caluma.distribution.send-error"));
+    }
   }
 }

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

@@ -1,11 +1,11 @@
 <li class={{if this.isActive "uk-active"}}>
-  <LinkTo @route="distribution.inquiry" @model={{this.model}}>
+  <LinkTo @route="inquiry" @model={{this.model}}>
     <div class="uk-flex uk-flex-middle uk-width-1-1">
       <div class="uk-width-expand uk-text-truncate">
         {{#if (eq @type "addressed")}}
-          {{group-name @inquiry.controllingGroups}}
+          {{@inquiry.controllingGroupName}}
         {{else}}
-          {{group-name @inquiry.addressedGroups}}
+          {{@inquiry.addressedGroupName}}
         {{/if}}
       </div>
 

package/addon/components/distribution-navigation/item.js

@@ -12,6 +12,6 @@ export default class DistributionNavigationItemComponent extends Component {
   }
 
   get isActive() {
-    return this.router.isActive("distribution.inquiry", this.model);
+    return this.router.isActive("inquiry", this.model);
   }
 }

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

@@ -10,12 +10,14 @@
     {{/if}}
   </a>
 
-  {{#if (and @inquiries.length this.expanded)}}
-    <ul class="uk-tab uk-tab-left uk-margin-left">
-      {{#each this.inquiries as |inquiry|}}
-        <DistributionNavigation::Item @inquiry={{inquiry}} @type={{@type}} />
-      {{/each}}
-    </ul>
+  {{#if this.expanded}}
+    {{#if @inquiries.length}}
+      <ul class="uk-tab uk-tab-left uk-margin-left">
+        {{#each this.inquiries as |inquiry|}}
+          <DistributionNavigation::Item @inquiry={{inquiry}} @type={{@type}} />
+        {{/each}}
+      </ul>
+    {{/if}}
 
     {{#if (eq @type "controlling")}}
       <DistributionNavigation::Controls @caseId={{@caseId}} />

package/addon/components/distribution-navigation.hbs

@@ -1,5 +1,5 @@
 <aside>
-  <ul class="uk-tab uk-tab-left">
+  <ul class="uk-tab uk-tab-left uk-margin-remove-bottom">
     <DistributionNavigation::Section
       @type="controlling"
       @inquiries={{this.inquiries.controlling}}

package/addon/components/distribution-navigation.js

@@ -1,81 +1,53 @@
 import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
 import { queryManager } from "ember-apollo-client";
-import { restartableTask } from "ember-concurrency";
-import { useTask } from "ember-resources";
 
 import config from "@projectcaluma/ember-distribution/config";
-import inquiryNavigationQuery from "@projectcaluma/ember-distribution/gql/queries/inquiry-navigation.graphql";
 import uniqueByGroups from "@projectcaluma/ember-distribution/utils/unique-by-groups";
 
 export default class DistributionNavigationComponent extends Component {
-  @service calumaOptions;
   @service("-scheduler") scheduler;
+  @service calumaOptions;
+  @service distribution;
 
   @config config;
 
   @queryManager apollo;
 
-  @tracked groups = [];
-
   get inquiries() {
-    const findGroupName = (ids) =>
-      this.groups.find((g) =>
-        ids.includes(g[this.calumaOptions.groupIdentifierProperty])
-      )?.[this.calumaOptions.groupNameProperty];
+    const findGroupName = (identifiers) => {
+      const group = this.scheduler.groupCache.find((group) =>
+        identifiers
+          .map(String)
+          .includes(String(group[this.calumaOptions.groupIdentifierProperty]))
+      );
 
-    return Object.entries(this._inquiries.value || []).reduce(
+      return group?.[this.calumaOptions.groupNameProperty] ?? "";
+    };
+
+    return Object.entries(this.distribution.navigation.value ?? {}).reduce(
       (inquiries, [key, objects]) => {
         return {
           ...inquiries,
-          [key]: uniqueByGroups(
-            objects.edges.map((edge) => ({
-              ...edge.node,
-              addressedGroupName: findGroupName(edge.node.addressedGroups),
-              controllingGroupName: findGroupName(edge.node.controllingGroups),
-            }))
-          ),
+          // 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
+                  ),
+                }))
+              )
+            : [],
         };
       },
       {}
     );
   }
-
-  _inquiries = useTask(this, this.fetchInquiries, () => [
-    this.args.caseId,
-    this.config,
-  ]);
-
-  @restartableTask
-  *fetchInquiries() {
-    const response = yield this.apollo.watchQuery({
-      query: inquiryNavigationQuery,
-      variables: {
-        caseId: this.args.caseId,
-        task: this.config.inquiry.task,
-        currentGroup: String(this.calumaOptions.currentGroupId),
-        statusQuestion: this.config.inquiry.answer.statusQuestion,
-        deadlineQuestion: this.config.inquiry.deadlineQuestion,
-        includeNavigationData: true,
-      },
-    });
-
-    const groupIds = [
-      ...new Set(
-        Object.values(response)
-          .map((inquiries) => {
-            return inquiries.edges.map((edge) => [
-              ...edge.node.addressedGroups,
-              ...edge.node.controllingGroups,
-            ]);
-          })
-          .flat(2)
-      ),
-    ];
-
-    this.groups = yield this.scheduler.resolve(groupIds, "group");
-
-    return response;
-  }
 }

package/addon/components/icon-button.hbs

@@ -1,20 +1,27 @@
 {{#if @route}}
-  <LinkTo
-    @route={{@route}}
-    class={{this.class}}
-    uk-icon={{unless @fromSvgJar @icon}}
-    ...attributes
-  >
-    {{#if @fromSvgJar}}{{svg-jar @icon width="20" height="20"}}{{/if}}
+  <LinkTo @route={{@route}} class={{this.class}} title={{@title}} ...attributes>
+    {{#if @loading}}
+      <UkSpinner @ratio={{0.6}} />
+    {{else if @fromSvgJar}}
+      {{svg-jar @icon title=@title width="20" height="20"}}
+    {{else}}
+      <UkIcon @icon={{@icon}} />
+    {{/if}}
   </LinkTo>
 {{else}}
   <button
     type="button"
     class={{this.class}}
-    uk-icon={{unless @fromSvgJar @icon}}
+    title={{@title}}
     ...attributes
     {{on "click" @onClick}}
   >
-    {{#if @fromSvgJar}}{{svg-jar @icon width="20" height="20"}}{{/if}}
+    {{#if @loading}}
+      <UkSpinner @ratio={{0.6}} />
+    {{else if @fromSvgJar}}
+      {{svg-jar @icon title=@title width="20" height="20"}}
+    {{else}}
+      <UkIcon @icon={{@icon}} />
+    {{/if}}
   </button>
 {{/if}}

package/addon/components/inquiry-answer-form.hbs

@@ -2,45 +2,47 @@
   @documentId={{decode-id this.inquiry.childCase.document.id}}
   @disabled={{cannot "edit answer form of inquiry" this.inquiry}}
   @loading={{this._inquiry.isRunning}}
-  as |content|
 >
-  <h1 class="uk-flex uk-flex-middle">
-    {{t "caluma.distribution.answer.title"}}
-    {{#if (eq this.inquiry.status "RUNNING")}}
-      <UkLabel
-        class="uk-margin-left"
-        @label={{t "caluma.distribution.status.draft"}}
-      />
-    {{/if}}
-  </h1>
+  <:default as |content|>
+    <h1 class="uk-flex uk-flex-middle">
+      {{t "caluma.distribution.answer.title"}}
+      {{#if (eq this.inquiry.status "RUNNING")}}
+        <UkLabel
+          class="uk-margin-left"
+          @label={{t "caluma.distribution.status.draft"}}
+        />
+      {{/if}}
+    </h1>
 
-  <content.form />
+    <content.form />
 
-  {{#each this.buttons as |buttonConfig|}}
-    {{#if buttonConfig.isFormButton}}
-      <DocumentValidity @document={{content.document}} as |isValid validate|>
+    {{#each this.buttons as |buttonConfig|}}
+      {{#if buttonConfig.isFormButton}}
+        <DocumentValidity @document={{content.document}} as |isValid validate|>
+          <UkButton
+            @type="submit"
+            @color={{buttonConfig.color}}
+            @disabled={{or (not isValid) this.completeWorkItem.isRunning}}
+            @onClick={{fn
+              (perform this.completeWorkItem)
+              buttonConfig.workItemId
+              validate
+            }}
+          >{{buttonConfig.label}}</UkButton>
+        </DocumentValidity>
+      {{else}}
         <UkButton
-          @type="submit"
+          @type="button"
           @color={{buttonConfig.color}}
-          @disabled={{or (not isValid) this.completeWorkItem.isRunning}}
+          @disabled={{this.completeWorkItem.isRunning}}
           @onClick={{fn
             (perform this.completeWorkItem)
             buttonConfig.workItemId
-            validate
+            null
           }}
         >{{buttonConfig.label}}</UkButton>
-      </DocumentValidity>
-    {{else}}
-      <UkButton
-        @type="button"
-        @color={{buttonConfig.color}}
-        @disabled={{this.completeWorkItem.isRunning}}
-        @onClick={{fn
-          (perform this.completeWorkItem)
-          buttonConfig.workItemId
-          null
-        }}
-      >{{buttonConfig.label}}</UkButton>
-    {{/if}}
-  {{/each}}
+      {{/if}}
+    {{/each}}
+  </:default>
+  <:notfound><Notfound /></:notfound>
 </CfContent>

package/addon/components/inquiry-answer-form.js

@@ -65,7 +65,7 @@ export default class InquiryAnswerFormComponent extends Component {
         },
       });
 
-      yield this.router.transitionTo("distribution.inquiry.index");
+      yield this.router.transitionTo("inquiry.index");
     } catch (error) {
       this.notification.danger(
         this.intl.t("caluma.distribution.answer.complete-error")

package/addon/components/inquiry-dialog/inquiry-deadline.hbs

@@ -1,6 +1,27 @@
-<div
-  class="uk-position-top-right uk-margin-medium-top uk-margin-medium-right uk-flex-inline uk-flex-middle uk-text-{{this.deadline.color}}"
->
-  {{svg-jar "alarm-outline" height=26 class="uk-margin-small-right"}}
-  {{format-date this.deadline.value}}
-</div>
+{{#if this.deadline.value}}
+  <div
+    class="uk-position-top-right
+      {{if
+        this.config.ui.small
+        'uk-margin-top uk-margin-right'
+        'uk-margin-medium-top uk-margin-medium-right'
+      }}
+      {{if
+        this.isWithdrawn
+        'uk-text-muted'
+        (concat 'uk-text-' this.deadline.color)
+      }}
+      uk-flex-inline uk-flex-middle"
+  >
+    {{svg-jar
+      (if this.isWithdrawn "ban-outline" "alarm-outline")
+      height=26
+      class="uk-margin-small-right"
+    }}
+    {{#if this.isWithdrawn}}
+      {{t "caluma.distribution.withdraw.status"}}
+    {{else}}
+      {{format-date this.deadline.value}}
+    {{/if}}
+  </div>
+{{/if}}

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

@@ -7,4 +7,8 @@ export default class InquiryDialogInquiryDeadlineComponent extends Component {
   @config config;
 
   @inquiryDeadline deadline;
+
+  get isWithdrawn() {
+    return this.args.inquiry.status === "CANCELED";
+  }
 }

package/addon/components/inquiry-dialog/inquiry-divider.hbs

@@ -1,5 +1,6 @@
 <div
-  class="inquiry-divider uk-flex uk-flex-center uk-flex-middle uk-flex-between uk-margin uk-text-{{this.status.color}}"
+  class="inquiry-divider uk-flex uk-flex-center uk-flex-middle uk-flex-between uk-text-{{this.status.color}}
+    {{if this.config.ui.small 'inquiry-divider--small' 'uk-margin'}}"
 >
   <div class="inquiry-divider__icon uk-flex uk-flex-center uk-flex-middle">
     {{svg-jar this.status.icon title=this.status.label}}

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

@@ -8,7 +8,14 @@
   {{/if}}
 </p>
 
-<ul class="uk-subnav uk-subnav-divider uk-margin-small-top">
+<ul
+  class="uk-subnav uk-subnav-divider
+    {{if
+      this.config.ui.small
+      'uk-margin-remove-top uk-margin-small-bottom'
+      'uk-margin-small-top'
+    }}"
+>
   <li>
     <span>
       {{format-date this.date}}
@@ -17,24 +24,25 @@
   </li>
   {{#if (can "edit inquiry" @inquiry)}}
     <li>
-      <LinkTo
-        @route="distribution.inquiry.detail.index"
-        @model={{decode-id @inquiry.id}}
-      >
+      <LinkTo @route="inquiry.detail.index" @model={{decode-id @inquiry.id}}>
         {{t "caluma.distribution.edit.link"}}
       </LinkTo>
     </li>
+    <li>
+      <a href="" {{on "click" (perform this.withdraw)}} data-test-withdraw>
+        {{t "caluma.distribution.withdraw.link"}}
+      </a>
+    </li>
   {{/if}}
   {{#if (can "answer inquiry" @inquiry)}}
     <li>
-      <LinkTo
-        @route="distribution.inquiry.detail.answer"
-        @model={{decode-id @inquiry.id}}
-      >
+      <LinkTo @route="inquiry.detail.answer" @model={{decode-id @inquiry.id}}>
         {{t "caluma.distribution.answer.link"}}
       </LinkTo>
     </li>
   {{/if}}
 </ul>
 
-<p class="uk-margin-remove-bottom">{{this.info}}</p>
+{{#if this.info}}
+  <p class="uk-margin-remove">{{this.info}}</p>
+{{/if}}

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

@@ -1,6 +1,22 @@
+import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
+import { queryManager } from "ember-apollo-client";
+import { dropTask } from "ember-concurrency";
+import { confirm } from "ember-uikit";
+
+import { decodeId } from "@projectcaluma/ember-core/helpers/decode-id";
+import config from "@projectcaluma/ember-distribution/config";
+import withdrawInquiryMutation from "@projectcaluma/ember-distribution/gql/mutations/withdraw-inquiry.graphql";
 
 export default class InquiryDialogInquiryPartComponent extends Component {
+  @service notification;
+  @service router;
+  @service intl;
+
+  @queryManager apollo;
+
+  @config config;
+
   get date() {
     const key = this.args.type === "request" ? "createdAt" : "closedAt";
 
@@ -17,4 +33,27 @@ export default class InquiryDialogInquiryPartComponent extends Component {
 
     return document.info.edges[0]?.node.value;
   }
+
+  @dropTask
+  *withdraw(e) {
+    e.preventDefault();
+
+    /* istanbul ignore next */
+    if (!(yield confirm(this.intl.t("caluma.distribution.withdraw.confirm")))) {
+      return;
+    }
+
+    try {
+      yield this.apollo.mutate({
+        mutation: withdrawInquiryMutation,
+        variables: {
+          workItem: decodeId(this.args.inquiry.id),
+        },
+      });
+    } catch (error) {
+      this.notification.danger(
+        this.intl.t("caluma.distribution.withdraw.error")
+      );
+    }
+  }
 }

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

@@ -1,4 +1,7 @@
-<article class="uk-card uk-card-default uk-margin">
+<article
+  class="uk-card uk-card-default uk-margin
+    {{if this.config.ui.small 'uk-card-small'}}"
+>
   <div class="uk-card-body">
     <InquiryDialog::InquiryDeadline @inquiry={{@inquiry}} />
 

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

@@ -1,6 +1,10 @@
 import Component from "@glimmer/component";
 
+import config from "@projectcaluma/ember-distribution/config";
+
 export default class InquiryDialogInquiryComponent extends Component {
+  @config config;
+
   get hasAnswer() {
     return this.args.inquiry.status === "COMPLETED";
   }