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

package/CHANGELOG.md

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

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

@@ -14,12 +14,10 @@
       uk-flex-inline uk-flex-middle"
     ...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}} title={{this.status.label}} />
   </div>
 </div>

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

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

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

@@ -5,13 +5,19 @@
     (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}}
+      <button
+        type="button"
+        class="uk-icon-button"
+        title={{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>

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

@@ -100,12 +100,10 @@
             {{group-name group.identifier}}
           </label>
           {{#if group.config.icon}}
-            {{svg-jar
-              group.config.icon
-              width="20"
-              height="20"
-              class=(concat "uk-text-" group.config.iconColor)
-            }}
+            <UkIcon
+              @icon={{group.config.icon}}
+              class="uk-text-{{group.config.iconColor}}"
+            />
           {{/if}}
         </li>
       {{/each}}

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

@@ -1,32 +1,41 @@
 <div class="uk-text-center uk-margin-small-top">
   {{#if (can "create inquiry of distribution")}}
-    <CdIconButton
-      @title={{t "caluma.distribution.new.title"}}
-      @icon="plus"
+    <LinkTo
       @route="new"
-    />
+      class="uk-icon-button"
+      title={{t "caluma.distribution.new.title"}}
+    >
+      <UkIcon @icon="plus" />
+    </LinkTo>
   {{/if}}
   {{#if (can "send inquiries of distribution")}}
-    <CdIconButton
-      @title={{t "caluma.distribution.send"}}
-      @icon="paper-plane-outline"
-      @fromSvgJar={{true}}
-      @gutterTop={{4}}
-      @gutterRight={{6}}
-      @gutterLeft={{4}}
-      @gutterBottom={{4}}
-      @onClick={{perform this.sendInquiries}}
-      @loading={{this.sendInquiries.isRunning}}
+    <button
+      type="button"
+      class="uk-icon-button"
+      title={{t "caluma.distribution.send"}}
       data-test-send-pending-inquiries
-    />
+      {{on "click" (perform this.sendInquiries)}}
+    >
+      {{#if this.sendInquiries.isRunning}}
+        <UkSpinner @ratio={{0.6}} />
+      {{else}}
+        <UkIcon @icon="comment" />
+      {{/if}}
+    </button>
   {{/if}}
   {{#if (can "complete distribution")}}
-    <CdIconButton
-      @icon="lock-closed-outline"
-      @fromSvgJar={{true}}
-      @onClick={{perform this.completeDistribution}}
-      @loading={{this.completeDistribution.isRunning}}
+    <button
+      type="button"
+      class="uk-icon-button"
+      title={{t "caluma.distribution.complete"}}
       data-test-complete-distribution
-    />
+      {{on "click" (perform this.completeDistribution)}}
+    >
+      {{#if this.completeDistribution.isRunning}}
+        <UkSpinner @ratio={{0.6}} />
+      {{else}}
+        <UkIcon @icon="lock" />
+      {{/if}}
+    </button>
   {{/if}}
 </div>

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

@@ -26,7 +26,7 @@ export default class CdNavigationControlsComponent extends Component {
         {
           query: incompleteInquiriesQuery,
           variables: {
-            caseId: this.args.caseId,
+            caseId: this.distribution.caseId,
             task: this.config.inquiry.task,
           },
         },

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

@@ -1,15 +1,18 @@
-<li class={{if this.isActive "uk-active"}}>
+<li class="uk-width-auto {{if this.isActive 'uk-active'}}">
   <LinkTo @route="inquiry" @model={{this.model}}>
-    <div class="uk-flex uk-flex-middle uk-width-1-1">
-      <div class="uk-width-expand uk-text-truncate">
-        {{#if (eq @type "addressed")}}
-          {{@inquiry.controllingGroupName}}
-        {{else}}
-          {{@inquiry.addressedGroupName}}
-        {{/if}}
-      </div>
+    {{#let
+      (if
+        (eq @type "addressed")
+        @inquiry.controllingGroupName
+        @inquiry.addressedGroupName
+      )
+      as |name|
+    }}
+      <span class="uk-width-expand uk-text-truncate" title={{name}}>
+        {{name}}
+      </span>
+    {{/let}}
 
-      <CdNavigation::StatusIndicator @inquiry={{@inquiry}} @type={{@type}} />
-    </div>
+    <CdNavigation::StatusIndicator @inquiry={{@inquiry}} @type={{@type}} />
   </LinkTo>
 </li>

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

@@ -1,5 +1,5 @@
-<li class="uk-margin-small-bottom">
-  <a href="" class="uk-margin-small-bottom" {{on "click" this.toggle}}>
+<li class="uk-margin-small-bottom uk-width-auto">
+  <a href="" {{on "click" this.toggle}}>
     <span class="uk-width-expand">
       {{t (concat "caluma.distribution.types." @type)}}
     </span>
@@ -12,7 +12,7 @@
 
   {{#if this.expanded}}
     {{#if @inquiries.length}}
-      <ul class="uk-tab uk-tab-left uk-margin-left">
+      <ul class="uk-tab uk-tab-left uk-margin-left uk-width-auto">
         {{#each this.inquiries as |inquiry|}}
           <CdNavigation::Item @inquiry={{inquiry}} @type={{@type}} />
         {{/each}}
@@ -20,7 +20,7 @@
     {{/if}}
 
     {{#if (eq @type "controlling")}}
-      <CdNavigation::Controls @caseId={{@caseId}} />
+      <CdNavigation::Controls />
     {{/if}}
   {{/if}}
 </li>

package/addon/components/cd-navigation/status-indicator.hbs

@@ -1,18 +1,13 @@
 {{#if this.showDeadlineIndicator}}
-  <div
-    class="deadline-indicator uk-flex uk-flex-middle uk-flex-center uk-margin-small-left uk-text-{{this.deadline.color}}"
-  >
-    {{svg-jar
-      "notifications-outline"
-      height=16
-      width=16
-      title=(format-date this.deadline.value)
-    }}
-  </div>
+  <UkIcon
+    @icon="clock"
+    class="uk-margin-small-right uk-text-{{this.deadline.color}}"
+    title={{format-date this.deadline.value}}
+  />
 {{/if}}
 
-<div
-  class="status-indicator uk-flex uk-flex-middle uk-flex-center uk-margin-small-left uk-text-{{this.status.color}}"
->
-  {{svg-jar this.status.icon title=this.status.label}}
-</div>
+<UkIcon
+  @icon={{this.status.icon}}
+  class="uk-text-{{this.status.color}}"
+  title={{this.status.label}}
+/>

package/addon/components/cd-navigation.hbs

@@ -1,14 +1,11 @@
-<aside>
-  <ul class="uk-tab uk-tab-left uk-margin-remove-bottom">
-    <CdNavigation::Section
-      @type="controlling"
-      @inquiries={{this.inquiries.controlling}}
-      @caseId={{@caseId}}
-    />
-    <CdNavigation::Section
-      @type="addressed"
-      @inquiries={{this.inquiries.addressed}}
-    />
-    <CdNavigation::Section @type="more" @inquiries={{this.inquiries.more}} />
-  </ul>
-</aside>
+<ul class="uk-tab uk-tab-left uk-margin-remove-bottom uk-width-auto">
+  <CdNavigation::Section
+    @type="controlling"
+    @inquiries={{this.inquiries.controlling}}
+  />
+  <CdNavigation::Section
+    @type="addressed"
+    @inquiries={{this.inquiries.addressed}}
+  />
+  <CdNavigation::Section @type="more" @inquiries={{this.inquiries.more}} />
+</ul>

package/addon/config.js

@@ -4,6 +4,7 @@ import { cached } from "tracked-toolbox";
 
 export const INQUIRY_STATUS = {
   DRAFT: "draft",
+  SKIPPED: "skipped",
   SENT: "sent",
   POSITIVE: "positive",
   NEGATIVE: "negative",
@@ -60,7 +61,7 @@ export default function config(target, property) {
             types: {
               suggestions: {
                 label: "caluma.distribution.new.suggestions",
-                icon: "bulb-outline",
+                icon: "star",
                 iconColor: "warning",
               },
             },

package/addon/utils/inquiry-deadline.js

@@ -19,18 +19,18 @@ function decorator(
     get() {
       const inquiry = get(this, inquiryProperty);
       const value = inquiry.document?.deadline.edges[0]?.node.value;
-      const isAnswered = inquiry.status === "COMPLETED";
+      const isDone = ["COMPLETED", "SKIPPED"].includes(inquiry.status);
 
       const { days: diff } = DateTime.fromISO(value).diffNow("days").toObject();
 
-      const isOverdue = !isAnswered && diff <= 0;
-      const isWarning = !isAnswered && diff <= this.config.warningPeriod;
+      const isOverdue = !isDone && diff <= 0;
+      const isWarning = !isDone && diff <= this.config.warningPeriod;
 
       return {
         value,
         isOverdue,
         isWarning,
-        color: isAnswered
+        color: isDone
           ? "muted"
           : isOverdue
           ? "danger"

package/addon/utils/inquiry-status.js

@@ -5,15 +5,17 @@ import { createDecorator } from "@projectcaluma/ember-distribution/-private/deco
 import { INQUIRY_STATUS } from "@projectcaluma/ember-distribution/config";
 
 export const ICON_MAP = {
-  [INQUIRY_STATUS.DRAFT]: "pencil-outline",
-  [INQUIRY_STATUS.SENT]: "paper-plane-outline",
-  [INQUIRY_STATUS.POSITIVE]: "checkmark-outline",
-  [INQUIRY_STATUS.NEGATIVE]: "close-outline",
-  [INQUIRY_STATUS.NEEDS_INTERACTION]: "repeat-outline",
+  [INQUIRY_STATUS.DRAFT]: "commenting",
+  [INQUIRY_STATUS.SKIPPED]: "lock",
+  [INQUIRY_STATUS.SENT]: "comment",
+  [INQUIRY_STATUS.POSITIVE]: "check",
+  [INQUIRY_STATUS.NEGATIVE]: "close",
+  [INQUIRY_STATUS.NEEDS_INTERACTION]: "refresh",
 };
 
 export const COLOR_MAP = {
   [INQUIRY_STATUS.DRAFT]: "muted",
+  [INQUIRY_STATUS.SKIPPED]: "muted",
   [INQUIRY_STATUS.SENT]: "emphasis",
   [INQUIRY_STATUS.POSITIVE]: "success",
   [INQUIRY_STATUS.NEGATIVE]: "danger",
@@ -44,9 +46,12 @@ function decorator(
         ? inquiry.status === "READY"
         : inquiry.status === "SUSPENDED";
       const isSent = !isAddressed && inquiry.status === "READY";
+      const isSkipped = inquiry.status === "SKIPPED";
 
       const answer = inquiry.childCase?.document.status.edges[0]?.node;
-      const slug = isDraft
+      const slug = isSkipped
+        ? INQUIRY_STATUS.SKIPPED
+        : isDraft
         ? INQUIRY_STATUS.DRAFT
         : isSent
         ? INQUIRY_STATUS.SENT
@@ -55,7 +60,7 @@ function decorator(
       return {
         slug,
         label:
-          !isDraft && !isSent
+          !isSkipped && !isDraft && !isSent
             ? answer?.selectedOption.label
             : this.intl.t(`caluma.distribution.status.${slug}`),
         color: COLOR_MAP[slug],

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

@@ -1,5 +1,3 @@
 @import "../answer-form";
-@import "../icon-button";
 @import "../inquiry-divider";
-@import "../status-indicator";
 @import "../truncated";

package/index.js

@@ -5,11 +5,6 @@ const { buildEngine } = require("ember-engines/lib/engine-addon");
 
 const name = require("./package").name;
 
-const ioniconAssets = [
-  ...require.resolve("ionicons").split("/").slice(0, -1),
-  "svg",
-].join("/");
-
 const publicAssets = [
   ...require.resolve(name).split("/").slice(0, -1),
   "public",
@@ -19,5 +14,5 @@ const publicAssets = [
 module.exports = buildEngine({
   name,
   lazyLoading: { enabled: false },
-  svgJar: { sourceDirs: [ioniconAssets, publicAssets] },
+  svgJar: { sourceDirs: [publicAssets] },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-distribution",
-  "version": "1.0.0-beta.10",
+  "version": "1.0.0-beta.11",
   "description": "Ember engine for the Caluma distribution module.",
   "keywords": [
     "ember-addon",
@@ -41,7 +41,6 @@
     "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.4.0",
     "tracked-toolbox": "^1.2.3"
@@ -51,7 +50,7 @@
     "@ember/test-helpers": "2.7.0",
     "@embroider/test-setup": "1.6.0",
     "@faker-js/faker": "6.3.1",
-    "@projectcaluma/ember-testing": "11.0.0-beta.7",
+    "@projectcaluma/ember-testing": "11.0.0-beta.8",
     "broccoli-asset-rev": "3.0.0",
     "ember-cli": "3.28.5",
     "ember-cli-code-coverage": "1.0.3",
@@ -72,12 +71,12 @@
     "ember-source-channel-url": "3.0.0",
     "ember-try": "2.0.0",
     "loader.js": "4.7.0",
-    "miragejs": "0.1.43",
+    "miragejs": "0.1.44",
     "npm-run-all": "4.1.5",
     "qunit": "2.19.1",
     "qunit-dom": "2.0.0",
     "sass": "1.51.0",
-    "webpack": "5.72.0"
+    "webpack": "5.72.1"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"

package/translations/de.yaml

@@ -3,6 +3,7 @@ caluma:
     empty: "Es wurden noch keine Anfragen erstellt."
     start: "Starten"
     send: "Offene Anfragen versenden"
+    complete: "Zirkulation abschliessen"
     send-confirm: "Wollen Sie wirklich alle offenen Anfragen versenden?"
     complete-confirm:
       "Es gibt noch <b>{count} offene {count, plural, =1 {Anfrage} other {Anfragen}}</b>
@@ -54,6 +55,7 @@ caluma:
 
     status:
       draft: "Entwurf"
+      skipped: "Vorzeitig beendet"
       sent: "Versendet"
       positive: "Positiv"
       negative: "Negativ"

package/translations/en.yaml

@@ -3,6 +3,7 @@ caluma:
     empty: "No inquiries have been created yet."
     start: "Start"
     send: "Send pending inquiries"
+    complete: "Complete circulation"
     send-confirm: "Do you really want to send all pending inquiries?"
     complete-confirm:
       "There {count, plural, =1 {is} other {are}} <b>{count} pending
@@ -55,6 +56,7 @@ caluma:
 
     status:
       draft: "Draft"
+      skipped: "Aborted"
       sent: "Sent"
       positive: "Positive"
       negative: "Negative"

package/translations/fr.yaml

@@ -3,6 +3,7 @@ caluma:
     empty: "Aucune demande n'a encore été créée."
     start: "Lancer"
     send: "Envoyer les demandes ouvertes"
+    complete: "Terminer la circulation"
     send-confirm: "Voulez-vous vraiment envoyer toutes les demandes ouvertes ?"
     complete-confirm:
       "Il y a <b>{count} {count, plural, =1 {demande} other {demandes}} en
@@ -54,6 +55,7 @@ caluma:
 
     status:
       draft: "Brouillon"
+      skipped: "Terminé prématurément"
       sent: "Envoyé"
       positive: "Positif"
       negative: "Negatif"

package/addon/components/cd-icon-button.hbs

@@ -1,27 +0,0 @@
-{{#if @route}}
-  <LinkTo @route={{@route}} class={{this.class}} title={{@title}} ...attributes>
-    {{#if @loading}}
-      <UkSpinner @ratio={{0.6}} />
-    {{else if @fromSvgJar}}
-      {{svg-jar @icon title=@title width="20" height="20"}}
-    {{else}}
-      <UkIcon @icon={{@icon}} />
-    {{/if}}
-  </LinkTo>
-{{else}}
-  <button
-    type="button"
-    class={{this.class}}
-    title={{@title}}
-    ...attributes
-    {{on "click" @onClick}}
-  >
-    {{#if @loading}}
-      <UkSpinner @ratio={{0.6}} />
-    {{else if @fromSvgJar}}
-      {{svg-jar @icon title=@title width="20" height="20"}}
-    {{else}}
-      <UkIcon @icon={{@icon}} />
-    {{/if}}
-  </button>
-{{/if}}

package/addon/components/cd-icon-button.js

@@ -1,22 +0,0 @@
-import { dasherize } from "@ember/string";
-import Component from "@glimmer/component";
-
-export default class CdIconButtonComponent extends Component {
-  get class() {
-    const gutters = [
-      "gutter",
-      "gutterTop",
-      "gutterRight",
-      "gutterBottom",
-      "gutterLeft",
-    ]
-      .map((arg) =>
-        this.args[arg]
-          ? `uk-icon-button--${dasherize(arg)}-${this.args[arg]}`
-          : null
-      )
-      .filter(Boolean);
-
-    return ["uk-icon-button", ...gutters].join(" ");
-  }
-}

package/app/components/cd-icon-button.js

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

package/app/styles/_icon-button.scss

@@ -1,13 +0,0 @@
-@import "ember-uikit/variables-theme";
-
-@for $i from 1 through 8 {
-  @each $side in "top", "right", "bottom", "left" {
-    .uk-icon-button--gutter-#{$side}-#{$i} > svg {
-      margin-#{$side}: #{$i}px !important;
-    }
-  }
-
-  .uk-icon-button--gutter-#{$i} > svg {
-    margin: #{$i}px;
-  }
-}

package/app/styles/_status-indicator.scss

@@ -1,31 +0,0 @@
-@import "ember-uikit/variables-theme";
-
-$size: $global-small-font-size * 1.2;
-$iconSize: $global-small-font-size * 0.9;
-
-$colors: (
-  muted: $text-muted-color,
-  emphasis: $text-emphasis-color,
-  success: $text-success-color,
-  danger: $text-danger-color,
-  warning: $text-warning-color,
-);
-
-.status-indicator {
-  width: $size;
-  height: $size;
-  border-width: 1px;
-  border-style: solid;
-
-  > svg {
-    width: $iconSize;
-    height: $iconSize;
-  }
-
-  @each $colorName, $color in $colors {
-    &.uk-text-#{$colorName} {
-      color: darken($color, 20%);
-      border-color: $color;
-    }
-  }
-}