@projectcaluma/ember-distribution 1.0.0-beta.10 → 1.0.0-beta.13

package/CHANGELOG.md

@@ -1,3 +1,36 @@
+# [@projectcaluma/ember-distribution-v1.0.0-beta.13](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-distribution-v1.0.0-beta.12...@projectcaluma/ember-distribution-v1.0.0-beta.13) (2022-06-09)
+
+
+### Features
+
+* **caluma:** use new filter syntax of caluma ([7a00c03](https://github.com/projectcaluma/ember-caluma/commit/7a00c03a103933d9e48dd88adb7382441a298742))
+
+
+### BREAKING CHANGES
+
+* **caluma:** `ember-caluma` now requires Caluma version >=
+8.0.0-beta.6
+
+# [@projectcaluma/ember-distribution-v1.0.0-beta.12](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-distribution-v1.0.0-beta.11...@projectcaluma/ember-distribution-v1.0.0-beta.12) (2022-06-09)
+
+
+### Bug Fixes
+
+* **distribution:** fix selection of groups with the checkbox ([9f028dc](https://github.com/projectcaluma/ember-caluma/commit/9f028dc6ec16214249f43e519280397131006e7c))
+* **distribution:** refetch inquiry answer after work-item completion ([60cfaca](https://github.com/projectcaluma/ember-caluma/commit/60cfaca04d94a44efc4950eeb1aecee767b4eeb5))
+
+
+### Features
+
+* **distribution:** add configurable status for unanswered inquiries ([e08247f](https://github.com/projectcaluma/ember-caluma/commit/e08247f6e2b73f859011f4eac7ffff71f101f546))
+
+# [@projectcaluma/ember-distribution-v1.0.0-beta.11](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-distribution-v1.0.0-beta.10...@projectcaluma/ember-distribution-v1.0.0-beta.11) (2022-05-13)
+
+
+### Features
+
+* **distribution:** add status for skipped inquiries ([1f93c92](https://github.com/projectcaluma/ember-caluma/commit/1f93c92d76b697954ec54aefa12348c84cd0abf9))
+
 # [@projectcaluma/ember-distribution-v1.0.0-beta.10](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-distribution-v1.0.0-beta.9...@projectcaluma/ember-distribution-v1.0.0-beta.10) (2022-05-11)
 
 

package/addon/components/cd-document-header.hbs

@@ -1,10 +1,7 @@
 <p class="uk-text-large uk-margin-remove">
   {{@name}}
-  {{#if @isDraft}}
-    <UkLabel
-      @label={{t "caluma.distribution.status.draft"}}
-      class="uk-margin-left"
-    />
+  {{#if @status}}
+    <UkLabel @label={{@status}} class="uk-margin-left" />
   {{/if}}
 </p>
 

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

@@ -8,7 +8,7 @@
     <div class="uk-position-relative">
       <CdDocumentHeader
         @name={{content.document.rootForm.raw.name}}
-        @isDraft={{eq this.inquiry.status "READY"}}
+        @status={{if (eq this.inquiry.status "READY") this.answerStatus}}
         @modifiedAt={{this.inquiry.childCase.document.modifiedContentAt}}
         @modifiedBy={{this.inquiry.childCase.document.modifiedContentByUser}}
       />

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

@@ -1,6 +1,6 @@
 import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
-import { queryManager } from "ember-apollo-client";
+import { queryManager, getObservable } from "ember-apollo-client";
 import { dropTask } from "ember-concurrency";
 import { trackedTask } from "ember-resources/util/ember-concurrency";
 
@@ -8,6 +8,7 @@ import { decodeId } from "@projectcaluma/ember-core/helpers/decode-id";
 import config from "@projectcaluma/ember-distribution/config";
 import completeInquiryWorkItemMutation from "@projectcaluma/ember-distribution/gql/mutations/complete-inquiry-work-item.graphql";
 import inquiryAnswerQuery from "@projectcaluma/ember-distribution/gql/queries/inquiry-answer.graphql";
+import inquiryAnswerStatus from "@projectcaluma/ember-distribution/utils/inquiry-answer-status";
 
 export default class CdInquiryAnswerFormComponent extends Component {
   @service intl;
@@ -19,6 +20,8 @@ export default class CdInquiryAnswerFormComponent extends Component {
 
   @queryManager apollo;
 
+  @inquiryAnswerStatus({ inquiryProperty: "inquiry" }) answerStatus;
+
   _inquiry = trackedTask(this, this.fetchInquiryAnswer, () => [
     this.args.inquiry,
   ]);
@@ -79,6 +82,7 @@ export default class CdInquiryAnswerFormComponent extends Component {
         },
       });
 
+      yield getObservable(this._inquiry.value)?.refetch();
       yield this.router.transitionTo("inquiry.index");
     } catch (error) {
       this.notification.danger(

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

@@ -14,12 +14,10 @@
       uk-flex-inline uk-flex-middle"
     ...attributes
   >
-    {{svg-jar
-      (if this.isWithdrawn "ban-outline" "alarm-outline")
-      height=26
-      width=26
+    <UkIcon
+      @icon={{if this.isWithdrawn "ban" "clock"}}
       class="uk-margin-small-right"
-    }}
+    />
     {{#if this.isWithdrawn}}
       {{t "caluma.distribution.withdraw.status"}}
     {{else}}

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

@@ -3,6 +3,6 @@
     {{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}}
+    <UkIcon @icon={{this.status.icon}} title={{this.status.label}} />
   </div>
 </div>

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

@@ -1,10 +1,18 @@
 <div class="uk-margin-remove-last-child">
-  <p class="uk-flex uk-flex-middle uk-text-large uk-margin-remove">
+  <p
+    class="uk-flex uk-flex-middle uk-text-large uk-margin-remove"
+    data-test-title
+  >
     {{#if (eq @type "request")}}
-      {{svg-jar "arrow-redo-outline" height=24 class="uk-margin-small-right"}}
+      <UkIcon @icon="forward" class="uk-margin-small-right" />
       {{group-name @inquiry.controllingGroups}}
+      {{#if
+        (and (can "answer inquiry" @inquiry) (not @disabled) this.answerStatus)
+      }}
+        <UkLabel @label={{this.answerStatus}} class="uk-margin-left" />
+      {{/if}}
     {{else if (eq @type "answer")}}
-      {{svg-jar "arrow-undo-outline" height=24 class="uk-margin-small-right"}}
+      <UkIcon @icon="reply" class="uk-margin-small-right" />
       {{group-name @inquiry.addressedGroups}}
     {{/if}}
   </p>

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

@@ -8,6 +8,7 @@ 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";
+import inquiryAnswerStatus from "@projectcaluma/ember-distribution/utils/inquiry-answer-status";
 
 export default class CdInquiryDialogInquiryPartComponent extends Component {
   @service notification;
@@ -18,6 +19,8 @@ export default class CdInquiryDialogInquiryPartComponent extends Component {
 
   @config config;
 
+  @inquiryAnswerStatus answerStatus;
+
   get date() {
     const key = this.args.type === "request" ? "createdAt" : "closedAt";
 

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

@@ -5,13 +5,19 @@
     (and (can "create inquiry of distribution") this.currentGroupIsCreator)
   }}
     <div class="uk-text-center uk-margin">
-      <CdIconButton
-        @title={{t "caluma.distribution.new.title"}}
-        @icon="plus"
-        @loading={{this.createInquiry.isRunning}}
-        @onClick={{perform this.createInquiry}}
+      <button
+        type="button"
+        class="uk-icon-button"
+        title={{t "caluma.distribution.new.title"}}
         data-test-new-inquiry
-      />
+        {{on "click" (perform this.createInquiry)}}
+      >
+        {{#if this.createInquiry.isRunning}}
+          <UkSpinner @ratio={{0.6}} />
+        {{else}}
+          <UkIcon @icon="plus" />
+        {{/if}}
+      </button>
     </div>
   {{/if}}
   <section>

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

@@ -47,6 +47,7 @@ export default class CdInquiryDialogComponent extends Component {
         deadlineQuestion: this.config.inquiry.deadlineQuestion,
         statusQuestion: this.config.inquiry.answer.statusQuestion,
         answerInfoQuestions: this.config.inquiry.answer.infoQuestions,
+        buttonTasks: Object.keys(this.config.inquiry.answer.buttons),
         includeNavigationData: true,
       },
     });

package/addon/components/cd-inquiry-edit-form.hbs

@@ -6,7 +6,10 @@
   <:default as |content|>
     <CdDocumentHeader
       @name={{content.document.rootForm.raw.name}}
-      @isDraft={{eq this.inquiry.status "SUSPENDED"}}
+      @status={{if
+        (eq this.inquiry.status "SUSPENDED")
+        (t "caluma.distribution.status.draft")
+      }}
       @modifiedAt={{this.inquiry.document.modifiedContentAt}}
       @modifiedBy={{this.inquiry.document.modifiedContentByUser}}
     />

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

@@ -80,36 +80,38 @@
       <UkSpinner @ratio={{2}} />
     </div>
   {{else if this.groups.value.length}}
-    <ul class="uk-list uk-list-striped">
-      {{#each this.groups.value as |group|}}
-        {{! template-lint-disable require-presentational-children }}
-        <li
-          role="checkbox"
-          class="uk-flex uk-flex-between uk-flex-middle"
-          data-test-group={{group.identifier}}
-          {{on "click" (fn this.updateSelectedGroups group.identifier)}}
-        >
-          {{! template-lint-disable no-nested-interactive }}
-          <label for="group-{{group.identifier}}">
-            <input
-              type="checkbox"
-              class="uk-checkbox uk-margin-small-right"
-              checked={{includes group.identifier this.selectedGroups}}
-              id="group-{{group.identifier}}"
-            />
-            {{group-name group.identifier}}
-          </label>
-          {{#if group.config.icon}}
-            {{svg-jar
-              group.config.icon
-              width="20"
-              height="20"
-              class=(concat "uk-text-" group.config.iconColor)
-            }}
-          {{/if}}
-        </li>
-      {{/each}}
-    </ul>
+    <table
+      class="uk-table uk-table-striped uk-table-hover uk-table-small uk-table-middle group-list"
+    >
+      <tbody>
+        {{#each this.groups.value as |group|}}
+          {{! template-lint-disable require-presentational-children }}
+          <tr
+            role="checkbox"
+            data-test-group={{group.identifier}}
+            {{on "click" (fn this.updateSelectedGroups group.identifier)}}
+          >
+            <td class="uk-padding-remove-right">
+              {{! template-lint-disable require-input-label no-nested-interactive }}
+              <input
+                type="checkbox"
+                class="uk-checkbox"
+                checked={{includes group.identifier this.selectedGroups}}
+              />
+            </td>
+            <td class="uk-width-expand">{{group-name group.identifier}}</td>
+            <td class="uk-text-right">
+              {{#if group.config.icon}}
+                <UkIcon
+                  @icon={{group.config.icon}}
+                  class="uk-display-block uk-text-{{group.config.iconColor}}"
+                />
+              {{/if}}
+            </td>
+          </tr>
+        {{/each}}
+      </tbody>
+    </table>
   {{else}}
     <div class="uk-text-center">
       <UkIcon @icon="search" @ratio={{10}} class="uk-margin-top" />

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

@@ -44,9 +44,7 @@ export default class CdInquiryNewFormComponent extends Component {
   }
 
   @action
-  updateSelectedGroups(identifier, e) {
-    e.preventDefault();
-
+  updateSelectedGroups(identifier) {
     this.selectedGroups = toggle(identifier, this.selectedGroups);
   }
 

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

@@ -1,32 +1,41 @@
 <div class="uk-text-center uk-margin-small-top">
   {{#if (can "create inquiry of distribution")}}
-    <CdIconButton
-      @title={{t "caluma.distribution.new.title"}}
-      @icon="plus"
+    <LinkTo
       @route="new"
-    />
+      class="uk-icon-button"
+      title={{t "caluma.distribution.new.title"}}
+    >
+      <UkIcon @icon="plus" />
+    </LinkTo>
   {{/if}}
   {{#if (can "send inquiries of distribution")}}
-    <CdIconButton
-      @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}}
+    <button
+      type="button"
+      class="uk-icon-button"
+      title={{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")}}
-    <CdIconButton
-      @icon="lock-closed-outline"
-      @fromSvgJar={{true}}
-      @onClick={{perform this.completeDistribution}}
-      @loading={{this.completeDistribution.isRunning}}
+    <button
+      type="button"
+      class="uk-icon-button"
+      title={{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}}
 </div>

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

@@ -26,7 +26,7 @@ export default class CdNavigationControlsComponent extends Component {
         {
           query: incompleteInquiriesQuery,
           variables: {
-            caseId: this.args.caseId,
+            caseId: this.distribution.caseId,
             task: this.config.inquiry.task,
           },
         },

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

@@ -1,15 +1,18 @@
-<li class={{if this.isActive "uk-active"}}>
+<li class="uk-width-auto {{if this.isActive 'uk-active'}}">
   <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")}}
-          {{@inquiry.controllingGroupName}}
-        {{else}}
-          {{@inquiry.addressedGroupName}}
-        {{/if}}
-      </div>
+    {{#let
+      (if
+        (eq @type "addressed")
+        @inquiry.controllingGroupName
+        @inquiry.addressedGroupName
+      )
+      as |name|
+    }}
+      <span class="uk-width-expand uk-text-truncate" title={{name}}>
+        {{name}}
+      </span>
+    {{/let}}
 
-      <CdNavigation::StatusIndicator @inquiry={{@inquiry}} @type={{@type}} />
-    </div>
+    <CdNavigation::StatusIndicator @inquiry={{@inquiry}} @type={{@type}} />
   </LinkTo>
 </li>

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

@@ -1,5 +1,5 @@
-<li class="uk-margin-small-bottom">
-  <a href="" class="uk-margin-small-bottom" {{on "click" this.toggle}}>
+<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>
@@ -12,7 +12,7 @@
 
   {{#if this.expanded}}
     {{#if @inquiries.length}}
-      <ul class="uk-tab uk-tab-left uk-margin-left">
+      <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}}
@@ -20,7 +20,7 @@
     {{/if}}
 
     {{#if (eq @type "controlling")}}
-      <CdNavigation::Controls @caseId={{@caseId}} />
+      <CdNavigation::Controls />
     {{/if}}
   {{/if}}
 </li>

package/addon/components/cd-navigation/status-indicator.hbs

@@ -1,18 +1,13 @@
 {{#if this.showDeadlineIndicator}}
-  <div
-    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>
+  <UkIcon
+    @icon="clock"
+    class="uk-margin-small-right uk-text-{{this.deadline.color}}"
+    title={{format-date this.deadline.value}}
+  />
 {{/if}}
 
-<div
-  class="status-indicator uk-flex uk-flex-middle uk-flex-center uk-margin-small-left uk-text-{{this.status.color}}"
->
-  {{svg-jar this.status.icon title=this.status.label}}
-</div>
+<UkIcon
+  @icon={{this.status.icon}}
+  class="uk-text-{{this.status.color}}"
+  title={{this.status.label}}
+/>

package/addon/components/cd-navigation.hbs

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

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",
@@ -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,7 +63,7 @@ export default function config(target, property) {
             types: {
               suggestions: {
                 label: "caluma.distribution.new.suggestions",
-                icon: "bulb-outline",
+                icon: "star",
                 iconColor: "warning",
               },
             },

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
@@ -33,7 +48,7 @@ fragment InquiryStatusDocument on Document {
 fragment InquiryRequest on Document {
   id
   ...InquiryDeadlineDocument
-  info: answers(question: $infoQuestion) {
+  info: answers(filter: [{ question: $infoQuestion }]) {
     edges {
       node {
         id
@@ -61,9 +76,10 @@ fragment InquiryDialog on WorkItem {
   }
   childCase {
     id
+    ...InquiryAnswerButtons
     document {
       ...InquiryStatusDocument
-      info: answers(questions: $answerInfoQuestions) {
+      info: answers(filter: [{ questions: $answerInfoQuestions }]) {
         edges {
           node {
             id

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/queries/inquiry-answer.graphql

@@ -1,4 +1,4 @@
-#import InquiryDeadlineDocument, InquiryRequest from '../fragments/inquiry.graphql'
+#import InquiryAnswerButtons, InquiryDeadlineDocument, InquiryRequest from '../fragments/inquiry.graphql'
 
 query InquiryAnswer(
   $inquiry: ID!
@@ -14,6 +14,7 @@ query InquiryAnswer(
         addressedGroups
         controllingGroups
         createdAt
+        closedAt
         task {
           id
           slug
@@ -29,17 +30,7 @@ query InquiryAnswer(
             modifiedContentAt
             modifiedContentByUser
           }
-          workItems(tasks: $buttonTasks, status: READY) {
-            edges {
-              node {
-                id
-                task {
-                  id
-                  slug
-                }
-              }
-            }
-          }
+          ...InquiryAnswerButtons
         }
       }
     }

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

@@ -1,7 +1,8 @@
-#import InquiryDialog, InquiryDeadlineDocument, InquiryStatusDocument, InquiryRequest 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!

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,18 +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 { days: diff } = DateTime.fromISO(value).diffNow("days").toObject();
 
-      const isOverdue = !isAnswered && diff <= 0;
-      const isWarning = !isAnswered && diff <= this.config.warningPeriod;
+      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]: "refresh",
 };
 
 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/styles/@projectcaluma/ember-distribution.scss

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

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/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] },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-distribution",
-  "version": "1.0.0-beta.10",
+  "version": "1.0.0-beta.13",
   "description": "Ember engine for the Caluma distribution module.",
   "keywords": [
     "ember-addon",
@@ -19,14 +19,14 @@
   },
   "dependencies": {
     "@ember/string": "^3.0.0",
-    "@embroider/macros": "^1.6.0",
+    "@embroider/macros": "^1.7.1",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "@projectcaluma/ember-core": "^11.0.0-beta.7",
-    "@projectcaluma/ember-form": "^11.0.0-beta.19",
+    "@projectcaluma/ember-form": "^11.0.0-beta.21",
     "@projectcaluma/ember-workflow": "^11.0.0-beta.7",
     "ember-apollo-client": "^4.0.2",
-    "ember-auto-import": "^2.4.1",
+    "ember-auto-import": "^2.4.2",
     "ember-can": "^4.2.0",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-htmlbars": "^6.0.1",
@@ -35,23 +35,22 @@
     "ember-fetch": "^8.1.1",
     "ember-intl": "^5.7.2",
     "ember-pikaday": "^4.0.0",
-    "ember-resources": "^4.7.1",
+    "ember-resources": "^4.8.2",
     "ember-svg-jar": "^2.3.4",
     "ember-test-selectors": "^6.0.0",
     "ember-uikit": "^5.1.3",
     "graphql": "^15.8.0",
     "graphql-tag": "^2.12.6",
-    "ionicons": "^6.0.1",
     "lodash.merge": "^4.6.2",
     "luxon": "^2.4.0",
     "tracked-toolbox": "^1.2.3"
   },
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
-    "@ember/test-helpers": "2.7.0",
-    "@embroider/test-setup": "1.6.0",
-    "@faker-js/faker": "6.3.1",
-    "@projectcaluma/ember-testing": "11.0.0-beta.7",
+    "@ember/test-helpers": "2.8.1",
+    "@embroider/test-setup": "1.7.1",
+    "@faker-js/faker": "7.2.0",
+    "@projectcaluma/ember-testing": "11.0.0-beta.9",
     "broccoli-asset-rev": "3.0.0",
     "ember-cli": "3.28.5",
     "ember-cli-code-coverage": "1.0.3",
@@ -72,12 +71,12 @@
     "ember-source-channel-url": "3.0.0",
     "ember-try": "2.0.0",
     "loader.js": "4.7.0",
-    "miragejs": "0.1.43",
+    "miragejs": "0.1.45",
     "npm-run-all": "4.1.5",
     "qunit": "2.19.1",
     "qunit-dom": "2.0.0",
-    "sass": "1.51.0",
-    "webpack": "5.72.0"
+    "sass": "1.52.3",
+    "webpack": "5.73.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"

package/translations/de.yaml

@@ -3,6 +3,7 @@ caluma:
     empty: "Es wurden noch keine Anfragen erstellt."
     start: "Starten"
     send: "Offene Anfragen versenden"
+    complete: "Zirkulation abschliessen"
     send-confirm: "Wollen Sie wirklich alle offenen Anfragen versenden?"
     complete-confirm:
       "Es gibt noch <b>{count} offene {count, plural, =1 {Anfrage} other {Anfragen}}</b>
@@ -28,14 +29,23 @@ caluma:
 
     answer:
       link: "Beantworten"
-      release-for-review: "Zur Kontrolle freigeben"
-      release-adjustment-for-review: "Anpassung zur Kontrolle freigeben"
-      confirm: "Bestätigen"
-      revise: "Überarbeiten"
 
       complete-error: "Fehler beim Abschliessen der Aufgabe"
       complete-not-allowed: "Sie sind nicht berechtigt diese Antwort zu versenden."
 
+      buttons:
+        compose:
+          label: "Zur Kontrolle freigeben"
+          status: "In Bearbeitung"
+        adjust:
+          label: "Anpassung zur Kontrolle freigeben"
+          status: "In Überarbeitung"
+        confirm:
+          label: "Bestätigen"
+          status: "In Prüfung"
+        revise:
+          label: "Überarbeiten"
+
     new:
       title: "Neue Anfrage"
       search: "Suchen..."
@@ -54,6 +64,7 @@ caluma:
 
     status:
       draft: "Entwurf"
+      skipped: "Vorzeitig beendet"
       sent: "Versendet"
       positive: "Positiv"
       negative: "Negativ"

package/translations/en.yaml

@@ -3,6 +3,7 @@ caluma:
     empty: "No inquiries have been created yet."
     start: "Start"
     send: "Send pending inquiries"
+    complete: "Complete circulation"
     send-confirm: "Do you really want to send all pending inquiries?"
     complete-confirm:
       "There {count, plural, =1 {is} other {are}} <b>{count} pending
@@ -29,14 +30,23 @@ caluma:
 
     answer:
       link: "Answer"
-      release-for-review: "Release for review"
-      release-adjustment-for-review: "Release adjustment for review"
-      confirm: "Confirm"
-      revise: "Revise"
 
       complete-error: "Error while completing the work item"
       complete-not-allowed: "You are not allowed to send this inquiry answer."
 
+      buttons:
+        compose:
+          label: "Release for review"
+          status: "In progress"
+        adjust:
+          label: "Release adjustment for review"
+          status: "In revision"
+        confirm:
+          label: "Confirm"
+          status: "In review"
+        revise:
+          label: "Revise"
+
     new:
       title: "New inquiry"
       search: "Search..."
@@ -55,6 +65,7 @@ caluma:
 
     status:
       draft: "Draft"
+      skipped: "Aborted"
       sent: "Sent"
       positive: "Positive"
       negative: "Negative"

package/translations/fr.yaml

@@ -3,6 +3,7 @@ caluma:
     empty: "Aucune demande n'a encore été créée."
     start: "Lancer"
     send: "Envoyer les demandes ouvertes"
+    complete: "Terminer la circulation"
     send-confirm: "Voulez-vous vraiment envoyer toutes les demandes ouvertes ?"
     complete-confirm:
       "Il y a <b>{count} {count, plural, =1 {demande} other {demandes}} en
@@ -28,14 +29,23 @@ caluma:
 
     answer:
       link: "Répondre"
-      release-for-review: "Valider pour vérification"
-      release-adjustment-for-review: "Valider la révision pour vérification"
-      confirm: "Confirmer"
-      revise: "Réviser"
 
       complete-error: "Erreur lors de la clôture de la tâche"
       complete-not-allowed: "Vous n'êtes pas autorisé à envoyer cette réponse."
 
+      buttons:
+        compose:
+          label: "Valider pour vérification"
+          status: "En cours"
+        adjust:
+          label: "Valider la révision pour vérification"
+          status: "En révision"
+        confirm:
+          label: "Confirmer"
+          status: "En examen"
+        revise:
+          label: "Réviser"
+
     new:
       title: "Nouvelle demande"
       search: "Chercher..."
@@ -54,6 +64,7 @@ caluma:
 
     status:
       draft: "Brouillon"
+      skipped: "Terminé prématurément"
       sent: "Envoyé"
       positive: "Positif"
       negative: "Negatif"

package/addon/components/cd-icon-button.hbs

@@ -1,27 +0,0 @@
-{{#if @route}}
-  <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}}
-    title={{@title}}
-    ...attributes
-    {{on "click" @onClick}}
-  >
-    {{#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/cd-icon-button.js

@@ -1,22 +0,0 @@
-import { dasherize } from "@ember/string";
-import Component from "@glimmer/component";
-
-export default class CdIconButtonComponent extends Component {
-  get class() {
-    const gutters = [
-      "gutter",
-      "gutterTop",
-      "gutterRight",
-      "gutterBottom",
-      "gutterLeft",
-    ]
-      .map((arg) =>
-        this.args[arg]
-          ? `uk-icon-button--${dasherize(arg)}-${this.args[arg]}`
-          : null
-      )
-      .filter(Boolean);
-
-    return ["uk-icon-button", ...gutters].join(" ");
-  }
-}

package/app/components/cd-icon-button.js

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

package/app/styles/_icon-button.scss

@@ -1,13 +0,0 @@
-@import "ember-uikit/variables-theme";
-
-@for $i from 1 through 8 {
-  @each $side in "top", "right", "bottom", "left" {
-    .uk-icon-button--gutter-#{$side}-#{$i} > svg {
-      margin-#{$side}: #{$i}px !important;
-    }
-  }
-
-  .uk-icon-button--gutter-#{$i} > svg {
-    margin: #{$i}px;
-  }
-}

package/app/styles/_status-indicator.scss

@@ -1,31 +0,0 @@
-@import "ember-uikit/variables-theme";
-
-$size: $global-small-font-size * 1.2;
-$iconSize: $global-small-font-size * 0.9;
-
-$colors: (
-  muted: $text-muted-color,
-  emphasis: $text-emphasis-color,
-  success: $text-success-color,
-  danger: $text-danger-color,
-  warning: $text-warning-color,
-);
-
-.status-indicator {
-  width: $size;
-  height: $size;
-  border-width: 1px;
-  border-style: solid;
-
-  > svg {
-    width: $iconSize;
-    height: $iconSize;
-  }
-
-  @each $colorName, $color in $colors {
-    &.uk-text-#{$colorName} {
-      color: darken($color, 20%);
-      border-color: $color;
-    }
-  }
-}