@nocobase/plugin-workflow-manual 0.21.0-alpha.15 → 0.21.0-alpha.16

package/dist/externalVersion.js

@@ -3,18 +3,18 @@ module.exports = {
   "antd": "5.12.8",
   "dayjs": "1.11.10",
   "react": "18.2.0",
-  "@nocobase/client": "0.21.0-alpha.15",
-  "@nocobase/plugin-workflow": "0.21.0-alpha.15",
+  "@nocobase/client": "0.21.0-alpha.16",
+  "@nocobase/plugin-workflow": "0.21.0-alpha.16",
   "@ant-design/icons": "5.2.6",
   "react-i18next": "11.18.6",
-  "@nocobase/utils": "0.21.0-alpha.15",
-  "@nocobase/server": "0.21.0-alpha.15",
-  "@nocobase/actions": "0.21.0-alpha.15",
-  "@nocobase/resourcer": "0.21.0-alpha.15",
-  "@nocobase/plugin-workflow-test": "0.21.0-alpha.15",
-  "@nocobase/test": "0.21.0-alpha.15",
+  "@nocobase/utils": "0.21.0-alpha.16",
+  "@nocobase/server": "0.21.0-alpha.16",
+  "@nocobase/actions": "0.21.0-alpha.16",
+  "@nocobase/resourcer": "0.21.0-alpha.16",
+  "@nocobase/plugin-workflow-test": "0.21.0-alpha.16",
+  "@nocobase/test": "0.21.0-alpha.16",
   "@formily/core": "2.3.0",
   "@formily/antd-v5": "1.1.9",
-  "@nocobase/database": "0.21.0-alpha.15",
+  "@nocobase/database": "0.21.0-alpha.16",
   "lodash": "4.17.21"
 };

package/dist/server/ManualInstruction.js

@@ -102,12 +102,15 @@ class ManualInstruction_default extends import_plugin_workflow.Instruction {
     const { mode, ...config } = node.config;
     const assignees = [...new Set(processor.getParsedValue(config.assignees, node.id).flat().filter(Boolean))];
     const job = await processor.saveJob({
-      status: import_plugin_workflow.JOB_STATUS.PENDING,
+      status: assignees.length ? import_plugin_workflow.JOB_STATUS.PENDING : import_plugin_workflow.JOB_STATUS.RESOLVED,
       result: mode ? [] : null,
       nodeId: node.id,
       nodeKey: node.key,
       upstreamId: (prevJob == null ? void 0 : prevJob.id) ?? null
     });
+    if (!assignees.length) {
+      return job;
+    }
     const UserJobModel = this.workflow.app.db.getModel("users_jobs");
     await UserJobModel.bulkCreate(
       assignees.map((userId) => ({

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：人工处理节点",
   "description": "Could be used for workflows which some of decisions are made by users.",
   "description.zh-CN": "用于人工控制部分决策的流程。",
-  "version": "0.21.0-alpha.15",
+  "version": "0.21.0-alpha.16",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-manual",
@@ -30,7 +30,7 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "155a252452eba37d8047d7f4a1c3fb518679abf0",
+  "gitHead": "2914500f14e4454cc5702a49371230865660ca33",
   "keywords": [
     "Workflow"
   ]

package/src/server/ManualInstruction.ts

@@ -96,13 +96,17 @@ export default class extends Instruction {
     const assignees = [...new Set(processor.getParsedValue(config.assignees, node.id).flat().filter(Boolean))];
 
     const job = await processor.saveJob({
-      status: JOB_STATUS.PENDING,
+      status: assignees.length ? JOB_STATUS.PENDING : JOB_STATUS.RESOLVED,
       result: mode ? [] : null,
       nodeId: node.id,
       nodeKey: node.key,
       upstreamId: prevJob?.id ?? null,
     });
 
+    if (!assignees.length) {
+      return job;
+    }
+
     // NOTE: batch create users jobs
     const UserJobModel = this.workflow.app.db.getModel('users_jobs');
     await UserJobModel.bulkCreate(

package/src/server/__tests__/assignees.test.ts

@@ -50,6 +50,32 @@ describe('workflow > instructions > manual > assignees', () => {
 
   afterEach(() => app.destroy());
 
+  describe('no', () => {
+    it('empty assignees', async () => {
+      const n1 = await workflow.createNode({
+        type: 'manual',
+        config: {
+          assignees: [],
+          forms: {
+            f1: {
+              actions: [{ status: JOB_STATUS.RESOLVED, key: 'resolve' }],
+            },
+          },
+        },
+      });
+
+      const post = await PostRepo.create({
+        values: { title: 't1', category: { title: 'c1' } },
+        context: { state: { currentUser: users[0] } },
+      });
+
+      await sleep(500);
+
+      const [pending] = await workflow.getExecutions();
+      expect(pending.status).toBe(EXECUTION_STATUS.RESOLVED);
+    });
+  });
+
   describe('multiple', () => {
     it('assignees from nested array', async () => {
       const n1 = await workflow.createNode({