@projectcaluma/ember-distribution 12.5.0 → 12.7.0

package/addon/abilities/distribution.js

@@ -14,7 +14,7 @@ export default class DistributionAbility extends Ability {
   get canSendInquiries() {
     return (
       !this.config.ui.readonly &&
-      (this.config.permissions.sendInquiry?.(null) ?? true) &&
+      (this.config.permissions.sendInquiry?.(this.distribution) ?? true) &&
       this.distribution.controls.value?.send.edges.filter(
         hasStatus("SUSPENDED"),
       ).length > 0
@@ -24,7 +24,7 @@ export default class DistributionAbility extends Ability {
   get canCreateInquiry() {
     return (
       !this.config.ui.readonly &&
-      (this.config.permissions.createInquiry?.() ?? true) &&
+      (this.config.permissions.createInquiry?.(this.distribution) ?? true) &&
       this.distribution.controls.value?.create.edges.filter(hasStatus("READY"))
         .length > 0
     );
@@ -33,7 +33,7 @@ export default class DistributionAbility extends Ability {
   get canCheckInquiries() {
     return (
       !this.config.ui.readonly &&
-      (this.config.permissions.checkInquiries?.() ?? true) &&
+      (this.config.permissions.checkInquiries?.(this.distribution) ?? true) &&
       this.distribution.controls.value?.check.edges.filter(hasStatus("READY"))
         .length > 0
     );
@@ -42,7 +42,8 @@ export default class DistributionAbility extends Ability {
   get canComplete() {
     return (
       !this.config.ui.readonly &&
-      (this.config.permissions.completeDistribution?.() ?? true) &&
+      (this.config.permissions.completeDistribution?.(this.distribution) ??
+        true) &&
       this.distribution.controls.value?.complete.edges.filter(
         hasStatus("READY"),
       ).length > 0
@@ -52,7 +53,8 @@ export default class DistributionAbility extends Ability {
   get canReopen() {
     return (
       !this.config.ui.readonly &&
-      (this.config.permissions.reopenDistribution?.() ?? true) &&
+      (this.config.permissions.reopenDistribution?.(this.distribution) ??
+        true) &&
       this.distribution.controls.value?.case.edges[0]?.node.parentWorkItem.addressedGroups
         .map(String)
         .includes(String(this.calumaOptions.currentGroupId)) &&

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

@@ -59,7 +59,12 @@ export default class CdInquiryDialogInquiryPartComponent extends Component {
 
     return this.args.type === "answer"
       ? this.args.inquiry.childCase.document.info.edges
-          .filter((edge) => !isEmpty(edge.node.value))
+          .filter(
+            (edge) =>
+              !isEmpty(edge.node.value) ||
+              !isEmpty(edge.node.selectedOption) ||
+              !isEmpty(edge.node.selectedOptions),
+          )
           .sort(
             (a, b) =>
               questions.indexOf(a.node.question.slug) -
@@ -67,7 +72,11 @@ export default class CdInquiryDialogInquiryPartComponent extends Component {
           )
           .map((edge) => ({
             question: edge.node.question.label,
-            value: edge.node.value,
+            value: edge.node.selectedOption // single choice answer
+              ? edge.node.selectedOption.label
+              : edge.node.selectedOptions // multiple choice answer
+                ? edge.node.selectedOptions.edges.map((edge) => edge.node.label)
+                : edge.node.value, // regular answer
           }))
       : null;
   }

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

@@ -0,0 +1,23 @@
+{{! template-lint-disable require-presentational-children }}
+<tr
+  class="uk-background-muted uk-text-bold"
+  role="button"
+  {{on "click" (fn (mut this.isExpanded) (not this.isExpanded))}}
+  data-test-group-type={{@type.name}}
+>
+  <td colspan="3" class="">
+    <div class="uk-flex uk-flex-between">
+      {{t @type.name}}
+      <UkIcon @icon={{if this.isExpanded "chevron-up" "chevron-down"}} />
+    </div>
+  </td>
+</tr>
+{{#if this.isExpanded}}
+  {{#each @type.groups as |group|}}
+    <CdInquiryNewForm::Group
+      @group={{group}}
+      @selectedGroups={{@selectedGroups}}
+      @updateSelectedGroups={{@updateSelectedGroups}}
+    />
+  {{/each}}
+{{/if}}

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

@@ -0,0 +1,15 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+
+export default class CdInquiryNewFormGroupTypeComponent extends Component {
+  @tracked _isExpanded = true;
+
+  get isExpanded() {
+    // if we are searching all the groups need to be expanded anyway
+    return this.args.search !== "" ? true : this._isExpanded;
+  }
+
+  set isExpanded(value) {
+    this._isExpanded = value;
+  }
+}

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

@@ -0,0 +1,25 @@
+{{! template-lint-disable require-presentational-children }}
+<tr
+  role="checkbox"
+  data-test-group={{@group.identifier}}
+  aria-checked={{includes @group.identifier @selectedGroups}}
+  {{on "click" (fn @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 @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>

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

@@ -1,15 +1,17 @@
-<div class="uk-margin-bottom uk-button-group">
-  {{#each-in this.config.new.types as |slug config|}}
-    {{#unless config.disabled}}
-      <UkButton
-        data-test-type={{slug}}
-        @label={{t config.label}}
-        @color={{if (includes slug @selectedTypes) "primary" "default"}}
-        @onClick={{fn this.updateSelectedTypes slug}}
-      />
-    {{/unless}}
-  {{/each-in}}
-</div>
+{{#unless this.showAllServices}}
+  <div class="uk-margin-bottom uk-button-group" data-test-group-toggle-bar>
+    {{#each-in this.config.new.types as |slug config|}}
+      {{#unless config.disabled}}
+        <UkButton
+          data-test-type={{slug}}
+          @label={{t config.label}}
+          @color={{if (includes slug @selectedTypes) "primary" "default"}}
+          @onClick={{fn this.updateSelectedTypes slug}}
+        />
+      {{/unless}}
+    {{/each-in}}
+  </div>
+{{/unless}}
 
 <div class="uk-search uk-search-default uk-width-1-1">
   <span class="uk-search-icon-flip" uk-search-icon></span>
@@ -30,36 +32,30 @@
   </div>
 {{else if this.groups.value.length}}
   <table
-    class="uk-table uk-table-striped uk-table-hover uk-table-small uk-table-middle group-list"
+    class={{concat
+      "uk-table uk-table-hover uk-table-small uk-table-middle group-list "
+      (if this.showAllServices "uk-table-divider" "uk-table-striped")
+    }}
   >
     <tbody>
-      {{#each this.groups.value as |group|}}
-        {{! template-lint-disable require-presentational-children }}
-        <tr
-          role="checkbox"
-          data-test-group={{group.identifier}}
-          aria-checked={{includes group.identifier @selectedGroups}}
-          {{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 @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}}
+      {{#if this.showAllServices}}
+        {{#each this.groupTypes as |type|}}
+          <CdInquiryNewForm::GroupType
+            @type={{type}}
+            @selectedGroups={{@selectedGroups}}
+            @updateSelectedGroups={{this.updateSelectedGroups}}
+            @search={{@search}}
+          />
+        {{/each}}
+      {{else}}
+        {{#each this.groups.value as |group|}}
+          <CdInquiryNewForm::Group
+            @group={{group}}
+            @selectedGroups={{@selectedGroups}}
+            @updateSelectedGroups={{this.updateSelectedGroups}}
+          />
+        {{/each}}
+      {{/if}}
     </tbody>
   </table>
 {{else}}

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

@@ -20,8 +20,28 @@ export default class CdInquiryNewFormSelectComponent extends Component {
 
   @config config;
 
+  get showAllServices() {
+    return this.config.ui?.new?.showAllServices;
+  }
+
+  get groupTypes() {
+    return Object.entries(this.config.new.types)
+      .filter(([, { disabled }]) => !disabled)
+      .map(([identifier, group]) => ({
+        identifier,
+        name: group.label,
+        config: group.config,
+        groups: this.groups?.value?.filter(
+          (group) => group.type === identifier,
+        ),
+      }));
+  }
+
   groups = trackedTask(this, this.fetchGroups, () => [
-    this.args.selectedTypes,
+    // if we want to show all services we need to fetch all groups
+    this.showAllServices
+      ? Object.keys(this.config.new.types)
+      : this.args.selectedTypes,
     this.args.search,
   ]);
 
@@ -69,6 +89,7 @@ export default class CdInquiryNewFormSelectComponent extends Component {
           identifier: group[this.calumaOptions.groupIdentifierProperty],
           name: group[this.calumaOptions.groupNameProperty],
           config: this.config.new.types[type],
+          type,
         }));
       })
       .sort((a, b) => a.name.localeCompare(b.name));

package/addon/components/cd-truncated.hbs

@@ -1,8 +1,16 @@
-<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>
+{{#if (is-array @text)}}
+  <UkList @bullet={{true}} class="uk-margin-remove" ...attributes as |list|>
+    {{#each @text as |item|}}
+      <list.item>{{item}}</list.item>
+    {{/each}}
+  </UkList>
+{{else}}
+  <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>
+{{/if}}

package/addon/gql/fragments/inquiry-answer.graphql

@@ -52,6 +52,18 @@ fragment InquiryAnswer on Document {
         }
         ... on StringAnswer {
           value
+          selectedOption {
+            label
+          }
+        }
+        ... on ListAnswer {
+          selectedOptions {
+            edges {
+              node {
+                label
+              }
+            }
+          }
         }
       }
     }

package/addon/templates/index.hbs

@@ -1,7 +1,17 @@
 <div class="uk-text-center uk-text-muted">
   {{svg-jar "distribution" class="uk-inline" width=200}}
   <p class="uk-margin-medium uk-margin-remove-horizontal">
-    {{t "caluma.distribution.empty"}}
+    {{#if
+      (or
+        (can "create inquiry of distribution")
+        (can "complete distribution")
+        (can "reopen distribution")
+      )
+    }}
+      {{t "caluma.distribution.empty"}}
+    {{else}}
+      {{t "caluma.distribution.no-actions"}}
+    {{/if}}
   </p>
   <CdNavigation::Controls @useButtons={{true}} />
 </div>

package/addon/utils/inquiry-deadline.js

@@ -35,10 +35,10 @@ function decorator(
         color: isDone
           ? "muted"
           : isOverdue
-          ? "danger"
-          : isWarning
-          ? "warning"
-          : "emphasis",
+            ? "danger"
+            : isWarning
+              ? "warning"
+              : "emphasis",
       };
     },
   };

package/addon/utils/inquiry-status.js

@@ -67,12 +67,12 @@ function decorator(
       const statusConfig = isSkipped
         ? INQUIRY_STATUS.SKIPPED
         : isInProgress
-        ? INQUIRY_STATUS.IN_PROGRESS
-        : isDraft
-        ? INQUIRY_STATUS.DRAFT
-        : isSent
-        ? INQUIRY_STATUS.SENT
-        : this.config.inquiry.answer.statusMapping[answer.value];
+          ? INQUIRY_STATUS.IN_PROGRESS
+          : isDraft
+            ? INQUIRY_STATUS.DRAFT
+            : isSent
+              ? INQUIRY_STATUS.SENT
+              : this.config.inquiry.answer.statusMapping[answer.value];
 
       return {
         slug: statusConfig.slug,

package/app/components/cd-inquiry-new-form/group-type.js

@@ -0,0 +1 @@
+export { default } from "@projectcaluma/ember-distribution/components/cd-inquiry-new-form/group-type";

package/app/components/cd-inquiry-new-form/group.js

@@ -0,0 +1 @@
+export { default } from "@projectcaluma/ember-distribution/components/cd-inquiry-new-form/group";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-distribution",
-  "version": "12.5.0",
+  "version": "12.7.0",
   "description": "Ember engine for the Caluma distribution module.",
   "keywords": [
     "ember-addon",
@@ -10,70 +10,86 @@
   "homepage": "https://docs.caluma.io/ember-caluma",
   "repository": "github:projectcaluma/ember-caluma",
   "dependencies": {
-    "@ember/legacy-built-in-components": "^0.4.2",
+    "@babel/core": "^7.23.6",
+    "@ember/legacy-built-in-components": "^0.5.0",
     "@ember/string": "^3.1.1",
-    "@embroider/macros": "^1.13.0",
+    "@embroider/macros": "^1.13.3",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "ember-apollo-client": "~4.0.2",
-    "ember-auto-import": "^2.6.3",
+    "ember-auto-import": "^2.7.0",
     "ember-can": "^4.2.0",
-    "ember-cli-babel": "^7.26.11",
-    "ember-cli-htmlbars": "^6.2.0",
-    "ember-concurrency": "^3.0.0",
-    "ember-engines-router-service": "^0.3.0",
+    "ember-cli-babel": "^8.2.0",
+    "ember-cli-htmlbars": "^6.3.0",
+    "ember-concurrency": "^3.1.1",
+    "ember-engines-router-service": "^0.5.0",
     "ember-fetch": "^8.1.2",
     "ember-flatpickr": "^4.0.0",
-    "ember-intl": "^5.7.2",
-    "ember-resources": "^6.4.0",
-    "ember-svg-jar": "^2.4.3",
+    "ember-intl": "^6.4.0",
+    "ember-resources": "^6.4.2",
+    "ember-svg-jar": "^2.4.7",
     "ember-test-selectors": "^6.0.0",
-    "ember-uikit": "^8.0.0",
+    "ember-uikit": "^9.0.0",
     "graphql": "^15.8.0",
     "graphql-tag": "^2.12.6",
     "lodash.merge": "^4.6.2",
-    "luxon": "^3.3.0",
+    "luxon": "^3.4.4",
     "tracked-toolbox": "^2.0.0",
-    "@projectcaluma/ember-core": "^12.5.0",
-    "@projectcaluma/ember-form": "^12.5.0",
-    "@projectcaluma/ember-workflow": "^12.5.0"
+    "@projectcaluma/ember-core": "^12.7.0",
+    "@projectcaluma/ember-workflow": "^12.7.0",
+    "@projectcaluma/ember-form": "^12.7.0"
   },
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
-    "@ember/test-helpers": "3.2.0",
-    "@embroider/test-setup": "3.0.1",
-    "@faker-js/faker": "8.0.2",
+    "@ember/test-helpers": "3.2.1",
+    "@embroider/test-setup": "3.0.3",
+    "@faker-js/faker": "8.3.1",
     "broccoli-asset-rev": "3.0.0",
-    "ember-cli": "4.12.2",
-    "ember-cli-code-coverage": "2.0.0",
+    "ember-cli": "5.5.0",
+    "ember-cli-clean-css": "3.0.0",
+    "ember-cli-code-coverage": "2.0.3",
     "ember-cli-dependency-checker": "3.3.2",
     "ember-cli-inject-live-reload": "2.1.0",
-    "ember-cli-mirage": "3.0.0-alpha.3",
+    "ember-cli-mirage": "3.0.2",
     "ember-cli-sass": "11.0.1",
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
     "ember-engines": "0.9.0",
     "ember-load-initializers": "2.1.2",
-    "ember-qunit": "7.0.0",
-    "ember-resolver": "11.0.0",
-    "ember-source": "4.12.3",
+    "ember-qunit": "8.0.2",
+    "ember-resolver": "11.0.1",
+    "ember-source": "5.5.0",
     "ember-source-channel-url": "3.0.0",
-    "ember-try": "2.0.0",
+    "ember-try": "3.0.0",
     "loader.js": "4.7.0",
-    "miragejs": "0.1.47",
-    "qunit": "2.19.4",
-    "qunit-dom": "2.0.0",
-    "sass": "1.66.0",
-    "uikit": "3.16.26",
-    "webpack": "5.88.2",
-    "@projectcaluma/ember-testing": "12.5.0"
+    "miragejs": "0.1.48",
+    "qunit": "2.20.0",
+    "qunit-dom": "3.0.0",
+    "sass": "1.69.5",
+    "uikit": "3.17.11",
+    "webpack": "5.89.0",
+    "@projectcaluma/ember-testing": "12.7.0"
   },
   "peerDependencies": {
     "ember-engines": "^0.9.0",
     "ember-source": "^4.0.0"
   },
+  "dependenciesMeta": {
+    "@projectcaluma/ember-core": {
+      "injected": true
+    },
+    "@projectcaluma/ember-form": {
+      "injected": true
+    },
+    "@projectcaluma/ember-testing": {
+      "injected": true
+    },
+    "@projectcaluma/ember-workflow": {
+      "injected": true
+    }
+  },
   "engines": {
-    "node": "14.* || 16.* || >= 18"
+    "node": ">= 18"
   },
   "ember": {
     "edition": "octane"

package/translations/de.yaml

@@ -1,6 +1,7 @@
 caluma:
   distribution:
     empty: "Es wurden noch keine Anfragen erstellt."
+    no-actions: "Im aktuellen Zustand stehen keine Aktionen zur Verfügung."
     start: "Zirkulation starten"
     send: "Offene Anfragen versenden"
     complete: "Zirkulation abschliessen"

package/translations/en.yaml

@@ -1,6 +1,7 @@
 caluma:
   distribution:
     empty: "No inquiries have been created yet."
+    no-actions: "There are no actions available in the current state."
     start: "Start circulation"
     send: "Send pending inquiries"
     complete: "Complete circulation"

package/translations/fr.yaml

@@ -1,6 +1,7 @@
 caluma:
   distribution:
     empty: "Aucune demande n'a encore été créée."
+    no-actions: "Aucune action n'est disponible dans l'état actuel."
     start: "Lancer la procédure de circulation"
     send: "Envoyer les demandes ouvertes"
     complete: "Clore la circulation"

package/tsconfig.declarations.json

@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "declarationDir": "declarations",
+    "emitDeclarationOnly": true,
+    "noEmit": false,
+    "rootDir": "."
+  },
+  "include": ["addon", "addon-test-support"]
+}