@projectcaluma/ember-distribution 1.0.0-beta.7 → 11.0.0-beta.24

package/CHANGELOG.md

@@ -1,3 +1,98 @@
+# [@projectcaluma/ember-distribution-v1.0.0-beta.16](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-distribution-v1.0.0-beta.15...@projectcaluma/ember-distribution-v1.0.0-beta.16) (2022-08-15)
+
+
+### Features
+
+* **distribution:** always show confirmation dialog when completing ([507e062](https://github.com/projectcaluma/ember-caluma/commit/507e062afa32e7d4b8d64a2016a4c795a6e632cf))
+
+# [@projectcaluma/ember-distribution-v1.0.0-beta.15](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-distribution-v1.0.0-beta.14...@projectcaluma/ember-distribution-v1.0.0-beta.15) (2022-07-18)
+
+
+### Bug Fixes
+
+* **distribution:** include fetch service dependency ([841c233](https://github.com/projectcaluma/ember-caluma/commit/841c23320f07968a8181bfc9273f592652049516))
+* **distribution:** only show permission info for suspended inquiries ([bd594f8](https://github.com/projectcaluma/ember-caluma/commit/bd594f8ac026af8bf0579dc947862710363ac028))
+
+# [@projectcaluma/ember-distribution-v1.0.0-beta.14](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-distribution-v1.0.0-beta.13...@projectcaluma/ember-distribution-v1.0.0-beta.14) (2022-07-06)
+
+
+### Bug Fixes
+
+* **distribution:** fix title and deadline alignment and icon size ([eb6f495](https://github.com/projectcaluma/ember-caluma/commit/eb6f495408decdf7d735ad2dbc702ee7e4e0ede5))
+* **distribution:** fix title layout with status ([dc49b82](https://github.com/projectcaluma/ember-caluma/commit/dc49b82b3d2f3b9962e9373506e286b4b7ca7225))
+* **distribution:** order answers by configured question order ([668383f](https://github.com/projectcaluma/ember-caluma/commit/668383f5526403187ee66b4ac85cc8ace4ad061a))
+
+
+### Features
+
+* **distribution:** change needs-interaction status icon to text file ([695c6db](https://github.com/projectcaluma/ember-caluma/commit/695c6db4b7d87af87e334da7aece7e0f4b17129e))
+
+# [@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)
+
+
+### Features
+
+* **distribution:** add readonly mode ([2f45c98](https://github.com/projectcaluma/ember-caluma/commit/2f45c985a2fa387c79ca39c49c1e50dc37926352))
+* **distribution:** allow custom permissions from the host app ([8a997bf](https://github.com/projectcaluma/ember-caluma/commit/8a997bf4d921ff738a6cca956a4dd9cbabe8f7c5))
+
+# [@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)
+
+
+### Bug Fixes
+
+* **distribution:** inject store into distribution engine ([2e00d7f](https://github.com/projectcaluma/ember-caluma/commit/2e00d7f0707b7a36e6955d91baa340ce2af7e413))
+
 # [@projectcaluma/ember-distribution-v1.0.0-beta.7](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-distribution-v1.0.0-beta.6...@projectcaluma/ember-distribution-v1.0.0-beta.7) (2022-04-07)
 
 

package/addon/abilities/distribution.js

@@ -1,13 +1,19 @@
 import { inject as service } from "@ember/service";
 import { Ability } from "ember-can";
 
+import config from "@projectcaluma/ember-distribution/config";
+
 const hasStatus = (status) => (edge) => edge.node.status === status;
 
 export default class DistributionAbility extends Ability {
   @service distribution;
 
+  @config config;
+
   get canSendInquiries() {
     return (
+      !this.config.ui.readonly &&
+      (this.config.permissions.sendInquiry?.(null) ?? true) &&
       this.distribution.controls.value?.send.edges.filter(
         hasStatus("SUSPENDED")
       ).length > 0
@@ -16,6 +22,8 @@ export default class DistributionAbility extends Ability {
 
   get canCreateInquiry() {
     return (
+      !this.config.ui.readonly &&
+      (this.config.permissions.createInquiry?.() ?? true) &&
       this.distribution.controls.value?.create.edges.filter(hasStatus("READY"))
         .length > 0
     );
@@ -23,9 +31,20 @@ export default class DistributionAbility extends Ability {
 
   get canComplete() {
     return (
+      !this.config.ui.readonly &&
+      (this.config.permissions.completeDistribution?.() ?? true) &&
       this.distribution.controls.value?.complete.edges.filter(
         hasStatus("READY")
       ).length > 0
     );
   }
+
+  get canReopen() {
+    return (
+      !this.config.ui.readonly &&
+      (this.config.permissions.reopenDistribution?.() ?? true) &&
+      this.distribution.controls.value?.case.edges[0]?.node.parentWorkItem
+        .isRedoable
+    );
+  }
 }

package/addon/abilities/inquiry.js

@@ -10,6 +10,7 @@ export default class InquiryAbility extends Ability {
 
   get canEdit() {
     return (
+      !this.config.ui.readonly &&
       this.model?.task.slug === this.config.inquiry.task &&
       this.model?.status === "SUSPENDED" &&
       this.model?.controllingGroups
@@ -18,8 +19,17 @@ export default class InquiryAbility extends Ability {
     );
   }
 
+  get canSend() {
+    return this.config.permissions.sendInquiry?.(this.model) ?? true;
+  }
+
+  get canWithdraw() {
+    return this.config.permissions.withdrawInquiry?.(this.model) ?? true;
+  }
+
   get canAnswer() {
     return (
+      !this.config.ui.readonly &&
       this.model?.task.slug === this.config.inquiry.task &&
       this.model?.status === "READY" &&
       this.model?.addressedGroups
@@ -30,10 +40,20 @@ export default class InquiryAbility extends Ability {
 
   get canEditAnswerForm() {
     return (
+      !this.config.ui.readonly &&
       this.canAnswer &&
       this.model?.childCase.workItems.edges.some(
         (edge) => edge.node.task.__typename === "CompleteWorkflowFormTask"
       )
     );
   }
+
+  get canCompleteChildWorkItem() {
+    return (
+      this.config.permissions.completeInquiryChildWorkItem?.(
+        this.model,
+        this.task
+      ) ?? true
+    );
+  }
 }

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

@@ -0,0 +1,20 @@
+<p class="uk-text-large uk-margin-remove uk-flex uk-flex-middle">
+  <div class="uk-width-expand">
+    {{@name}}
+    {{#if @status}}
+      <UkLabel @label={{@status}} class="uk-margin-left" />
+    {{/if}}
+  </div>
+  {{yield}}
+</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,38 @@
   @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>
+
+    <CdDocumentHeader
+      @name={{content.document.rootForm.raw.name}}
+      @status={{if (eq this.inquiry.status "READY") this.answerStatus}}
+      @modifiedAt={{this.inquiry.childCase.document.modifiedContentAt}}
+      @modifiedBy={{this.inquiry.childCase.document.modifiedContentByUser}}
+    >
+      <CdInquiryDialog::InquiryDeadline @inquiry={{this.inquiry}} />
+    </CdDocumentHeader>
+
+    <hr />
+
+    <div class="uk-margin uk-text-italic inquiry-answer-form__request">
+      <CdInquiryDialog::InquiryPart
+        @inquiry={{this.inquiry}}
+        @type="request"
+        @disabled={{true}}
+      />
+    </div>
+
+    {{#if
+      (and
+        (not this.buttons.length)
+        (can "edit answer form of inquiry" this.inquiry)
+      )
+    }}
+      <div class="uk-alert uk-alert-warning uk-flex uk-flex-middle">
+        <UkIcon @icon="warning" class="uk-margin-small-right" />
+        {{t "caluma.distribution.answer.complete-not-allowed"}}
+        {{t "caluma.distribution.not-allowed-hint"}}
+      </div>
+    {{/if}}
 
     <content.form />
 
@@ -23,6 +46,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 +59,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

@@ -1,40 +1,55 @@
 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 { 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 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;
   @service router;
+  @service abilities;
   @service notification;
 
   @config config;
 
   @queryManager apollo;
 
-  _inquiry = useTask(this, this.fetchInquiryAnswer, () => [this.args.inquiry]);
+  @inquiryAnswerStatus({ inquiryProperty: "inquiry" }) answerStatus;
+
+  _inquiry = trackedTask(this, this.fetchInquiryAnswer, () => [
+    this.args.inquiry,
+  ]);
 
   get inquiry() {
     return this._inquiry.value?.[0]?.node;
   }
 
   get buttons() {
-    return this.inquiry?.childCase.workItems.edges.map((edge) => {
-      const config = this.config.inquiry.answer.buttons[edge.node.task.slug];
+    return this.inquiry?.childCase.workItems.edges
+      .map((edge) => {
+        const config = this.config.inquiry.answer.buttons[edge.node.task.slug];
 
-      return {
-        workItemId: decodeId(edge.node.id),
-        color: config.color,
-        isFormButton: edge.node.task.__typename === "CompleteWorkflowFormTask",
-        label: this.intl.t(config.label),
-      };
-    });
+        return this.abilities.can(
+          "complete child work item of inquiry",
+          this.inquiry,
+          { task: edge.node.task.slug }
+        )
+          ? {
+              workItemId: decodeId(edge.node.id),
+              color: config.color,
+              isFormButton:
+                edge.node.task.__typename === "CompleteWorkflowFormTask",
+              label: this.intl.t(config.label),
+            }
+          : null;
+      })
+      .filter(Boolean);
   }
 
   @dropTask
@@ -45,6 +60,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"
@@ -65,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

@@ -1,24 +1,18 @@
 {{#if this.deadline.value}}
   <div
-    class="uk-position-top-right
-      {{if
-        this.config.ui.small
-        'uk-margin-top uk-margin-right'
-        'uk-margin-medium-top uk-margin-medium-right'
-      }}
+    class="uk-flex-inline uk-flex-middle
       {{if
         this.isWithdrawn
         'uk-text-muted'
         (concat 'uk-text-' this.deadline.color)
-      }}
-      uk-flex-inline uk-flex-middle"
+      }}"
+    data-test-deadline
+    ...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}} uk-tooltip={{this.status.label}} />
   </div>
 </div>

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

@@ -1,48 +1,111 @@
-<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">
+  <div class="uk-flex uk-flex-middle uk-text-large" data-test-title>
+    {{#if (eq @type "request")}}
+      <UkIcon @icon="forward" class="uk-margin-small-right" />
+      <div class="uk-width-expand 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}}
+      </div>
+    {{else if (eq @type "answer")}}
+      <UkIcon @icon="reply" class="uk-margin-small-right" />
+      <div class="uk-width-expand">{{group-name @inquiry.addressedGroups}}</div>
+    {{/if}}
+    {{yield}}
+  </div>
 
-<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>
+        {{#if (can "withdraw inquiry" @inquiry)}}
+          <li>
+            <a
+              href=""
+              {{on "click" (perform this.withdraw)}}
+              data-test-withdraw
+            >
+              {{t "caluma.distribution.withdraw.link"}}
+            </a>
+          </li>
+        {{/if}}
+      {{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";
@@ -7,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;
@@ -17,21 +19,36 @@ export default class CdInquiryDialogInquiryPartComponent extends Component {
 
   @config config;
 
+  @inquiryAnswerStatus answerStatus;
+
   get date() {
     const key = this.args.type === "request" ? "createdAt" : "closedAt";
 
     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;
+  }
+
+  get answerInfo() {
+    const questions = this.config.inquiry.answer.infoQuestions ?? [];
 
-    return document.info.edges[0]?.node.value;
+    return this.args.type === "answer"
+      ? this.args.inquiry.childCase.document.info.edges
+          .filter((edge) => !isEmpty(edge.node.value))
+          .sort(
+            (a, b) =>
+              questions.indexOf(a.node.question.slug) -
+              questions.indexOf(b.node.question.slug)
+          )
+          .map((edge) => ({
+            question: edge.node.question.label,
+            value: edge.node.value,
+          }))
+      : null;
   }
 
   @dropTask

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

@@ -3,14 +3,18 @@
     {{if this.config.ui.small 'uk-card-small'}}"
 >
   <div class="uk-card-body">
-    <CdInquiryDialog::InquiryDeadline @inquiry={{@inquiry}} />
-
     {{#if this.hasAnswer}}
-      <CdInquiryDialog::InquiryPart @inquiry={{@inquiry}} @type="answer" />
+      <CdInquiryDialog::InquiryPart @inquiry={{@inquiry}} @type="answer">
+        <CdInquiryDialog::InquiryDeadline @inquiry={{@inquiry}} />
+      </CdInquiryDialog::InquiryPart>
 
       <CdInquiryDialog::InquiryDivider @inquiry={{@inquiry}} />
     {{/if}}
 
-    <CdInquiryDialog::InquiryPart @inquiry={{@inquiry}} @type="request" />
+    <CdInquiryDialog::InquiryPart @inquiry={{@inquiry}} @type="request">
+      {{#unless this.hasAnswer}}
+        <CdInquiryDialog::InquiryDeadline @inquiry={{@inquiry}} />
+      {{/unless}}
+    </CdInquiryDialog::InquiryPart>
   </div>
 </article>

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

@@ -1,6 +1,25 @@
 {{#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">
+      <button
+        type="button"
+        class="uk-icon-button"
+        uk-tooltip={{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>
     {{#each this.inquiries as |inquiry|}}
       <CdInquiryDialog::Inquiry @inquiry={{inquiry}} />