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

package/addon/components/{distribution-navigation → cd-navigation}/controls.hbs

@@ -1,9 +1,13 @@
 <div class="uk-text-center uk-margin-small-top">
   {{#if (can "create inquiry of distribution")}}
-    <IconButton @route="new" @icon="plus" />
+    <CdIconButton
+      @title={{t "caluma.distribution.new.title"}}
+      @icon="plus"
+      @route="new"
+    />
   {{/if}}
   {{#if (can "send inquiries of distribution")}}
-    <IconButton
+    <CdIconButton
       @title={{t "caluma.distribution.send"}}
       @icon="paper-plane-outline"
       @fromSvgJar={{true}}
@@ -17,10 +21,12 @@
     />
   {{/if}}
   {{#if (can "complete distribution")}}
-    <IconButton
+    <CdIconButton
       @icon="lock-closed-outline"
       @fromSvgJar={{true}}
-      @onClick={{this.noop}}
+      @onClick={{perform this.completeDistribution}}
+      @loading={{this.completeDistribution.isRunning}}
+      data-test-complete-distribution
     />
   {{/if}}
 </div>

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

@@ -0,0 +1,95 @@
+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 { gql } from "graphql-tag";
+
+import { decodeId } from "@projectcaluma/ember-core/helpers/decode-id";
+import config from "@projectcaluma/ember-distribution/config";
+import completeWorkItemMutation from "@projectcaluma/ember-distribution/gql/mutations/complete-work-item.graphql";
+import incompleteInquiriesQuery from "@projectcaluma/ember-distribution/gql/queries/incomplete-inquiries.graphql";
+
+export default class CdNavigationControlsComponent extends Component {
+  @service distribution;
+  @service intl;
+  @service notification;
+  @service router;
+
+  @queryManager apollo;
+  @config config;
+
+  @dropTask
+  *completeDistribution() {
+    try {
+      const incompleteInquiries = yield this.apollo.query(
+        {
+          query: incompleteInquiriesQuery,
+          variables: {
+            caseId: this.args.caseId,
+            task: this.config.inquiry.task,
+          },
+        },
+        "allWorkItems.totalCount"
+      );
+
+      if (
+        incompleteInquiries > 0 &&
+        !(yield confirm(
+          this.intl.t("caluma.distribution.complete-confirm", {
+            count: incompleteInquiries,
+          })
+        ))
+      ) {
+        return;
+      }
+
+      const completeDistributionWorkItem =
+        this.distribution.controls.value.complete.edges?.[0]?.node.id;
+
+      yield this.apollo.mutate({
+        mutation: completeWorkItemMutation,
+        variables: {
+          workItem: completeDistributionWorkItem,
+        },
+      });
+
+      yield this.distribution.refetch();
+      this.router.transitionTo("index");
+    } catch (e) {
+      this.notification.danger(
+        this.intl.t("caluma.distribution.complete-error")
+      );
+    }
+  }
+
+  @dropTask
+  *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 → cd-navigation}/item.hbs

@@ -9,10 +9,7 @@
         {{/if}}
       </div>
 
-      <DistributionNavigation::StatusIndicator
-        @inquiry={{@inquiry}}
-        @type={{@type}}
-      />
+      <CdNavigation::StatusIndicator @inquiry={{@inquiry}} @type={{@type}} />
     </div>
   </LinkTo>
 </li>

package/addon/components/{distribution-navigation → cd-navigation}/item.js

@@ -1,7 +1,7 @@
 import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
 
-export default class DistributionNavigationItemComponent extends Component {
+export default class CdNavigationItemComponent extends Component {
   @service router;
 
   get model() {

package/addon/components/{distribution-navigation → cd-navigation}/section.hbs

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

package/addon/components/{distribution-navigation → cd-navigation}/section.js

@@ -2,7 +2,7 @@ import { action } from "@ember/object";
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 
-export default class DistributionNavigationSectionComponent extends Component {
+export default class CdNavigationSectionComponent extends Component {
   @tracked expanded = true;
 
   @action

package/addon/components/{distribution-navigation → cd-navigation}/status-indicator.hbs

@@ -1,10 +1,11 @@
 {{#if this.showDeadlineIndicator}}
   <div
-    class="deadline-indicator uk-flex-uk-flex-middle uk-flex-center uk-margin-small-left uk-text-{{this.deadline.color}}"
+    class="deadline-indicator uk-flex uk-flex-middle uk-flex-center uk-margin-small-left uk-text-{{this.deadline.color}}"
   >
     {{svg-jar
       "notifications-outline"
       height=16
+      width=16
       title=(format-date this.deadline.value)
     }}
   </div>

package/addon/components/{distribution-navigation → cd-navigation}/status-indicator.js

@@ -5,7 +5,7 @@ import config from "@projectcaluma/ember-distribution/config";
 import inquiryDeadline from "@projectcaluma/ember-distribution/utils/inquiry-deadline";
 import inquiryStatus from "@projectcaluma/ember-distribution/utils/inquiry-status";
 
-export default class DistributionNavigationStatusIndicatorComponent extends Component {
+export default class CdNavigationStatusIndicatorComponent extends Component {
   @service intl;
 
   @config config;

package/addon/components/{distribution-navigation.hbs → cd-navigation.hbs}

@@ -1,17 +1,14 @@
 <aside>
   <ul class="uk-tab uk-tab-left uk-margin-remove-bottom">
-    <DistributionNavigation::Section
+    <CdNavigation::Section
       @type="controlling"
       @inquiries={{this.inquiries.controlling}}
       @caseId={{@caseId}}
     />
-    <DistributionNavigation::Section
+    <CdNavigation::Section
       @type="addressed"
       @inquiries={{this.inquiries.addressed}}
     />
-    <DistributionNavigation::Section
-      @type="more"
-      @inquiries={{this.inquiries.more}}
-    />
+    <CdNavigation::Section @type="more" @inquiries={{this.inquiries.more}} />
   </ul>
 </aside>

package/addon/components/{distribution-navigation.js → cd-navigation.js}

@@ -5,7 +5,7 @@ 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 DistributionNavigationComponent extends Component {
+export default class CdNavigationComponent extends Component {
   @service("-scheduler") scheduler;
   @service calumaOptions;
   @service distribution;

package/addon/components/cd-truncated.hbs

@@ -0,0 +1,8 @@
+<p class="cd-truncated" ...attributes>
+  {{~this.displayedText~}}
+  {{#if this.truncate}}
+    <a href="" {{on "click" this.toggleExpand}}>
+      {{~t (concat "caluma.distribution." (if this.expand "less" "more"))~}}
+    </a>
+  {{/if}}
+</p>

package/addon/components/cd-truncated.js

@@ -0,0 +1,32 @@
+import { action } from "@ember/object";
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+
+export default class CdTruncatedComponent extends Component {
+  @tracked expand = false;
+
+  get length() {
+    return parseInt(this.args.length);
+  }
+
+  get displayedText() {
+    if (this.truncate && !this.expand) {
+      // strip input string to the passed length minus 3 to make sure the output
+      // including the 3 dots doesn't exceed the expected length
+      return `${this.args.text.substring(0, this.length - 3).trim()}...`;
+    }
+
+    return this.args.text;
+  }
+
+  get truncate() {
+    return this.args.text.length > this.length;
+  }
+
+  @action
+  toggleExpand(e) {
+    e.preventDefault();
+
+    this.expand = !this.expand;
+  }
+}

package/addon/config.js

@@ -27,7 +27,7 @@ export default function config(target, property) {
             infoQuestion: "inquiry-remark",
             answer: {
               statusQuestion: "inquiry-answer-status",
-              infoQuestion: "inquiry-answer-reason",
+              infoQuestions: ["inquiry-answer-reason"],
               statusMapping: {
                 "inquiry-answer-status-positive": INQUIRY_STATUS.POSITIVE,
                 "inquiry-answer-status-negative": INQUIRY_STATUS.NEGATIVE,

package/addon/controllers/application.js

@@ -1,7 +1,10 @@
 import Controller from "@ember/controller";
+import { inject as service } from "@ember/service";
 
 import config from "@projectcaluma/ember-distribution/config";
 
 export default class ApplicationController extends Controller {
   @config config;
+
+  @service distribution;
 }

package/addon/controllers/new.js

@@ -13,7 +13,7 @@ export default class NewController extends Controller {
 
   @cached
   get selectedTypes() {
-    return this.types.split(",");
+    return this.types.split(",").filter(Boolean);
   }
 
   set selectedTypes(value) {

package/addon/engine.js

@@ -11,7 +11,13 @@ export default class DistributionEngine extends Engine {
   Resolver = Resolver;
 
   dependencies = {
-    services: ["apollo", "notification", "intl", "caluma-options"],
+    services: [
+      "apollo",
+      "notification",
+      "intl",
+      "caluma-options",
+      "store", // this is just in case that a custom form widget uses the store
+    ],
   };
 }
 

package/addon/gql/fragments/inquiry.graphql

@@ -30,6 +30,21 @@ fragment InquiryStatusDocument on Document {
   }
 }
 
+fragment InquiryRequest on Document {
+  id
+  ...InquiryDeadlineDocument
+  info: answers(question: $infoQuestion) {
+    edges {
+      node {
+        id
+        ... on StringAnswer {
+          value
+        }
+      }
+    }
+  }
+}
+
 fragment InquiryDialog on WorkItem {
   id
   addressedGroups
@@ -42,26 +57,20 @@ fragment InquiryDialog on WorkItem {
     slug
   }
   document {
-    ...InquiryDeadlineDocument
-    info: answers(question: $infoQuestion) {
-      edges {
-        node {
-          id
-          ... on StringAnswer {
-            value
-          }
-        }
-      }
-    }
+    ...InquiryRequest
   }
   childCase {
     id
     document {
       ...InquiryStatusDocument
-      info: answers(question: $answerInfoQuestion) {
+      info: answers(questions: $answerInfoQuestions) {
         edges {
           node {
             id
+            question {
+              id
+              label
+            }
             ... on StringAnswer {
               value
             }

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

@@ -0,0 +1,8 @@
+mutation CompleteWorkItem($workItem: ID!) {
+  completeWorkItem(input: { id: $workItem }) {
+    workItem {
+      id
+      status
+    }
+  }
+}

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

@@ -0,0 +1,13 @@
+query InquiryIncomplete($caseId: ID!, $task: ID!) {
+  allWorkItems(
+    filter: [
+      { case: $caseId }
+      { task: $task }
+      { status: CANCELED, invert: true }
+      { status: COMPLETED, invert: true }
+      { status: SKIPPED, invert: true }
+    ]
+  ) {
+    totalCount
+  }
+}

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

@@ -1,19 +1,33 @@
-query InquiryAnswer($inquiry: ID!, $buttonTasks: [String]!) {
+#import InquiryDeadlineDocument, InquiryRequest from '../fragments/inquiry.graphql'
+
+query InquiryAnswer(
+  $inquiry: ID!
+  $buttonTasks: [String]!
+  $infoQuestion: ID!
+  $deadlineQuestion: ID!
+) {
   allWorkItems(filter: [{ id: $inquiry }]) {
     edges {
       node {
         id
         status
         addressedGroups
+        controllingGroups
+        createdAt
         task {
           id
           slug
         }
+        document {
+          ...InquiryRequest
+        }
         childCase {
           id
           status
           document {
             id
+            modifiedContentAt
+            modifiedContentByUser
           }
           workItems(tasks: $buttonTasks, status: READY) {
             edges {

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

@@ -1,11 +1,11 @@
-#import InquiryDialog, InquiryDeadlineDocument, InquiryStatusDocument from '../fragments/inquiry.graphql'
+#import InquiryDialog, InquiryDeadlineDocument, InquiryStatusDocument, InquiryRequest from '../fragments/inquiry.graphql'
 
 query InquiryDialog(
   $task: ID!
   $statusQuestion: ID!
   $deadlineQuestion: ID!
   $infoQuestion: ID!
-  $answerInfoQuestion: ID!
+  $answerInfoQuestions: [ID]!
   $from: [String]!
   $to: [String]!
   $caseId: ID!

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

@@ -11,6 +11,8 @@ query InquiryEdit($inquiry: ID!) {
         }
         document {
           id
+          modifiedContentAt
+          modifiedContentByUser
         }
       }
     }

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

@@ -45,7 +45,8 @@ query InquiryNavigation(
       { task: $task }
       { controllingGroups: [$currentGroup], invert: true }
       { addressedGroups: [$currentGroup], invert: true }
-      { status: COMPLETED }
+      { status: SUSPENDED, invert: true }
+      { status: CANCELED, invert: true }
     ]
     order: [{ attribute: CREATED_AT, direction: DESC }]
   ) {

package/addon/services/distribution.js

@@ -2,9 +2,11 @@ import { getOwner } from "@ember/application";
 import Service, { inject as service } from "@ember/service";
 import { queryManager, getObservable } from "ember-apollo-client";
 import { dropTask } from "ember-concurrency";
-import { useTask } from "ember-resources";
+import { trackedTask } from "ember-resources/util/ember-concurrency";
 
+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";
 
@@ -12,6 +14,8 @@ export default class DistributionService extends Service {
   @service("-scheduler") scheduler;
   @service calumaOptions;
   @service router;
+  @service intl;
+  @service notification;
 
   @queryManager apollo;
 
@@ -21,8 +25,8 @@ export default class DistributionService extends Service {
     return getOwner(this).lookup("route:application").currentModel;
   }
 
-  controls = useTask(this, this.fetchControls, () => [this.caseId]);
-  navigation = useTask(this, this.fetchNavigation, () => [this.caseId]);
+  controls = trackedTask(this, this.fetchControls, () => [this.caseId]);
+  navigation = trackedTask(this, this.fetchNavigation, () => [this.caseId]);
 
   async refetch() {
     await getObservable(this.controls.value)?.refetch();
@@ -79,4 +83,30 @@ export default class DistributionService extends Service {
 
     return response;
   }
+
+  @dropTask
+  *createInquiry(groups) {
+    try {
+      // get create inquiry work item to complete
+      const createId = decodeId(this.controls.value?.create.edges[0].node.id);
+
+      // create new inquiries
+      yield this.apollo.mutate({
+        mutation: createInquiryMutation,
+        variables: {
+          id: createId,
+          context: JSON.stringify({
+            addressed_groups: groups.map(String),
+          }),
+        },
+      });
+
+      // refetch navigation and controls data
+      yield this.refetch();
+    } catch (e) {
+      this.notification.danger(
+        this.intl.t("caluma.distribution.new.error", { count: groups.length })
+      );
+    }
+  }
 }

package/addon/templates/application.hbs

@@ -1,8 +1,18 @@
-<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"}}>
-    <DistributionNavigation @caseId={{@model}} />
+{{#if
+  (or
+    this.distribution.navigation.isRunning this.distribution.controls.isRunning
+  )
+}}
+  <div class="uk-text-center">
+    <UkSpinner @ratio={{2}} />
   </div>
-  <div class={{if this.config.ui.stack "uk-width-1-1" "uk-width-2-3"}}>
-    {{outlet}}
+{{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>
+    <div class={{if this.config.ui.stack "uk-width-1-1" "uk-width-2-3"}}>
+      {{outlet}}
+    </div>
   </div>
-</div>
+{{/if}}

package/addon/templates/inquiry/detail/answer.hbs

@@ -1 +1 @@
-<InquiryAnswerForm @inquiry={{@model}} />
+<CdInquiryAnswerForm @inquiry={{@model}} />

package/addon/templates/inquiry/detail/index.hbs

@@ -1 +1 @@
-<InquiryEditForm @inquiry={{@model}} />
+<CdInquiryEditForm @inquiry={{@model}} />

package/addon/templates/inquiry/index.hbs

@@ -1,4 +1,4 @@
-<InquiryDialog
+<CdInquiryDialog
   @from={{@model.from}}
   @to={{@model.to}}
   @caseId={{@model.case}}

package/addon/templates/new.hbs

@@ -1,4 +1,4 @@
-<InquiryNewForm
+<CdInquiryNewForm
   @selectedTypes={{this.selectedTypes}}
   @search={{this.search}}
   @caseId={{@model}}

package/addon/templates/notfound.hbs

@@ -1 +1 @@
-<Notfound />
+<CdNotfound />

package/addon/utils/inquiry-deadline.js

@@ -21,12 +21,10 @@ function decorator(
       const value = inquiry.document?.deadline.edges[0]?.node.value;
       const isAnswered = inquiry.status === "COMPLETED";
 
-      const deadline = DateTime.fromISO(value).startOf("day");
-      const now = DateTime.now().startOf("day");
+      const { days: diff } = DateTime.fromISO(value).diffNow("days").toObject();
 
-      const isOverdue = !isAnswered && now > deadline;
-      const isWarning =
-        !isAnswered && now.plus({ days: this.config.warningPeriod }) > deadline;
+      const isOverdue = !isAnswered && diff <= 0;
+      const isWarning = !isAnswered && diff <= this.config.warningPeriod;
 
       return {
         value,

package/app/components/cd-document-header.js

@@ -0,0 +1 @@
+export { default } from "@projectcaluma/ember-distribution/components/cd-document-header";

package/app/components/{inquiry-dialog.js → cd-icon-button.js}

@@ -1 +1 @@
-export { default } from "@projectcaluma/ember-distribution/components/inquiry-dialog";
+export { default } from "@projectcaluma/ember-distribution/components/cd-icon-button";

package/app/components/{inquiry-dialog/inquiry.js → cd-inquiry-answer-form.js}

@@ -1 +1 @@
-export { default } from "@projectcaluma/ember-distribution/components/inquiry-dialog/inquiry";
+export { default } from "@projectcaluma/ember-distribution/components/cd-inquiry-answer-form";

package/app/components/{inquiry-dialog → cd-inquiry-dialog}/inquiry-deadline.js

@@ -1 +1 @@
-export { default } from "@projectcaluma/ember-distribution/components/inquiry-dialog/inquiry-deadline";
+export { default } from "@projectcaluma/ember-distribution/components/cd-inquiry-dialog/inquiry-deadline";

package/app/components/{inquiry-dialog → cd-inquiry-dialog}/inquiry-divider.js

@@ -1 +1 @@
-export { default } from "@projectcaluma/ember-distribution/components/inquiry-dialog/inquiry-divider";
+export { default } from "@projectcaluma/ember-distribution/components/cd-inquiry-dialog/inquiry-divider";

package/app/components/{inquiry-dialog → cd-inquiry-dialog}/inquiry-part.js

@@ -1 +1 @@
-export { default } from "@projectcaluma/ember-distribution/components/inquiry-dialog/inquiry-part";
+export { default } from "@projectcaluma/ember-distribution/components/cd-inquiry-dialog/inquiry-part";

package/app/components/{distribution-navigation.js → cd-inquiry-dialog/inquiry.js}

@@ -1 +1 @@
-export { default } from "@projectcaluma/ember-distribution/components/distribution-navigation";
+export { default } from "@projectcaluma/ember-distribution/components/cd-inquiry-dialog/inquiry";

package/app/components/{inquiry-edit-form.js → cd-inquiry-dialog.js}

@@ -1 +1 @@
-export { default } from "@projectcaluma/ember-distribution/components/inquiry-edit-form";
+export { default } from "@projectcaluma/ember-distribution/components/cd-inquiry-dialog";

package/app/components/cd-inquiry-edit-form.js

@@ -0,0 +1 @@
+export { default } from "@projectcaluma/ember-distribution/components/cd-inquiry-edit-form";

package/app/components/{inquiry-answer-form.js → cd-inquiry-new-form.js}

@@ -1 +1 @@
-export { default } from "@projectcaluma/ember-distribution/components/inquiry-answer-form";
+export { default } from "@projectcaluma/ember-distribution/components/cd-inquiry-new-form";

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

@@ -0,0 +1 @@
+export { default } from "@projectcaluma/ember-distribution/components/cd-navigation/controls";