@projectcaluma/ember-distribution 14.7.0 → 14.7.1

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

@@ -3,7 +3,7 @@ import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { queryManager } from "ember-apollo-client";
-import { dropTask } from "ember-concurrency";
+import { task } from "ember-concurrency";
 import { trackedTask } from "reactiveweb/ember-concurrency";
 
 import { decodeId } from "@projectcaluma/ember-core/helpers/decode-id";
@@ -26,10 +26,6 @@ export default class CdInquiryAnswerFormComponent extends Component {
   @inquiryAnswerStatus({ inquiryProperty: "inquiry" }) answerStatus;
   @tracked isExpanded = !this.config.ui.small;
 
-  _inquiry = trackedTask(this, this.fetchInquiryAnswer, () => [
-    this.args.inquiry,
-  ]);
-
   get inquiry() {
     return this._inquiry.value?.[0]?.node;
   }
@@ -68,9 +64,8 @@ export default class CdInquiryAnswerFormComponent extends Component {
     this.isExpanded = !this.isExpanded;
   }
 
-  @dropTask
-  *fetchInquiryAnswer(inquiry) {
-    return yield this.apollo.watchQuery(
+  fetchInquiryAnswer = task({ drop: true }, async (inquiry) => {
+    return await this.apollo.watchQuery(
       {
         query: inquiryAnswerQuery,
         variables: {
@@ -82,33 +77,39 @@ export default class CdInquiryAnswerFormComponent extends Component {
       },
       "allWorkItems.edges",
     );
-  }
+  });
 
-  @dropTask
-  *completeWorkItem(workItem, willCompleteInquiry, validate = () => true) {
-    try {
-      if (typeof validate === "function" && !(yield validate())) return;
+  _inquiry = trackedTask(this, this.fetchInquiryAnswer, () => [
+    this.args.inquiry,
+  ]);
 
-      yield this.apollo.mutate({
-        mutation: completeInquiryWorkItemMutation,
-        variables: {
-          workItem,
-          statusQuestion: this.config.inquiry.answer.statusQuestion,
-          buttonTasks: Object.keys(this.config.inquiry.answer.buttons),
-          checkTask: this.config.controls.checkTask,
-          createTask: this.config.controls.createTask,
-          inquiryTask: this.config.inquiry.task,
-          currentGroup: String(this.calumaOptions.currentGroupId),
-          answerInfoQuestions: this.config.inquiry.answer.infoQuestions,
-          willCompleteInquiry,
-        },
-      });
+  completeWorkItem = task(
+    { drop: true },
+    async (workItem, willCompleteInquiry, validate = () => true) => {
+      try {
+        if (typeof validate === "function" && !(await validate())) return;
 
-      yield this.router.transitionTo("inquiry.index");
-    } catch {
-      this.notification.danger(
-        this.intl.t("caluma.distribution.answer.complete-error"),
-      );
-    }
-  }
+        await this.apollo.mutate({
+          mutation: completeInquiryWorkItemMutation,
+          variables: {
+            workItem,
+            statusQuestion: this.config.inquiry.answer.statusQuestion,
+            buttonTasks: Object.keys(this.config.inquiry.answer.buttons),
+            checkTask: this.config.controls.checkTask,
+            createTask: this.config.controls.createTask,
+            inquiryTask: this.config.inquiry.task,
+            currentGroup: String(this.calumaOptions.currentGroupId),
+            answerInfoQuestions: this.config.inquiry.answer.infoQuestions,
+            willCompleteInquiry,
+          },
+        });
+
+        await this.router.transitionTo("inquiry.index");
+      } catch {
+        this.notification.danger(
+          this.intl.t("caluma.distribution.answer.complete-error"),
+        );
+      }
+    },
+  );
 }

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

@@ -2,7 +2,7 @@ import { inject as service } from "@ember/service";
 import { isEmpty } from "@ember/utils";
 import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
-import { dropTask } from "ember-concurrency";
+import { task } from "ember-concurrency";
 import { confirm } from "ember-uikit";
 import { DateTime } from "luxon";
 
@@ -81,17 +81,16 @@ export default class CdInquiryDialogInquiryPartComponent extends Component {
       : null;
   }
 
-  @dropTask
-  *withdraw(e) {
+  withdraw = task({ drop: true }, async (e) => {
     e.preventDefault();
 
     /* istanbul ignore next */
-    if (!(yield confirm(this.intl.t("caluma.distribution.withdraw.confirm")))) {
+    if (!(await confirm(this.intl.t("caluma.distribution.withdraw.confirm")))) {
       return;
     }
 
     try {
-      yield this.apollo.mutate({
+      await this.apollo.mutate({
         mutation: withdrawInquiryMutation,
         variables: {
           workItem: decodeId(this.args.inquiry.id),
@@ -102,15 +101,14 @@ export default class CdInquiryDialogInquiryPartComponent extends Component {
         this.intl.t("caluma.distribution.withdraw.error"),
       );
     }
-  }
+  });
 
-  @dropTask
-  *reopen(e) {
+  reopen = task({ drop: true }, async (e) => {
     e.preventDefault();
 
     /* istanbul ignore next */
     if (
-      !(yield confirm(
+      !(await confirm(
         this.intl.t("caluma.distribution.reopen-inquiry.confirm"),
       ))
     ) {
@@ -118,7 +116,7 @@ export default class CdInquiryDialogInquiryPartComponent extends Component {
     }
 
     try {
-      yield this.apollo.mutate({
+      await this.apollo.mutate({
         mutation: reopenInquiryMutation,
         variables: {
           workItem: decodeId(this.args.inquiry.id),
@@ -131,18 +129,17 @@ export default class CdInquiryDialogInquiryPartComponent extends Component {
         this.intl.t("caluma.distribution.reopen-inquiry.error"),
       );
     }
-  }
+  });
 
-  @dropTask
-  *sendReminder(e) {
+  sendReminder = task({ drop: true }, async (e) => {
     e.preventDefault();
 
-    if (!(yield confirm(this.intl.t("caluma.distribution.reminder.confirm")))) {
+    if (!(await confirm(this.intl.t("caluma.distribution.reminder.confirm")))) {
       return;
     }
 
     try {
-      yield this.calumaOptions.sendReminderDistributionInquiry(
+      await this.calumaOptions.sendReminderDistributionInquiry(
         decodeId(this.args.inquiry.id),
       );
 
@@ -150,7 +147,7 @@ export default class CdInquiryDialogInquiryPartComponent extends Component {
         this.intl.t("caluma.distribution.reminder.success"),
       );
 
-      yield this.apollo.mutate({
+      await this.apollo.mutate({
         mutation: updateInquiryMetaMutation,
         variables: {
           inquiry: decodeId(this.args.inquiry.id),
@@ -168,5 +165,5 @@ export default class CdInquiryDialogInquiryPartComponent extends Component {
         this.intl.t("caluma.distribution.reminder.error"),
       );
     }
-  }
+  });
 }

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

@@ -2,7 +2,7 @@ import { next } from "@ember/runloop";
 import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
 import { queryManager, getObservable } from "ember-apollo-client";
-import { dropTask } from "ember-concurrency";
+import { task } from "ember-concurrency";
 import { trackedTask } from "reactiveweb/ember-concurrency";
 
 import { decodeId } from "@projectcaluma/ember-core/helpers/decode-id";
@@ -33,16 +33,8 @@ export default class CdInquiryDialogComponent extends Component {
       );
   }
 
-  _inquiries = trackedTask(this, this.fetchDialog, () => [
-    this.args.from,
-    this.args.to,
-    this.distribution.caseId,
-    this.config,
-  ]);
-
-  @dropTask
-  *fetchDialog(from, to, caseId, config) {
-    const response = yield this.apollo.watchQuery({
+  fetchDialog = task({ drop: true }, async (from, to, caseId, config) => {
+    const response = await this.apollo.watchQuery({
       query: inquiryDialogQuery,
       fetchPolicy: "cache-and-network",
       variables: {
@@ -77,18 +69,24 @@ export default class CdInquiryDialogComponent extends Component {
     });
 
     return response;
-  }
+  });
 
-  @dropTask
-  *createInquiry(e) {
+  _inquiries = trackedTask(this, this.fetchDialog, () => [
+    this.args.from,
+    this.args.to,
+    this.distribution.caseId,
+    this.config,
+  ]);
+
+  createInquiry = task({ drop: true }, async (e) => {
     e.preventDefault();
 
-    yield this.distribution.createInquiry.perform([this.args.to]);
+    await this.distribution.createInquiry.perform([this.args.to]);
 
-    yield getObservable(this._inquiries.value).refetch();
+    await getObservable(this._inquiries.value).refetch();
 
     next(this, "transitionToLatestInquiry");
-  }
+  });
 
   transitionToLatestInquiry() {
     this.router.transitionTo(

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

@@ -1,7 +1,7 @@
 import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
-import { dropTask } from "ember-concurrency";
+import { task } from "ember-concurrency";
 import { trackedTask } from "reactiveweb/ember-concurrency";
 
 import config from "@projectcaluma/ember-distribution/config";
@@ -18,40 +18,38 @@ export default class CdInquiryEditFormComponent extends Component {
 
   @queryManager apollo;
 
-  _inquiry = trackedTask(this, this.fetchInquiry, () => [this.args.inquiry]);
-
   get inquiry() {
     return this._inquiry.value?.[0]?.node;
   }
 
-  @dropTask
-  *fetchInquiry(inquiry) {
-    return yield this.apollo.watchQuery(
+  fetchInquiry = task({ drop: true }, async (inquiry) => {
+    return await this.apollo.watchQuery(
       {
         query: inquiryEditQuery,
         variables: { inquiry },
       },
       "allWorkItems.edges",
     );
-  }
+  });
 
-  @dropTask
-  *send(validate) {
+  _inquiry = trackedTask(this, this.fetchInquiry, () => [this.args.inquiry]);
+
+  send = task({ drop: true }, async (validate) => {
     try {
-      if (!(yield validate()) || this.distribution.sendAllInquiries.isRunning) {
+      if (!(await validate()) || this.distribution.sendAllInquiries.isRunning) {
         return;
       }
 
-      yield this.apollo.mutate({
+      await this.apollo.mutate({
         mutation: resumeWorkItemMutation,
         variables: { workItem: this.args.inquiry },
       });
 
-      yield this.router.transitionTo("inquiry.index");
+      await this.router.transitionTo("inquiry.index");
     } catch {
       this.notification.danger(
         this.intl.t("caluma.distribution.edit.send-error"),
       );
     }
-  }
+  });
 }

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

@@ -5,7 +5,7 @@ import { next } from "@ember/runloop";
 import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
-import { dropTask } from "ember-concurrency";
+import { task } from "ember-concurrency";
 import { trackedFunction } from "reactiveweb/function";
 
 import { decodeId } from "@projectcaluma/ember-core/helpers/decode-id";
@@ -90,18 +90,17 @@ export default class CdInquiryNewFormBulkEditComponent extends Component {
     this.answers[field.question.slug] = value;
   }
 
-  @dropTask
-  *submit(validate, e) {
+  submit = task({ drop: true }, async (validate, e) => {
     e.preventDefault();
 
-    if (!this.args.selectedGroups.length || !(yield validate())) return;
+    if (!this.args.selectedGroups.length || !(await validate())) return;
 
-    yield this.distribution.createInquiry.perform(this.args.selectedGroups, {
+    await this.distribution.createInquiry.perform(this.args.selectedGroups, {
       answers: this.answers,
     });
 
     next(this, "transitionToFirstInquiryOfGroup", this.args.selectedGroups[0]);
-  }
+  });
 
   transitionToFirstInquiryOfGroup(group) {
     const firstCreated = this.distribution.navigation.value.controlling.edges

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

@@ -2,7 +2,7 @@ import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
 import { macroCondition, isTesting } from "@embroider/macros";
 import Component from "@glimmer/component";
-import { timeout, restartableTask } from "ember-concurrency";
+import { timeout, task } from "ember-concurrency";
 import { trackedTask } from "reactiveweb/ember-concurrency";
 
 import config from "@projectcaluma/ember-distribution/config";
@@ -37,14 +37,6 @@ export default class CdInquiryNewFormSelectComponent extends Component {
       }));
   }
 
-  groups = trackedTask(this, this.fetchGroups, () => [
-    // 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,
-  ]);
-
   @action
   updateSelectedTypes(type, e) {
     e.preventDefault();
@@ -59,26 +51,24 @@ export default class CdInquiryNewFormSelectComponent extends Component {
     );
   }
 
-  @restartableTask
-  *updateSearch(e) {
+  updateSearch = task({ restartable: true }, async (e) => {
     e.preventDefault();
 
     /* istanbul ignore next */
     if (macroCondition(isTesting())) {
       // no timeout
     } else {
-      yield timeout(500);
+      await timeout(500);
     }
 
     this.args.onChangeSearch(e.target.value);
-  }
+  });
 
-  @restartableTask
-  *fetchGroups(types, search) {
+  fetchGroups = task({ restartable: true }, async (types, search) => {
     // https://github.com/ember-cli/eslint-plugin-ember/issues/1413
-    yield Promise.resolve();
+    await Promise.resolve();
 
-    const typedGroups = yield this.calumaOptions.fetchTypedGroups(
+    const typedGroups = await this.calumaOptions.fetchTypedGroups(
       types,
       search,
     );
@@ -93,5 +83,13 @@ export default class CdInquiryNewFormSelectComponent extends Component {
         }));
       })
       .sort((a, b) => a.name.localeCompare(b.name));
-  }
+  });
+
+  groups = trackedTask(this, this.fetchGroups, () => [
+    // 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,
+  ]);
 }

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

@@ -1,7 +1,7 @@
 import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
-import { dropTask } from "ember-concurrency";
+import { task } from "ember-concurrency";
 import { confirm } from "ember-uikit";
 
 import { decodeId } from "@projectcaluma/ember-core/helpers/decode-id";
@@ -19,13 +19,12 @@ export default class CdNavigationControlsComponent extends Component {
   @queryManager apollo;
   @config config;
 
-  @dropTask
-  *completeDistribution() {
+  completeDistribution = task({ drop: true }, async () => {
     try {
       let confirmText = this.intl.t("caluma.distribution.skip-confirm");
 
       if (this.distribution.hasInquiries) {
-        const incompleteInquiries = yield this.apollo.query(
+        const incompleteInquiries = await this.apollo.query(
           {
             query: incompleteInquiriesQuery,
             variables: {
@@ -44,35 +43,34 @@ export default class CdNavigationControlsComponent extends Component {
               });
       }
 
-      if (!(yield confirm(confirmText))) {
+      if (!(await confirm(confirmText))) {
         return;
       }
 
       const completeDistributionWorkItem =
         this.distribution.controls.value.complete.edges?.[0]?.node.id;
 
-      yield this.apollo.mutate({
+      await this.apollo.mutate({
         mutation: completeWorkItemMutation,
         variables: {
           workItem: completeDistributionWorkItem,
         },
       });
 
-      yield this.config.hooks.postCompleteDistribution?.();
+      await this.config.hooks.postCompleteDistribution?.();
 
-      yield this.distribution.refetch();
+      await this.distribution.refetch();
       this.router.transitionTo("index");
     } catch {
       this.notification.danger(
         this.intl.t("caluma.distribution.complete-error"),
       );
     }
-  }
+  });
 
-  @dropTask
-  *reopenDistribution() {
+  reopenDistribution = task({ drop: true }, async () => {
     try {
-      if (!(yield confirm(this.intl.t("caluma.distribution.reopen-confirm")))) {
+      if (!(await confirm(this.intl.t("caluma.distribution.reopen-confirm")))) {
         return;
       }
 
@@ -80,23 +78,22 @@ export default class CdNavigationControlsComponent extends Component {
         this.distribution.controls.value?.case.edges[0]?.node.parentWorkItem.id,
       );
 
-      yield this.apollo.mutate({
+      await this.apollo.mutate({
         mutation: reopenDistributionMutation,
         variables: {
           workItem: distributionWorkItemId,
         },
       });
 
-      yield this.distribution.refetchControls();
+      await this.distribution.refetchControls();
     } catch {
       this.notification.danger(this.intl.t("caluma.distribution.reopen-error"));
     }
-  }
+  });
 
-  @dropTask
-  *checkInquiries() {
+  checkInquiries = task({ drop: true }, async () => {
     try {
-      yield this.apollo.mutate({
+      await this.apollo.mutate({
         mutation: completeWorkItemMutation,
         variables: {
           workItem: decodeId(
@@ -109,5 +106,5 @@ export default class CdNavigationControlsComponent extends Component {
         this.intl.t("caluma.distribution.check-inquiries-error"),
       );
     }
-  }
+  });
 }

package/addon/services/distribution.js

@@ -1,7 +1,7 @@
 import Service, { inject as service } from "@ember/service";
 import { tracked } from "@glimmer/tracking";
 import { queryManager, getObservable } from "ember-apollo-client";
-import { dropTask } from "ember-concurrency";
+import { task } from "ember-concurrency";
 import { confirm } from "ember-uikit";
 import { gql } from "graphql-tag";
 import { trackedTask } from "reactiveweb/ember-concurrency";
@@ -35,9 +35,6 @@ export default class DistributionService extends Service {
     );
   }
 
-  controls = trackedTask(this, this.fetchControls, () => [this.caseId]);
-  navigation = trackedTask(this, this.fetchNavigation, () => [this.caseId]);
-
   async refetch() {
     await this.refetchControls();
     await this.refetchNavigation();
@@ -51,9 +48,8 @@ export default class DistributionService extends Service {
     await getObservable(this.controls.value)?.refetch();
   }
 
-  @dropTask
-  *fetchControls(caseId) {
-    return yield this.apollo.watchQuery({
+  fetchControls = task({ drop: true }, async (caseId) => {
+    return await this.apollo.watchQuery({
       query: controlsQuery,
       variables: {
         caseId,
@@ -64,11 +60,10 @@ export default class DistributionService extends Service {
         checkTask: this.config.controls.checkTask,
       },
     });
-  }
+  });
 
-  @dropTask
-  *fetchNavigation(caseId) {
-    const response = yield this.apollo.watchQuery({
+  fetchNavigation = task({ drop: true }, async (caseId) => {
+    const response = await this.apollo.watchQuery({
       query: navigationQuery,
       variables: {
         caseId,
@@ -101,16 +96,18 @@ export default class DistributionService extends Service {
     });
 
     return response;
-  }
+  });
 
-  @dropTask
-  *createInquiry(groups, context = {}) {
+  controls = trackedTask(this, this.fetchControls, () => [this.caseId]);
+  navigation = trackedTask(this, this.fetchNavigation, () => [this.caseId]);
+
+  createInquiry = task({ drop: true }, async (groups, context = {}) => {
     try {
       // get create inquiry work item to complete
       const createId = decodeId(this.controls.value?.create.edges[0].node.id);
 
       // create new inquiries
-      yield this.apollo.mutate({
+      await this.apollo.mutate({
         mutation: createInquiryMutation,
         variables: {
           id: createId,
@@ -122,13 +119,13 @@ export default class DistributionService extends Service {
       });
 
       // refetch navigation and controls data
-      yield this.refetch();
+      await this.refetch();
     } catch {
       this.notification.danger(
         this.intl.t("caluma.distribution.new.error", { count: groups.length }),
       );
     }
-  }
+  });
 
   @cached
   get inquiries() {
@@ -175,15 +172,14 @@ export default class DistributionService extends Service {
     );
   }
 
-  @dropTask
-  *sendAllInquiries() {
+  sendAllInquiries = task({ drop: true }, async () => {
     const ids = this.controls.value.send.edges
       .filter((edge) => edge.node.status === "SUSPENDED")
       .map((edge) => decodeId(edge.node.id));
 
     if (
       ids.length &&
-      !(yield confirm(
+      !(await confirm(
         this.intl.t("caluma.distribution.send-confirm", { count: ids.length }),
       ))
     ) {
@@ -204,9 +200,9 @@ export default class DistributionService extends Service {
 
       const mutation = gql`mutation SendInquiries {${mutations.join("\n")}}`;
 
-      yield this.apollo.mutate({ mutation });
+      await this.apollo.mutate({ mutation });
     } catch {
       this.notification.danger(this.intl.t("caluma.distribution.send-error"));
     }
-  }
+  });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-distribution",
-  "version": "14.7.0",
+  "version": "14.7.1",
   "description": "Ember engine for the Caluma distribution module.",
   "keywords": [
     "ember-addon",
@@ -18,7 +18,7 @@
     "ember-can": "^7.0.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.3.0",
-    "ember-concurrency": "^4.0.2",
+    "ember-concurrency": "^4.0.2 || ^5.1.0",
     "ember-engines-router-service": "^0.6.0",
     "ember-flatpickr": "^8.0.1",
     "ember-intl": "^7.1.1",
@@ -35,9 +35,9 @@
     "luxon": "^3.5.0",
     "reactiveweb": "^1.3.0",
     "tracked-toolbox": "^2.0.0",
-    "@projectcaluma/ember-core": "^14.7.0",
-    "@projectcaluma/ember-form": "^14.7.0",
-    "@projectcaluma/ember-workflow": "^14.7.0"
+    "@projectcaluma/ember-form": "^14.7.1",
+    "@projectcaluma/ember-workflow": "^14.7.1",
+    "@projectcaluma/ember-core": "^14.7.1"
   },
   "devDependencies": {
     "@ember/optional-features": "2.3.0",
@@ -68,7 +68,7 @@
     "sass": "1.97.3",
     "uikit": "3.25.6",
     "webpack": "5.104.1",
-    "@projectcaluma/ember-testing": "14.7.0"
+    "@projectcaluma/ember-testing": "14.7.1"
   },
   "peerDependencies": {
     "ember-engines": "^0.11.0",