@projectcaluma/ember-workflow 11.0.0-beta.2 → 11.0.0-beta.3

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# [@projectcaluma/ember-workflow-v11.0.0-beta.3](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-workflow-v11.0.0-beta.2...@projectcaluma/ember-workflow-v11.0.0-beta.3) (2022-02-01)
+
+
+### Bug Fixes
+
+* **task-button:** remove wrapping div around task button ([50746ec](https://github.com/projectcaluma/ember-caluma/commit/50746ecda69f46f9d72631778fb4fa37f123159c))
+* **work-item-button:** update status of work item in cache after mutation ([d8c1e2a](https://github.com/projectcaluma/ember-caluma/commit/d8c1e2a4db8cf3d3bb5891be705782c6e39c8e60))
+
 # [@projectcaluma/ember-workflow-v11.0.0-beta.2](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-workflow-v11.0.0-beta.1...@projectcaluma/ember-workflow-v11.0.0-beta.2) (2022-01-24)
 
 

package/addon/components/task-button.hbs

@@ -1,28 +1,26 @@
-<div {{did-insert (perform this.fetchWorkItem)}}>
-  {{#if this.workItem}}
-    <WorkItemButton
-      ...attributes
-      @mutation={{@mutation}}
-      @label={{@label}}
-      @workItemId={{this.workItem.id}}
-      @type={{@type}}
-      @disabled={{@disabled}}
-      @active={{@active}}
-      @loading={{@loading}}
-      @color={{@color}}
-      @size={{@size}}
-      @title={{@title}}
-      @onSuccess={{@onSuccess}}
-      @onError={{@onError}}
-      @beforeMutate={{@beforeMutate}}
-    >
-      {{#if (has-block)}}
-        {{yield}}
-      {{else if @label}}
-        {{@label}}
-      {{else}}
-        {{t (concat "caluma.mutate-work-item." @mutation)}}
-      {{/if}}
-    </WorkItemButton>
-  {{/if}}
-</div>
+{{#if this.workItem.value}}
+  <WorkItemButton
+    ...attributes
+    @mutation={{@mutation}}
+    @label={{@label}}
+    @workItemId={{decode-id this.workItem.value.id}}
+    @type={{@type}}
+    @disabled={{@disabled}}
+    @active={{@active}}
+    @loading={{@loading}}
+    @color={{@color}}
+    @size={{@size}}
+    @title={{@title}}
+    @onSuccess={{@onSuccess}}
+    @onError={{@onError}}
+    @beforeMutate={{@beforeMutate}}
+  >
+    {{#if (has-block)}}
+      {{yield}}
+    {{else if @label}}
+      {{@label}}
+    {{else}}
+      {{t (concat "caluma.mutate-work-item." @mutation)}}
+    {{/if}}
+  </WorkItemButton>
+{{/if}}

package/addon/components/task-button.js

@@ -1,7 +1,8 @@
 import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
-import { lastValue, dropTask } from "ember-concurrency";
+import { dropTask } from "ember-concurrency";
+import { useTask } from "ember-resources";
 
 import allWorkItems from "@projectcaluma/ember-workflow/gql/queries/all-work-items.graphql";
 
@@ -34,20 +35,19 @@ export default class TaskButtonComponent extends Component {
   @service notification;
   @service intl;
 
-  @lastValue("fetchWorkItem") workItem;
+  workItem = useTask(this, this.fetchWorkItem, () => [
+    this.args.task,
+    this.args.filters,
+  ]);
 
   @dropTask
-  *fetchWorkItem() {
+  *fetchWorkItem(task, filters) {
     try {
       const response = yield this.apollo.query(
         {
           query: allWorkItems,
           variables: {
-            filter: [
-              { task: this.args.task },
-              { status: "READY" },
-              ...(this.args.filters || []),
-            ],
+            filter: [{ task }, { status: "READY" }, ...(filters ?? [])],
           },
         },
         "allWorkItems.edges"

package/addon/gql/mutations/cancel-work-item.graphql

@@ -1,5 +1,8 @@
 mutation CancelWorkItem($id: ID!) {
   cancelWorkItem(input: { id: $id }) {
-    clientMutationId
+    workItem {
+      id
+      status
+    }
   }
 }

package/addon/gql/mutations/complete-work-item.graphql

@@ -1,5 +1,8 @@
 mutation CompleteWorkItem($id: ID!) {
   completeWorkItem(input: { id: $id }) {
-    clientMutationId
+    workItem {
+      id
+      status
+    }
   }
 }

package/addon/gql/mutations/skip-work-item.graphql

@@ -1,5 +1,8 @@
 mutation SkipWorkItem($id: ID!) {
   skipWorkItem(input: { id: $id }) {
-    clientMutationId
+    workItem {
+      id
+      status
+    }
   }
 }

package/addon/gql/queries/all-work-items.graphql

@@ -1,5 +1,5 @@
 query AllWorkItems($filter: [WorkItemFilterSetType]!) {
-  allWorkItems(filter: $filter) {
+  allWorkItems(filter: $filter, first: 1) {
     edges {
       node {
         id

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-workflow",
-  "version": "11.0.0-beta.2",
+  "version": "11.0.0-beta.3",
   "description": "Ember addon for Caluma workflow tools.",
   "keywords": [
     "ember-addon"
@@ -24,8 +24,9 @@
     "ember-cli-htmlbars": "^6.0.1",
     "ember-composable-helpers": "^5.0.0",
     "ember-fetch": "^8.1.1",
+    "ember-resources": "^4.2.0",
     "ember-truth-helpers": "^3.0.0",
-    "ember-uikit": "^5.0.0-beta.3",
+    "ember-uikit": "^5.0.0-beta.9",
     "graphql": "^15.8.0",
     "moment": "^2.29.1"
   },
@@ -33,7 +34,7 @@
     "@ember/optional-features": "2.0.0",
     "@ember/test-helpers": "2.6.0",
     "@embroider/test-setup": "1.0.0",
-    "@faker-js/faker": "6.0.0-alpha.3",
+    "@faker-js/faker": "6.0.0-alpha.5",
     "@projectcaluma/ember-testing": "10.2.0-beta.2",
     "broccoli-asset-rev": "3.0.0",
     "ember-cli": "3.28.5",
@@ -56,7 +57,7 @@
     "npm-run-all": "4.1.5",
     "qunit": "2.17.2",
     "qunit-dom": "2.0.0",
-    "webpack": "5.67.0"
+    "webpack": "5.68.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"