@projectcaluma/ember-distribution 11.0.1 → 11.0.3

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

@@ -47,7 +47,11 @@
         <UkButton
           @type="submit"
           @color="primary"
-          @disabled={{or (not isValid) this.send.isRunning}}
+          @disabled={{or
+            (not isValid)
+            this.send.isRunning
+            this.distribution.sendAllInquiries.isRunning
+          }}
           @onClick={{perform this.send validate}}
           @loading={{this.send.isRunning}}
         >{{t "caluma.distribution.edit.send"}}</UkButton>

package/addon/components/cd-inquiry-edit-form.js

@@ -9,6 +9,7 @@ import resumeWorkItemMutation from "@projectcaluma/ember-distribution/gql/mutati
 import inquiryEditQuery from "@projectcaluma/ember-distribution/gql/queries/inquiry-edit.graphql";
 
 export default class CdInquiryEditFormComponent extends Component {
+  @service distribution;
   @service notification;
   @service router;
   @service intl;
@@ -37,7 +38,9 @@ export default class CdInquiryEditFormComponent extends Component {
   @dropTask
   *send(validate) {
     try {
-      if (!(yield validate())) return;
+      if (!(yield validate()) || this.distribution.sendAllInquiries.isRunning) {
+        return;
+      }
 
       yield this.apollo.mutate({
         mutation: resumeWorkItemMutation,

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

@@ -43,9 +43,9 @@
             class="uk-icon-button uk-button-primary"
             {{uk-tooltip (t "caluma.distribution.send")}}
             data-test-send-pending-inquiries
-            {{on "click" (perform this.sendInquiries)}}
+            {{on "click" (perform this.distribution.sendAllInquiries)}}
           >
-            {{#if this.sendInquiries.isRunning}}
+            {{#if this.distribution.sendAllInquiries.isRunning}}
               <UkSpinner @ratio={{0.6}} />
             {{else}}
               <UkIcon @icon="comment" />

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

@@ -3,7 +3,6 @@ import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
 import { dropTask } from "ember-concurrency";
 import { confirm } from "ember-uikit";
-import { gql } from "graphql-tag";
 
 import { decodeId } from "@projectcaluma/ember-core/helpers/decode-id";
 import config from "@projectcaluma/ember-distribution/config";
@@ -94,41 +93,6 @@ export default class CdNavigationControlsComponent extends Component {
     }
   }
 
-  @dropTask
-  *sendInquiries() {
-    const ids = this.distribution.controls.value.send.edges
-      .filter((edge) => edge.node.status === "SUSPENDED")
-      .map((edge) => decodeId(edge.node.id));
-
-    if (
-      ids.length &&
-      !(yield confirm(
-        this.intl.t("caluma.distribution.send-confirm", { count: ids.length })
-      ))
-    ) {
-      return;
-    }
-
-    try {
-      const mutations = ids.map(
-        (id, index) => `
-        sendInquiry${index}: resumeWorkItem(input: { id: "${id}" }) {
-          workItem {
-            id
-            status
-          }
-        }
-      `
-      );
-
-      const mutation = gql`mutation SendInquiries {${mutations.join("\n")}}`;
-
-      yield this.apollo.mutate({ mutation });
-    } catch (e) {
-      this.notification.danger(this.intl.t("caluma.distribution.send-error"));
-    }
-  }
-
   @dropTask
   *checkInquiries() {
     try {

package/addon/services/distribution.js

@@ -3,6 +3,8 @@ import { tracked } from "@glimmer/tracking";
 import { queryManager, getObservable } from "ember-apollo-client";
 import { dropTask } from "ember-concurrency";
 import { trackedTask } from "ember-resources/util/ember-concurrency";
+import { confirm } from "ember-uikit";
+import { gql } from "graphql-tag";
 import { cached } from "tracked-toolbox";
 
 import { decodeId } from "@projectcaluma/ember-core/helpers/decode-id";
@@ -172,4 +174,39 @@ export default class DistributionService extends Service {
       {}
     );
   }
+
+  @dropTask
+  *sendAllInquiries() {
+    const ids = this.controls.value.send.edges
+      .filter((edge) => edge.node.status === "SUSPENDED")
+      .map((edge) => decodeId(edge.node.id));
+
+    if (
+      ids.length &&
+      !(yield confirm(
+        this.intl.t("caluma.distribution.send-confirm", { count: ids.length })
+      ))
+    ) {
+      return;
+    }
+
+    try {
+      const mutations = ids.map(
+        (id, index) => `
+        sendInquiry${index}: resumeWorkItem(input: { id: "${id}" }) {
+          workItem {
+            id
+            status
+          }
+        }
+      `
+      );
+
+      const mutation = gql`mutation SendInquiries {${mutations.join("\n")}}`;
+
+      yield this.apollo.mutate({ mutation });
+    } catch (e) {
+      this.notification.danger(this.intl.t("caluma.distribution.send-error"));
+    }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-distribution",
-  "version": "11.0.1",
+  "version": "11.0.3",
   "description": "Ember engine for the Caluma distribution module.",
   "keywords": [
     "ember-addon",
@@ -24,11 +24,11 @@
     "@embroider/macros": "^1.10.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@projectcaluma/ember-core": "^11.0.1",
-    "@projectcaluma/ember-form": "^11.0.1",
-    "@projectcaluma/ember-workflow": "^11.0.1",
+    "@projectcaluma/ember-core": "^11.0.3",
+    "@projectcaluma/ember-form": "^11.0.3",
+    "@projectcaluma/ember-workflow": "^11.0.3",
     "ember-apollo-client": "~4.0.2",
-    "ember-auto-import": "^2.6.0",
+    "ember-auto-import": "^2.6.1",
     "ember-can": "^4.2.0",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-htmlbars": "^6.2.0",
@@ -52,7 +52,7 @@
     "@ember/test-helpers": "2.7.0",
     "@embroider/test-setup": "2.1.1",
     "@faker-js/faker": "7.6.0",
-    "@projectcaluma/ember-testing": "11.0.1",
+    "@projectcaluma/ember-testing": "11.0.3",
     "broccoli-asset-rev": "3.0.0",
     "concurrently": "7.6.0",
     "ember-cli": "4.9.2",
@@ -74,7 +74,7 @@
     "miragejs": "0.1.47",
     "qunit": "2.19.4",
     "qunit-dom": "2.0.0",
-    "sass": "1.57.1",
+    "sass": "1.58.3",
     "webpack": "5.75.0"
   },
   "engines": {