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

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+# [@projectcaluma/ember-distribution-v1.0.0-beta.9](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-distribution-v1.0.0-beta.8...@projectcaluma/ember-distribution-v1.0.0-beta.9) (2022-05-09)
+
+
+### Bug Fixes
+
+* **deps:** update ember-engines ([5aa5300](https://github.com/projectcaluma/ember-caluma/commit/5aa530074ea7dc08267d8ccc411eb1538537a1b5))
+* **distribution:** filter out empty types in new inquiry controller ([ad7e072](https://github.com/projectcaluma/ember-caluma/commit/ad7e072bd8d339964d1f7f6437bde6b4ff5824b5))
+* **distribution:** hide suspended and canceled inquiries in more section ([a377c0c](https://github.com/projectcaluma/ember-caluma/commit/a377c0c599ab479a61c0f2f7d6051ce79817d998))
+* **distribution:** improve padding of request in answer form ([de06459](https://github.com/projectcaluma/ember-caluma/commit/de06459a75e3fad30a008c738781a29a03640c96))
+* **resources:** fix deprecations of ember-resources ([7a84c5c](https://github.com/projectcaluma/ember-caluma/commit/7a84c5c78d5b28f7b5393c64722907728dd5f42b))
+
+
+### Features
+
+* **distribution:** add button to create new inquiry in dialog ([a2ab800](https://github.com/projectcaluma/ember-caluma/commit/a2ab800d8d8a9b10be1d22c7a03f34299cb87a93))
+* **distribution:** allow displaying more information in the answer ([9de7f01](https://github.com/projectcaluma/ember-caluma/commit/9de7f0149406a0a326ba59ca0abe27860a64f2a1))
+* **distribution:** improve edit and answer inquiry UI and UX ([6cd2dee](https://github.com/projectcaluma/ember-caluma/commit/6cd2dee45dde245064a0ac013160093bc783789c))
+
 # [@projectcaluma/ember-distribution-v1.0.0-beta.8](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-distribution-v1.0.0-beta.7...@projectcaluma/ember-distribution-v1.0.0-beta.8) (2022-04-11)
 
 

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

@@ -0,0 +1,20 @@
+<p class="uk-text-large uk-margin-remove">
+  {{@name}}
+  {{#if @isDraft}}
+    <UkLabel
+      @label={{t "caluma.distribution.status.draft"}}
+      class="uk-margin-left"
+    />
+  {{/if}}
+</p>
+
+{{#if (and @modifiedBy @modifiedAt)}}
+  <p class="uk-text-meta uk-margin-remove-bottom uk-margin-small-top">
+    {{t
+      "caluma.distribution.last-modified"
+      user=(user-name @modifiedBy)
+      date=(format-date @modifiedAt)
+      time=(format-time @modifiedAt hour="2-digit" minute="2-digit")
+    }}
+  </p>
+{{/if}}

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

@@ -4,15 +4,30 @@
   @loading={{this._inquiry.isRunning}}
 >
   <: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>
+
+    <div class="uk-position-relative">
+      <CdDocumentHeader
+        @name={{content.document.rootForm.raw.name}}
+        @isDraft={{eq this.inquiry.status "READY"}}
+        @modifiedAt={{this.inquiry.childCase.document.modifiedContentAt}}
+        @modifiedBy={{this.inquiry.childCase.document.modifiedContentByUser}}
+      />
+
+      <CdInquiryDialog::InquiryDeadline
+        @inquiry={{this.inquiry}}
+        class="uk-margin-remove uk-position-center-right"
+      />
+    </div>
+
+    <hr />
+
+    <div class="uk-margin uk-text-italic inquiry-answer-form__request">
+      <CdInquiryDialog::InquiryPart
+        @inquiry={{this.inquiry}}
+        @type="request"
+        @disabled={{true}}
+      />
+    </div>
 
     <content.form />
 
@@ -23,6 +38,7 @@
             @type="submit"
             @color={{buttonConfig.color}}
             @disabled={{or (not isValid) this.completeWorkItem.isRunning}}
+            @loading={{this.completeWorkItem.isRunning}}
             @onClick={{fn
               (perform this.completeWorkItem)
               buttonConfig.workItemId
@@ -35,6 +51,7 @@
           @type="button"
           @color={{buttonConfig.color}}
           @disabled={{this.completeWorkItem.isRunning}}
+          @loading={{this.completeWorkItem.isRunning}}
           @onClick={{fn
             (perform this.completeWorkItem)
             buttonConfig.workItemId

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

@@ -2,7 +2,7 @@ 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 { trackedTask } from "ember-resources/util/ember-concurrency";
 
 import { decodeId } from "@projectcaluma/ember-core/helpers/decode-id";
 import config from "@projectcaluma/ember-distribution/config";
@@ -18,7 +18,9 @@ export default class CdInquiryAnswerFormComponent extends Component {
 
   @queryManager apollo;
 
-  _inquiry = useTask(this, this.fetchInquiryAnswer, () => [this.args.inquiry]);
+  _inquiry = trackedTask(this, this.fetchInquiryAnswer, () => [
+    this.args.inquiry,
+  ]);
 
   get inquiry() {
     return this._inquiry.value?.[0]?.node;
@@ -45,6 +47,8 @@ export default class CdInquiryAnswerFormComponent extends Component {
         variables: {
           inquiry: this.args.inquiry,
           buttonTasks: Object.keys(this.config.inquiry.answer.buttons),
+          infoQuestion: this.config.inquiry.infoQuestion,
+          deadlineQuestion: this.config.inquiry.deadlineQuestion,
         },
       },
       "allWorkItems.edges"

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

@@ -12,6 +12,7 @@
         (concat 'uk-text-' this.deadline.color)
       }}
       uk-flex-inline uk-flex-middle"
+    ...attributes
   >
     {{svg-jar
       (if this.isWithdrawn "ban-outline" "alarm-outline")

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

@@ -1,48 +1,95 @@
-<p class="uk-flex uk-flex-middle uk-text-bold uk-margin-remove">
-  {{#if (eq @type "request")}}
-    {{svg-jar "arrow-redo-outline" height=24 class="uk-margin-small-right"}}
-    {{group-name @inquiry.controllingGroups}}
-  {{else if (eq @type "answer")}}
-    {{svg-jar "arrow-undo-outline" height=24 class="uk-margin-small-right"}}
-    {{group-name @inquiry.addressedGroups}}
-  {{/if}}
-</p>
+<div class="uk-margin-remove-last-child">
+  <p class="uk-flex uk-flex-middle uk-text-large uk-margin-remove">
+    {{#if (eq @type "request")}}
+      {{svg-jar "arrow-redo-outline" height=24 class="uk-margin-small-right"}}
+      {{group-name @inquiry.controllingGroups}}
+    {{else if (eq @type "answer")}}
+      {{svg-jar "arrow-undo-outline" height=24 class="uk-margin-small-right"}}
+      {{group-name @inquiry.addressedGroups}}
+    {{/if}}
+  </p>
 
-<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}}
-      {{format-time this.date hour="2-digit" minute="2-digit"}}
-    </span>
-  </li>
-  {{#if (can "edit inquiry" @inquiry)}}
-    <li>
-      <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)}}
+  <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>
-      <LinkTo @route="inquiry.detail.answer" @model={{decode-id @inquiry.id}}>
-        {{t "caluma.distribution.answer.link"}}
-      </LinkTo>
+      <span>
+        {{format-date this.date}}
+        {{format-time this.date hour="2-digit" minute="2-digit"}}
+      </span>
     </li>
-  {{/if}}
-</ul>
+    {{#unless @disabled}}
+      {{#if (or (eq @type "answer") (cannot "edit inquiry" @inquiry))}}
+        <li>
+          <LinkTo
+            data-test-details
+            @route="inquiry.detail.{{if (eq @type 'answer') 'answer' 'index'}}"
+            @model={{decode-id @inquiry.id}}
+          >
+            {{t "caluma.distribution.details"}}
+          </LinkTo>
+        </li>
+      {{/if}}
+      {{#if (can "edit inquiry" @inquiry)}}
+        <li>
+          <LinkTo
+            data-test-edit
+            @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>
+      {{else if (can "answer inquiry" @inquiry)}}
+        <li>
+          <LinkTo
+            data-test-answer
+            @route="inquiry.detail.answer"
+            @model={{decode-id @inquiry.id}}
+          >
+            {{t "caluma.distribution.answer.link"}}
+          </LinkTo>
+        </li>
+      {{/if}}
+    {{/unless}}
+  </ul>
 
-{{#if this.info}}
-  <p class="uk-margin-remove">{{this.info}}</p>
-{{/if}}
+  {{#if this.requestInfo}}
+    <CdTruncated
+      data-test-inquiry-request
+      @text={{this.requestInfo}}
+      @length={{500}}
+    />
+  {{else if this.answerInfo}}
+    {{#each this.answerInfo as |info|}}
+      <div class="uk-margin">
+        <p
+          class="uk-text-bolder
+            {{if
+              this.config.ui.small
+              'uk-margin-remove'
+              'uk-margin-small-bottom'
+            }}"
+        >
+          {{info.question}}
+        </p>
+        <CdTruncated
+          data-test-inquiry-answer
+          class="uk-margin-remove"
+          @text={{info.value}}
+          @length={{200}}
+        />
+      </div>
+    {{/each}}
+  {{/if}}
+</div>

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

@@ -1,4 +1,5 @@
 import { inject as service } from "@ember/service";
+import { isEmpty } from "@ember/utils";
 import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
 import { dropTask } from "ember-concurrency";
@@ -23,15 +24,21 @@ export default class CdInquiryDialogInquiryPartComponent extends Component {
     return this.args.inquiry[key];
   }
 
-  get info() {
-    const document =
-      this.args.type === "request"
-        ? this.args.inquiry.document
-        : this.args.type === "answer"
-        ? this.args.inquiry.childCase.document
-        : null;
+  get requestInfo() {
+    return this.args.type === "request"
+      ? this.args.inquiry.document.info.edges[0]?.node.value
+      : null;
+  }
 
-    return document.info.edges[0]?.node.value;
+  get answerInfo() {
+    return this.args.type === "answer"
+      ? this.args.inquiry.childCase.document.info.edges
+          .filter((edge) => !isEmpty(edge.node.value))
+          .map((edge) => ({
+            question: edge.node.question.label,
+            value: edge.node.value,
+          }))
+      : null;
   }
 
   @dropTask

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

@@ -1,6 +1,19 @@
 {{#if this._inquiries.isRunning}}
   <div class="uk-text-center"><UkSpinner @ratio={{2}} /></div>
 {{else if this.inquiries.length}}
+  {{#if
+    (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}}
+        data-test-new-inquiry
+      />
+    </div>
+  {{/if}}
   <section>
     {{#each this.inquiries as |inquiry|}}
       <CdInquiryDialog::Inquiry @inquiry={{inquiry}} />

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

@@ -2,23 +2,32 @@ import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
 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 inquiryDialogQuery from "@projectcaluma/ember-distribution/gql/queries/inquiry-dialog.graphql";
 
 export default class CdInquiryDialogComponent extends Component {
+  @service intl;
   @service router;
+  @service distribution;
+  @service notification;
+  @service calumaOptions;
 
   @config config;
 
   @queryManager apollo;
 
+  get currentGroupIsCreator() {
+    return String(this.calumaOptions.currentGroupId) === this.args.from;
+  }
+
   get inquiries() {
     return this._inquiries.value?.allWorkItems.edges.map((edge) => edge.node);
   }
 
-  _inquiries = useTask(this, this.fetchDialog, () => [
+  _inquiries = trackedTask(this, this.fetchDialog, () => [
     this.args.from,
     this.args.to,
     this.args.caseId,
@@ -37,7 +46,7 @@ export default class CdInquiryDialogComponent extends Component {
         infoQuestion: this.config.inquiry.infoQuestion,
         deadlineQuestion: this.config.inquiry.deadlineQuestion,
         statusQuestion: this.config.inquiry.answer.statusQuestion,
-        answerInfoQuestion: this.config.inquiry.answer.infoQuestion,
+        answerInfoQuestions: this.config.inquiry.answer.infoQuestions,
         includeNavigationData: true,
       },
     });
@@ -62,4 +71,23 @@ export default class CdInquiryDialogComponent extends Component {
 
     return response;
   }
+
+  @dropTask
+  *createInquiry(e) {
+    e.preventDefault();
+
+    yield this.distribution.createInquiry.perform([this.args.to]);
+
+    // refetch dialog data
+    yield getObservable(this._inquiries.value).refetch();
+
+    this.router.transitionTo(
+      "inquiry.detail.index",
+      {
+        from: this.args.from,
+        to: this.args.to,
+      },
+      decodeId(this.inquiries[0].id)
+    );
+  }
 }

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

@@ -4,26 +4,28 @@
   @loading={{this._inquiry.isRunning}}
 >
   <:default as |content|>
-    <h1 class="uk-flex uk-flex-middle">
-      {{t "caluma.distribution.edit.title"}}
-      {{#if (eq this.inquiry.status "RUNNING")}}
-        <UkLabel
-          class="uk-margin-left"
-          @label={{t "caluma.distribution.status.draft"}}
-        />
-      {{/if}}
-    </h1>
+    <CdDocumentHeader
+      @name={{content.document.rootForm.raw.name}}
+      @isDraft={{eq this.inquiry.status "SUSPENDED"}}
+      @modifiedAt={{this.inquiry.document.modifiedContentAt}}
+      @modifiedBy={{this.inquiry.document.modifiedContentByUser}}
+    />
+
+    <hr />
 
     <content.form />
 
-    <DocumentValidity @document={{content.document}} as |isValid validate|>
-      <UkButton
-        @type="submit"
-        @color="primary"
-        @disabled={{or (not isValid) this.send.isRunning}}
-        @onClick={{perform this.send validate}}
-      >{{t "caluma.distribution.edit.send"}}</UkButton>
-    </DocumentValidity>
+    {{#if (can "edit inquiry" this.inquiry)}}
+      <DocumentValidity @document={{content.document}} as |isValid validate|>
+        <UkButton
+          @type="submit"
+          @color="primary"
+          @disabled={{or (not isValid) this.send.isRunning}}
+          @onClick={{perform this.send validate}}
+          @loading={{this.send.isRunning}}
+        >{{t "caluma.distribution.edit.send"}}</UkButton>
+      </DocumentValidity>
+    {{/if}}
   </:default>
   <:notfound><CdNotfound /></:notfound>
 </CfContent>

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

@@ -2,7 +2,7 @@ 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 { trackedTask } from "ember-resources/util/ember-concurrency";
 
 import config from "@projectcaluma/ember-distribution/config";
 import resumeWorkItemMutation from "@projectcaluma/ember-distribution/gql/mutations/resume-work-item.graphql";
@@ -17,7 +17,7 @@ export default class CdInquiryEditFormComponent extends Component {
 
   @queryManager apollo;
 
-  _inquiry = useTask(this, this.fetchInquiry, () => [this.args.inquiry]);
+  _inquiry = trackedTask(this, this.fetchInquiry, () => [this.args.inquiry]);
 
   get inquiry() {
     return this._inquiry.value?.[0]?.node;

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

@@ -1,7 +1,9 @@
 {{#if this.controls.workItems.isRunning}}
   <div class="uk-text-center"><UkSpinner @ratio={{2}} /></div>
 {{else if (can "create inquiry of distribution")}}
-  <h1>{{t "caluma.distribution.new.title"}}</h1>
+  <p class="uk-text-large">{{t "caluma.distribution.new.title"}}</p>
+
+  <hr />
 
   {{#if this.selectedGroups.length}}
     <div class="uk-flex uk-flex-middle">

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

@@ -5,11 +5,10 @@ import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { queryManager } from "ember-apollo-client";
 import { timeout, restartableTask, dropTask, task } from "ember-concurrency";
-import { 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";
 
 const toggle = (value, array) => {
   const set = new Set(array);
@@ -32,7 +31,7 @@ export default class CdInquiryNewFormComponent extends Component {
 
   @tracked selectedGroups = [];
 
-  groups = useTask(this, this.fetchGroups, () => [
+  groups = trackedTask(this, this.fetchGroups, () => [
     this.args.selectedTypes,
     this.args.search,
   ]);
@@ -78,45 +77,20 @@ export default class CdInquiryNewFormComponent extends Component {
 
     if (!this.selectedGroups.length) return;
 
-    try {
-      // get create inquiry work item to complete
-      const createId = decodeId(
-        this.distribution.controls.value?.create.edges[0].node.id
-      );
-
-      // create new inquiries
-      yield this.apollo.mutate({
-        mutation: createInquiryMutation,
-        variables: {
-          id: createId,
-          context: JSON.stringify({
-            addressed_groups: this.selectedGroups.map(String),
-          }),
-        },
-      });
-
-      // refetch navigation and controls data
-      yield this.distribution.refetch();
-
-      const lastControlling =
-        this.distribution.navigation.value.controlling.edges[0].node;
-
-      // transition to last added inquiry
-      this.router.transitionTo(
-        "inquiry.detail.index",
-        {
-          from: lastControlling.controllingGroups[0],
-          to: lastControlling.addressedGroups[0],
-        },
-        decodeId(lastControlling.id)
-      );
-    } catch (e) {
-      this.notification.danger(
-        this.intl.t("caluma.distribution.new.error", {
-          count: this.selectedGroups.length,
-        })
-      );
-    }
+    yield this.distribution.createInquiry.perform(this.selectedGroups);
+
+    const lastControlling =
+      this.distribution.navigation.value.controlling.edges[0].node;
+
+    // transition to last added inquiry
+    this.router.transitionTo(
+      "inquiry.detail.index",
+      {
+        from: lastControlling.controllingGroups[0],
+        to: lastControlling.addressedGroups[0],
+      },
+      decodeId(lastControlling.id)
+    );
   }
 
   @task

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

@@ -1,6 +1,10 @@
 <div class="uk-text-center uk-margin-small-top">
   {{#if (can "create inquiry of distribution")}}
-    <CdIconButton @route="new" @icon="plus" />
+    <CdIconButton
+      @title={{t "caluma.distribution.new.title"}}
+      @icon="plus"
+      @route="new"
+    />
   {{/if}}
   {{#if (can "send inquiries of distribution")}}
     <CdIconButton

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/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/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"}}>
-    <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>
+    <div class={{if this.config.ui.stack "uk-width-1-1" "uk-width-2-3"}}>
+      {{outlet}}
+    </div>
   </div>
-</div>
+{{/if}}

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/cd-truncated.js

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

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

@@ -1,3 +1,5 @@
+@import "../answer-form";
 @import "../icon-button";
 @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/_truncated.scss

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-distribution",
-  "version": "1.0.0-beta.8",
+  "version": "1.0.0-beta.9",
   "description": "Ember engine for the Caluma distribution module.",
   "keywords": [
     "ember-addon",
@@ -20,11 +20,11 @@
   "dependencies": {
     "@ember/string": "^3.0.0",
     "@embroider/macros": "^1.6.0",
-    "@glimmer/component": "^1.1.1",
-    "@glimmer/tracking": "^1.1.1",
-    "@projectcaluma/ember-core": "^11.0.0-beta.6",
-    "@projectcaluma/ember-form": "^11.0.0-beta.17",
-    "@projectcaluma/ember-workflow": "^11.0.0-beta.6",
+    "@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-workflow": "^11.0.0-beta.7",
     "ember-apollo-client": "^4.0.2",
     "ember-auto-import": "^2.4.1",
     "ember-can": "^4.2.0",
@@ -35,48 +35,48 @@
     "ember-fetch": "^8.1.1",
     "ember-intl": "^5.7.2",
     "ember-pikaday": "^4.0.0",
-    "ember-resources": "^4.4.0",
+    "ember-resources": "^4.7.1",
     "ember-svg-jar": "^2.3.4",
     "ember-test-selectors": "^6.0.0",
-    "ember-uikit": "^5.1.1",
+    "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.3.1",
+    "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.1.2",
-    "@projectcaluma/ember-testing": "11.0.0-beta.6",
+    "@faker-js/faker": "6.3.1",
+    "@projectcaluma/ember-testing": "11.0.0-beta.7",
     "broccoli-asset-rev": "3.0.0",
     "ember-cli": "3.28.5",
     "ember-cli-code-coverage": "1.0.3",
-    "ember-cli-dependency-checker": "3.2.0",
+    "ember-cli-dependency-checker": "3.3.1",
     "ember-cli-inject-live-reload": "2.1.0",
-    "ember-cli-mirage": "3.0.0-alpha.2",
-    "ember-cli-sass": "10.0.1",
+    "ember-cli-mirage": "3.0.0-alpha.3",
+    "ember-cli-sass": "11.0.1",
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
     "ember-disable-prototype-extensions": "1.1.3",
-    "ember-engines": "0.8.20",
+    "ember-engines": "0.8.22",
     "ember-export-application-global": "2.0.1",
     "ember-load-initializers": "2.1.2",
     "ember-maybe-import-regenerator": "1.0.0",
     "ember-qunit": "5.1.5",
     "ember-resolver": "8.0.3",
-    "ember-source": "3.28.8",
+    "ember-source": "3.28.9",
     "ember-source-channel-url": "3.0.0",
     "ember-try": "2.0.0",
     "loader.js": "4.7.0",
     "miragejs": "0.1.43",
     "npm-run-all": "4.1.5",
-    "qunit": "2.18.1",
+    "qunit": "2.19.1",
     "qunit-dom": "2.0.0",
-    "sass": "1.50.0",
+    "sass": "1.51.0",
     "webpack": "5.72.0"
   },
   "engines": {

package/translations/de.yaml

@@ -11,17 +11,19 @@ caluma:
     send-error: "Fehler beim Versenden der offenen Anfragen"
     complete-error: "Fehler beim Abschliessen der Zirkulation"
 
+    more: "mehr"
+    less: "weniger"
+
+    last-modified: "Zuletzt bearbeitet von {user} am {date} um {time}"
+    details: "Details"
+
     edit:
-      title: "Anfrage bearbeiten"
       link: "Bearbeiten"
-
       send: "Senden"
       send-error: "Fehler beim Senden der Anfrage"
 
     answer:
-      title: "Anfrage beantworten"
       link: "Beantworten"
-
       release-for-review: "Zur Kontrolle freigeben"
       release-adjustment-for-review: "Anpassung zur Kontrolle freigeben"
       confirm: "Bestätigen"

package/translations/en.yaml

@@ -12,17 +12,19 @@ caluma:
     send-error: "Error while sending pending inquiries"
     complete-error: "Error while completing distribution"
 
+    more: "more"
+    less: "less"
+
+    last-modified: "Last modified by {user} on {date} at {time}"
+    details: "Details"
+
     edit:
-      title: "Edit inquiry"
       link: "Edit"
-
       send: "Send"
       send-error: "Error while sending the inquiry"
 
     answer:
-      title: "Answer inquiry"
       link: "Answer"
-
       release-for-review: "Release for review"
       release-adjustment-for-review: "Release adjustment for review"
       confirm: "Confirm"

package/translations/fr.yaml

@@ -11,17 +11,19 @@ caluma:
     send-error: "Erreur lors de l'envoi des demandes ouvertes"
     complete-error: "Erreur lors de la terminaison de la distribution"
 
+    more: "plus"
+    less: "moins"
+
+    last-modified: "Dernière modification par {user} le {date} à {time}"
+    details: "Détails"
+
     edit:
-      title: "Modifier la demande"
       link: "Modifier"
-
       send: "Envoyer"
       send-error: "Erreur lors de l'envoi de la demande"
 
     answer:
-      title: "Répondre à la demande"
       link: "Répondre"
-
       release-for-review: "Valider pour vérification"
       release-adjustment-for-review: "Valider la révision pour vérification"
       confirm: "Confirmer"