@projectcaluma/ember-distribution 1.0.0-beta.11 → 1.0.0-beta.12

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+# [@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)
 
 

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-part.hbs

@@ -1,8 +1,16 @@
 <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")}}
       <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")}}
       <UkIcon @icon="reply" class="uk-margin-small-right" />
       {{group-name @inquiry.addressedGroups}}

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.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,34 +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}}
-            <UkIcon
-              @icon={{group.config.icon}}
-              class="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/config.js

@@ -38,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",
                 },
               },
             },

package/addon/gql/fragments/inquiry.graphql

@@ -1,3 +1,18 @@
+fragment InquiryAnswerButtons on Case {
+  workItems(tasks: $buttonTasks, status: READY) {
+    edges {
+      node {
+        id
+        status
+        task {
+          id
+          slug
+        }
+      }
+    }
+  }
+}
+
 fragment InquiryDeadlineDocument on Document {
   id
   deadline: answers(question: $deadlineQuestion) {
@@ -61,6 +76,7 @@ fragment InquiryDialog on WorkItem {
   }
   childCase {
     id
+    ...InquiryAnswerButtons
     document {
       ...InquiryStatusDocument
       info: answers(questions: $answerInfoQuestions) {

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/app/styles/@projectcaluma/ember-distribution.scss

@@ -1,3 +1,4 @@
 @import "../answer-form";
+@import "../group-list";
 @import "../inquiry-divider";
 @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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-distribution",
-  "version": "1.0.0-beta.11",
+  "version": "1.0.0-beta.12",
   "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.20",
     "@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,7 +35,7 @@
     "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",
@@ -47,9 +47,9 @@
   },
   "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",
+    "@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.8",
     "broccoli-asset-rev": "3.0.0",
     "ember-cli": "3.28.5",
@@ -71,12 +71,12 @@
     "ember-source-channel-url": "3.0.0",
     "ember-try": "2.0.0",
     "loader.js": "4.7.0",
-    "miragejs": "0.1.44",
+    "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.1"
+    "sass": "1.52.3",
+    "webpack": "5.73.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"

package/translations/de.yaml

@@ -29,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..."

package/translations/en.yaml

@@ -30,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..."

package/translations/fr.yaml

@@ -29,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..."