@projectcaluma/ember-workflow 14.7.0 → 14.8.0

package/addon/components/task-button.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 allWorkItems from "@projectcaluma/ember-workflow/gql/queries/all-work-items.graphql";
@@ -35,15 +35,9 @@ export default class TaskButtonComponent extends Component {
   @service notification;
   @service intl;
 
-  workItem = trackedTask(this, this.fetchWorkItem, () => [
-    this.args.task,
-    this.args.filters,
-  ]);
-
-  @dropTask
-  *fetchWorkItem(task, filters) {
+  fetchWorkItem = task({ drop: true }, async (task, filters) => {
     try {
-      const response = yield this.apollo.query(
+      const response = await this.apollo.query(
         {
           query: allWorkItems,
           fetchPolicy: "network-only",
@@ -59,5 +53,10 @@ export default class TaskButtonComponent extends Component {
       console.error(e);
       this.notification.danger(this.intl.t("caluma.task-button.error"));
     }
-  }
+  });
+
+  workItem = trackedTask(this, this.fetchWorkItem, () => [
+    this.args.task,
+    this.args.filters,
+  ]);
 }

package/addon/components/work-item-button.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 { trackedFunction } from "reactiveweb/function";
 
 import cancelWorkItem from "@projectcaluma/ember-workflow/gql/mutations/cancel-work-item.graphql";
@@ -68,22 +68,21 @@ export default class WorkItemButtonComponent extends Component {
     return this.requiredWorkItemStatus.includes(status);
   });
 
-  @dropTask
-  *mutate() {
+  mutate = task({ drop: true }, async () => {
     try {
       if (typeof this.args.beforeMutate === "function") {
-        const proceed = yield this.args.beforeMutate();
+        const proceed = await this.args.beforeMutate();
 
         if (proceed === false) return;
       }
 
-      yield this.apollo.mutate({
+      await this.apollo.mutate({
         mutation: this[`${this.args.mutation}WorkItemMutation`],
         variables: { id: this.args.workItemId },
       });
 
       if (typeof this.args.onSuccess === "function") {
-        yield this.args.onSuccess();
+        await this.args.onSuccess();
       } else {
         this.notification.success(
           this.intl.t(`caluma.mutate-work-item.success.${this.args.mutation}`),
@@ -91,7 +90,7 @@ export default class WorkItemButtonComponent extends Component {
       }
     } catch (e) {
       if (typeof this.args.onError === "function") {
-        yield this.args.onError(e);
+        await this.args.onError(e);
       } else {
         console.error(e);
         this.notification.danger(
@@ -99,5 +98,5 @@ export default class WorkItemButtonComponent extends Component {
         );
       }
     }
-  }
+  });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-workflow",
-  "version": "14.7.0",
+  "version": "14.8.0",
   "description": "Ember addon for Caluma workflow tools.",
   "keywords": [
     "ember-addon"
@@ -15,14 +15,14 @@
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.3.0",
     "ember-composable-helpers": "^5.0.0",
-    "ember-concurrency": "^4.0.2",
+    "ember-concurrency": "^4.0.2 || ^5.1.0",
     "ember-intl": "^7.1.1",
     "ember-template-imports": "^4.2.0",
     "ember-truth-helpers": "^4.0.3",
     "ember-uikit": "^9.1.3",
     "graphql": "^15.10.1",
     "reactiveweb": "^1.3.0",
-    "@projectcaluma/ember-core": "^14.7.0"
+    "@projectcaluma/ember-core": "^14.8.0"
   },
   "devDependencies": {
     "@ember/optional-features": "2.3.0",
@@ -51,7 +51,7 @@
     "qunit-dom": "3.5.0",
     "uikit": "3.25.6",
     "webpack": "5.104.1",
-    "@projectcaluma/ember-testing": "14.7.0"
+    "@projectcaluma/ember-testing": "14.8.0"
   },
   "peerDependencies": {
     "ember-source": ">= 4.0.0"