@projectcaluma/ember-distribution 1.0.0-beta.8 → 11.0.0-beta.25

package/addon/config.js

@@ -4,6 +4,7 @@ import { cached } from "tracked-toolbox";
 
 export const INQUIRY_STATUS = {
   DRAFT: "draft",
+  SKIPPED: "skipped",
   SENT: "sent",
   POSITIVE: "positive",
   NEGATIVE: "negative",
@@ -15,7 +16,7 @@ export default function config(target, property) {
     get() {
       return merge(
         {
-          ui: { stack: false, small: false },
+          ui: { stack: false, small: false, readonly: false },
           controls: {
             createTask: "create-inquiry",
             completeTask: "complete-distribution",
@@ -27,7 +28,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,
@@ -37,20 +38,22 @@ export default function config(target, property) {
               buttons: {
                 "compose-inquiry-answer": {
                   color: "primary",
-                  label: "caluma.distribution.answer.release-for-review",
+                  label: "caluma.distribution.answer.buttons.compose.label",
+                  status: "caluma.distribution.answer.buttons.compose.status",
                 },
                 "confirm-inquiry-answer": {
                   color: "primary",
-                  label: "caluma.distribution.answer.confirm",
+                  label: "caluma.distribution.answer.buttons.confirm.label",
+                  status: "caluma.distribution.answer.buttons.confirm.status",
                 },
                 "revise-inquiry-answer": {
                   color: "default",
-                  label: "caluma.distribution.answer.revise",
+                  label: "caluma.distribution.answer.buttons.revise.label",
                 },
                 "adjust-inquiry-answer": {
                   color: "primary",
-                  label:
-                    "caluma.distribution.answer.release-adjustment-for-review",
+                  label: "caluma.distribution.answer.buttons.adjust.label",
+                  status: "caluma.distribution.answer.buttons.adjust.status",
                 },
               },
             },
@@ -60,11 +63,12 @@ export default function config(target, property) {
             types: {
               suggestions: {
                 label: "caluma.distribution.new.suggestions",
-                icon: "bulb-outline",
+                icon: "star",
                 iconColor: "warning",
               },
             },
           },
+          permissions: {},
         },
         getOwner(this).lookup("service:calumaOptions")?.distribution ?? {}
       );

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

@@ -16,7 +16,9 @@ export default class DistributionEngine extends Engine {
       "notification",
       "intl",
       "caluma-options",
-      "store", // this is just in case that a custom form widget uses the store
+      // this is just in case that a custom form widget uses the store or fetch service
+      "store",
+      "fetch",
     ],
   };
 }

package/addon/gql/fragments/inquiry.graphql

@@ -1,6 +1,21 @@
+fragment InquiryAnswerButtons on Case {
+  workItems(filter: [{ tasks: $buttonTasks }, { status: READY }]) {
+    edges {
+      node {
+        id
+        status
+        task {
+          id
+          slug
+        }
+      }
+    }
+  }
+}
+
 fragment InquiryDeadlineDocument on Document {
   id
-  deadline: answers(question: $deadlineQuestion) {
+  deadline: answers(filter: [{ question: $deadlineQuestion }]) {
     edges {
       node {
         id
@@ -14,7 +29,7 @@ fragment InquiryDeadlineDocument on Document {
 
 fragment InquiryStatusDocument on Document {
   id
-  status: answers(question: $statusQuestion) {
+  status: answers(filter: [{ question: $statusQuestion }]) {
     edges {
       node {
         id
@@ -30,6 +45,21 @@ fragment InquiryStatusDocument on Document {
   }
 }
 
+fragment InquiryRequest on Document {
+  id
+  ...InquiryDeadlineDocument
+  info: answers(filter: [{ question: $infoQuestion }]) {
+    edges {
+      node {
+        id
+        ... on StringAnswer {
+          value
+        }
+      }
+    }
+  }
+}
+
 fragment InquiryDialog on WorkItem {
   id
   addressedGroups
@@ -42,26 +72,22 @@ fragment InquiryDialog on WorkItem {
     slug
   }
   document {
-    ...InquiryDeadlineDocument
-    info: answers(question: $infoQuestion) {
-      edges {
-        node {
-          id
-          ... on StringAnswer {
-            value
-          }
-        }
-      }
-    }
+    ...InquiryRequest
   }
   childCase {
     id
+    ...InquiryAnswerButtons
     document {
       ...InquiryStatusDocument
-      info: answers(question: $answerInfoQuestion) {
+      info: answers(filter: [{ questions: $answerInfoQuestions }]) {
         edges {
           node {
             id
+            question {
+              id
+              label
+              slug
+            }
             ... on StringAnswer {
               value
             }

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

@@ -15,7 +15,7 @@ mutation CompleteInquiryWorkItem(
           id
           ...InquiryStatusDocument
         }
-        workItems(tasks: $buttonTasks, status: READY) {
+        workItems(filter: [{ tasks: $buttonTasks }, { status: READY }]) {
           edges {
             node {
               id

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

@@ -0,0 +1,8 @@
+mutation RedoWorkItem($workItem: ID!) {
+  redoWorkItem(input: { id: $workItem }) {
+    workItem {
+      id
+      isRedoable
+    }
+  }
+}

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

@@ -50,4 +50,15 @@ query ControlWorkItems(
       }
     }
   }
+  case: allCases(filter: [{ id: $caseId }]) {
+    edges {
+      node {
+        id
+        parentWorkItem {
+          id
+          isRedoable
+        }
+      }
+    }
+  }
 }

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

@@ -1,31 +1,36 @@
-query InquiryAnswer($inquiry: ID!, $buttonTasks: [String]!) {
+#import InquiryAnswerButtons, 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
+        closedAt
         task {
           id
           slug
         }
+        document {
+          ...InquiryRequest
+        }
         childCase {
           id
           status
           document {
             id
+            modifiedContentAt
+            modifiedContentByUser
           }
-          workItems(tasks: $buttonTasks, status: READY) {
-            edges {
-              node {
-                id
-                task {
-                  id
-                  slug
-                }
-              }
-            }
-          }
+          ...InquiryAnswerButtons
         }
       }
     }

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

@@ -1,11 +1,12 @@
-#import InquiryDialog, InquiryDeadlineDocument, InquiryStatusDocument from '../fragments/inquiry.graphql'
+#import InquiryAnswerButtons, InquiryDialog, InquiryDeadlineDocument, InquiryStatusDocument, InquiryRequest from '../fragments/inquiry.graphql'
 
 query InquiryDialog(
   $task: ID!
+  $buttonTasks: [String]!
   $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,14 +25,22 @@ 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();
+    await this.refetchControls();
+    await this.refetchNavigation();
+  }
+
+  async refetchNavigation() {
     await getObservable(this.navigation.value)?.refetch();
   }
 
+  async refetchControls() {
+    await getObservable(this.controls.value)?.refetch();
+  }
+
   @dropTask
   *fetchControls(caseId) {
     return yield this.apollo.watchQuery({
@@ -79,4 +91,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,19 @@
-<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}} />
+{{#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>
+    {{#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"}}>
+      {{outlet}}
+    </div>
   </div>
-</div>
+{{/if}}

package/addon/utils/inquiry-answer-status.js

@@ -0,0 +1,34 @@
+import { assert } from "@ember/debug";
+import { get } from "@ember/object";
+
+import { createDecorator } from "@projectcaluma/ember-distribution/-private/decorator";
+
+function decorator(
+  target,
+  key,
+  desc,
+  { inquiryProperty = "args.inquiry" } = {}
+) {
+  assert(
+    `The @projectcaluma/ember-distribution config must be injected in order to use @inquiryAnswerStatus: \`@config config\``,
+    Object.prototype.hasOwnProperty.call(target, "config")
+  );
+
+  return {
+    get() {
+      const inquiry = get(this, inquiryProperty);
+      const readyWorkItems =
+        inquiry.childCase?.workItems.edges
+          .filter((edge) => edge.node.status === "READY")
+          .map((edge) => edge.node.task.slug) ?? [];
+
+      const buttonConfig = Object.entries(
+        this.config.inquiry.answer.buttons
+      ).find(([task]) => readyWorkItems.includes(task))?.[1];
+
+      return buttonConfig?.status ? this.intl.t(buttonConfig.status) : null;
+    },
+  };
+}
+
+export default createDecorator(decorator);

package/addon/utils/inquiry-deadline.js

@@ -19,20 +19,18 @@ function decorator(
     get() {
       const inquiry = get(this, inquiryProperty);
       const value = inquiry.document?.deadline.edges[0]?.node.value;
-      const isAnswered = inquiry.status === "COMPLETED";
+      const isDone = ["COMPLETED", "SKIPPED"].includes(inquiry.status);
 
-      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 = !isDone && diff <= 0;
+      const isWarning = !isDone && diff <= this.config.warningPeriod;
 
       return {
         value,
         isOverdue,
         isWarning,
-        color: isAnswered
+        color: isDone
           ? "muted"
           : isOverdue
           ? "danger"

package/addon/utils/inquiry-status.js

@@ -5,15 +5,17 @@ import { createDecorator } from "@projectcaluma/ember-distribution/-private/deco
 import { INQUIRY_STATUS } from "@projectcaluma/ember-distribution/config";
 
 export const ICON_MAP = {
-  [INQUIRY_STATUS.DRAFT]: "pencil-outline",
-  [INQUIRY_STATUS.SENT]: "paper-plane-outline",
-  [INQUIRY_STATUS.POSITIVE]: "checkmark-outline",
-  [INQUIRY_STATUS.NEGATIVE]: "close-outline",
-  [INQUIRY_STATUS.NEEDS_INTERACTION]: "repeat-outline",
+  [INQUIRY_STATUS.DRAFT]: "commenting",
+  [INQUIRY_STATUS.SKIPPED]: "lock",
+  [INQUIRY_STATUS.SENT]: "comment",
+  [INQUIRY_STATUS.POSITIVE]: "check",
+  [INQUIRY_STATUS.NEGATIVE]: "close",
+  [INQUIRY_STATUS.NEEDS_INTERACTION]: "file-text",
 };
 
 export const COLOR_MAP = {
   [INQUIRY_STATUS.DRAFT]: "muted",
+  [INQUIRY_STATUS.SKIPPED]: "muted",
   [INQUIRY_STATUS.SENT]: "emphasis",
   [INQUIRY_STATUS.POSITIVE]: "success",
   [INQUIRY_STATUS.NEGATIVE]: "danger",
@@ -44,9 +46,12 @@ function decorator(
         ? inquiry.status === "READY"
         : inquiry.status === "SUSPENDED";
       const isSent = !isAddressed && inquiry.status === "READY";
+      const isSkipped = inquiry.status === "SKIPPED";
 
       const answer = inquiry.childCase?.document.status.edges[0]?.node;
-      const slug = isDraft
+      const slug = isSkipped
+        ? INQUIRY_STATUS.SKIPPED
+        : isDraft
         ? INQUIRY_STATUS.DRAFT
         : isSent
         ? INQUIRY_STATUS.SENT
@@ -55,7 +60,7 @@ function decorator(
       return {
         slug,
         label:
-          !isDraft && !isSent
+          !isSkipped && !isDraft && !isSent
             ? answer?.selectedOption.label
             : this.intl.t(`caluma.distribution.status.${slug}`),
         color: COLOR_MAP[slug],

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

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

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

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

package/app/styles/@projectcaluma/ember-distribution.scss

@@ -1,3 +1,4 @@
-@import "../icon-button";
+@import "../answer-form";
+@import "../group-list";
 @import "../inquiry-divider";
-@import "../status-indicator";
+@import "../truncated";

package/app/styles/_answer-form.scss

@@ -0,0 +1,4 @@
+.inquiry-answer-form__request {
+  border-left: 5px solid $global-border;
+  padding-left: $global-gutter - 5px;
+}

package/app/styles/_group-list.scss

@@ -0,0 +1,7 @@
+.group-list tr {
+  cursor: pointer;
+
+  > td:last-of-type svg {
+    min-width: 20px;
+  }
+}

package/app/styles/_inquiry-divider.scss

@@ -3,7 +3,7 @@
 $size: 36px;
 $iconSize: $size * 0.6;
 
-$sizeSmall: 24px;
+$sizeSmall: 32px;
 $iconSizeSmall: $sizeSmall * 0.6;
 
 $colors: (

package/app/styles/_truncated.scss

@@ -0,0 +1,3 @@
+.cd-truncated {
+  white-space: pre-line;
+}

package/app/utils/inquiry-answer-status.js

@@ -0,0 +1 @@
+export { default } from "@projectcaluma/ember-distribution/utils/inquiry-answer-status";

package/index.js

@@ -5,11 +5,6 @@ const { buildEngine } = require("ember-engines/lib/engine-addon");
 
 const name = require("./package").name;
 
-const ioniconAssets = [
-  ...require.resolve("ionicons").split("/").slice(0, -1),
-  "svg",
-].join("/");
-
 const publicAssets = [
   ...require.resolve(name).split("/").slice(0, -1),
   "public",
@@ -19,5 +14,5 @@ const publicAssets = [
 module.exports = buildEngine({
   name,
   lazyLoading: { enabled: false },
-  svgJar: { sourceDirs: [ioniconAssets, publicAssets] },
+  svgJar: { sourceDirs: [publicAssets] },
 });