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

package/CHANGELOG.md

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

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

@@ -1,8 +1,11 @@
-<p class="uk-text-large uk-margin-remove">
-  {{@name}}
-  {{#if @status}}
-    <UkLabel @label={{@status}} class="uk-margin-left" />
-  {{/if}}
+<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)}}

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

@@ -5,19 +5,14 @@
 >
   <:default as |content|>
 
-    <div class="uk-position-relative">
-      <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}}
-        class="uk-margin-remove uk-position-center-right"
-      />
-    </div>
+    <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 />
 

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

@@ -1,17 +1,12 @@
 {{#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
   >
     <UkIcon

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

@@ -1,21 +1,23 @@
 <div class="uk-margin-remove-last-child">
-  <p
-    class="uk-flex uk-flex-middle uk-text-large uk-margin-remove"
-    data-test-title
-  >
+  <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" />
-      {{group-name @inquiry.controllingGroups}}
-      {{#if
-        (and (can "answer inquiry" @inquiry) (not @disabled) this.answerStatus)
-      }}
-        <UkLabel @label={{this.answerStatus}} class="uk-margin-left" />
-      {{/if}}
+      <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" />
-      {{group-name @inquiry.addressedGroups}}
+      <div class="uk-width-expand">{{group-name @inquiry.addressedGroups}}</div>
     {{/if}}
-  </p>
+    {{yield}}
+  </div>
 
   <ul
     class="uk-subnav uk-subnav-divider

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

@@ -34,9 +34,16 @@ export default class CdInquiryDialogInquiryPartComponent extends Component {
   }
 
   get answerInfo() {
+    const questions = this.config.inquiry.answer.infoQuestions ?? [];
+
     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,

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-edit-form.hbs

@@ -15,8 +15,12 @@
     />
 
     <hr />
-
-    {{#if (cannot "send inquiry" this.inquiry)}}
+    {{#if
+      (and
+        (cannot "send inquiry" this.inquiry)
+        (eq this.inquiry.status "SUSPENDED")
+      )
+    }}
       <div class="uk-alert uk-alert-warning uk-flex uk-flex-middle">
         <UkIcon @icon="warning" class="uk-margin-small-right" />
         {{t "caluma.distribution.edit.send-not-allowed"}}

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

@@ -33,14 +33,14 @@ export default class CdNavigationControlsComponent extends Component {
         "allWorkItems.totalCount"
       );
 
-      if (
-        incompleteInquiries > 0 &&
-        !(yield confirm(
-          this.intl.t("caluma.distribution.complete-confirm", {
-            count: incompleteInquiries,
-          })
-        ))
-      ) {
+      const confirmText =
+        incompleteInquiries === 0
+          ? this.intl.t("caluma.distribution.complete-confirm-empty")
+          : this.intl.t("caluma.distribution.complete-confirm", {
+              count: incompleteInquiries,
+            });
+
+      if (!(yield confirm(confirmText))) {
         return;
       }
 

package/addon/engine.js

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

package/addon/gql/fragments/inquiry.graphql

@@ -86,6 +86,7 @@ fragment InquiryDialog on WorkItem {
             question {
               id
               label
+              slug
             }
             ... on StringAnswer {
               value

package/addon/templates/application.hbs

@@ -11,6 +11,7 @@
     <div class={{if this.config.ui.stack "uk-width-1-1" "uk-width-1-3"}}>
       <CdNavigation @caseId={{@model}} />
     </div>
+    {{#if this.config.ui.stack}}<div class="uk-width-1-1"><hr /></div>{{/if}}
     <div class={{if this.config.ui.stack "uk-width-1-1" "uk-width-2-3"}}>
       {{outlet}}
     </div>

package/addon/utils/inquiry-status.js

@@ -10,7 +10,7 @@ export const ICON_MAP = {
   [INQUIRY_STATUS.SENT]: "comment",
   [INQUIRY_STATUS.POSITIVE]: "check",
   [INQUIRY_STATUS.NEGATIVE]: "close",
-  [INQUIRY_STATUS.NEEDS_INTERACTION]: "refresh",
+  [INQUIRY_STATUS.NEEDS_INTERACTION]: "file-text",
 };
 
 export const COLOR_MAP = {

package/app/styles/_inquiry-divider.scss

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-distribution",
-  "version": "1.0.0-beta.13",
+  "version": "1.0.0-beta.16",
   "description": "Ember engine for the Caluma distribution module.",
   "keywords": [
     "ember-addon",
@@ -19,38 +19,38 @@
   },
   "dependencies": {
     "@ember/string": "^3.0.0",
-    "@embroider/macros": "^1.7.1",
+    "@embroider/macros": "^1.8.3",
     "@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.21",
+    "@projectcaluma/ember-core": "^11.0.0-beta.9",
+    "@projectcaluma/ember-form": "^11.0.0-beta.23",
     "@projectcaluma/ember-workflow": "^11.0.0-beta.7",
-    "ember-apollo-client": "^4.0.2",
+    "ember-apollo-client": "~4.0.2",
     "ember-auto-import": "^2.4.2",
     "ember-can": "^4.2.0",
     "ember-cli-babel": "^7.26.11",
-    "ember-cli-htmlbars": "^6.0.1",
+    "ember-cli-htmlbars": "^6.1.0",
     "ember-concurrency": "^2.2.1",
     "ember-engines-router-service": "^0.3.0",
     "ember-fetch": "^8.1.1",
     "ember-intl": "^5.7.2",
     "ember-pikaday": "^4.0.0",
-    "ember-resources": "^4.8.2",
+    "ember-resources": "^5.2.1",
     "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",
     "lodash.merge": "^4.6.2",
-    "luxon": "^2.4.0",
+    "luxon": "^3.0.1",
     "tracked-toolbox": "^1.2.3"
   },
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
     "@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",
+    "@embroider/test-setup": "1.8.3",
+    "@faker-js/faker": "7.4.0",
+    "@projectcaluma/ember-testing": "11.0.0-beta.11",
     "broccoli-asset-rev": "3.0.0",
     "ember-cli": "3.28.5",
     "ember-cli-code-coverage": "1.0.3",
@@ -61,7 +61,7 @@
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
     "ember-disable-prototype-extensions": "1.1.3",
-    "ember-engines": "0.8.22",
+    "ember-engines": "0.8.23",
     "ember-export-application-global": "2.0.1",
     "ember-load-initializers": "2.1.2",
     "ember-maybe-import-regenerator": "1.0.0",
@@ -75,8 +75,8 @@
     "npm-run-all": "4.1.5",
     "qunit": "2.19.1",
     "qunit-dom": "2.0.0",
-    "sass": "1.52.3",
-    "webpack": "5.73.0"
+    "sass": "1.54.4",
+    "webpack": "5.74.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"

package/translations/de.yaml

@@ -9,6 +9,7 @@ caluma:
       "Es gibt noch <b>{count} offene {count, plural, =1 {Anfrage} other {Anfragen}}</b>
       in der aktuellen Zirkulation. Wenn Sie die Zirkulation abschliessen, werden
       alle verbleibenden offenen Anfragen abgebrochen. Möchten Sie fortfahren?"
+    complete-confirm-empty: "Möchten Sie die Zirkulation wirklich abschliessen?"
     send-error: "Fehler beim Versenden der offenen Anfragen"
     complete-error: "Fehler beim Abschliessen der Zirkulation"
 

package/translations/en.yaml

@@ -10,6 +10,7 @@ caluma:
       {count, plural, =1 {inquiry} other {inquiries}}</b> on the current
       distribution. Completing the distribution will cause all remaining
       pending inquiries to be canceled. Would you like to continue?"
+    complete-confirm-empty: "Do you really want to complete the distribution?"
     send-error: "Error while sending pending inquiries"
     complete-error: "Error while completing distribution"
 

package/translations/fr.yaml

@@ -9,6 +9,7 @@ caluma:
       "Il y a <b>{count} {count, plural, =1 {demande} other {demandes}} en
       attente</b> sur la distribution actuelle. Si vous terminez la distribution,
       toutes les demandes en attente seront annulées. Voulez-vous continuer ?"
+    complete-confirm-empty: "Vous voulez vraiment fermer la circulation ?"
     send-error: "Erreur lors de l'envoi des demandes ouvertes"
     complete-error: "Erreur lors de la terminaison de la distribution"