@nocobase/plugin-workflow-manual 0.21.0-alpha.14 → 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.14",
-  "@nocobase/plugin-workflow": "0.21.0-alpha.14",
+  "@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.14",
-  "@nocobase/server": "0.21.0-alpha.14",
-  "@nocobase/actions": "0.21.0-alpha.14",
-  "@nocobase/resourcer": "0.21.0-alpha.14",
-  "@nocobase/plugin-workflow-test": "0.21.0-alpha.14",
-  "@nocobase/test": "0.21.0-alpha.14",
+  "@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.14",
+  "@nocobase/database": "0.21.0-alpha.16",
   "lodash": "4.17.21"
 };

package/dist/server/ManualInstruction.js

@@ -100,14 +100,17 @@ class ManualInstruction_default extends import_plugin_workflow.Instruction {
   formTypes = new import_utils.Registry();
   async run(node, prevJob, processor) {
     const { mode, ...config } = node.config;
-    const assignees = [...new Set(processor.getParsedValue(config.assignees, node.id) || [])];
+    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) => ({
@@ -126,7 +129,8 @@ class ManualInstruction_default extends import_plugin_workflow.Instruction {
   }
   async resume(node, job, processor) {
     var _a;
-    const { assignees = [], mode } = node.config;
+    const { mode } = node.config;
+    const assignees = [...new Set(processor.getParsedValue(node.config.assignees, node.id).flat().filter(Boolean))];
     const UserJobModel = this.workflow.app.db.getModel("users_jobs");
     const distribution = await UserJobModel.count({
       where: {

package/dist/server/actions.js

@@ -63,7 +63,7 @@ async function submit(context, next) {
   userJob.execution.workflow = userJob.workflow;
   const processor = plugin.createProcessor(userJob.execution);
   await processor.prepare();
-  const assignees = processor.getParsedValue(userJob.node.config.assignees ?? [], userJob.nodeId);
+  const assignees = processor.getParsedValue(userJob.node.config.assignees ?? [], userJob.nodeId).flat().filter(Boolean);
   if (!assignees.includes(currentUser.id) || userJob.userId !== currentUser.id) {
     return context.throw(403);
   }

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.14",
+  "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": "dbcca03c0535e14f0b09fd13306731b4438829c4",
+  "gitHead": "2914500f14e4454cc5702a49371230865660ca33",
   "keywords": [
     "Workflow"
   ]

package/src/server/ManualInstruction.ts

@@ -93,16 +93,20 @@ export default class extends Instruction {
 
   async run(node, prevJob, processor: Processor) {
     const { mode, ...config } = node.config as ManualConfig;
-    const assignees = [...new Set(processor.getParsedValue(config.assignees, node.id) || [])];
+    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(
@@ -124,7 +128,8 @@ export default class extends Instruction {
 
   async resume(node, job, processor: Processor) {
     // NOTE: check all users jobs related if all done then continue as parallel
-    const { assignees = [], mode } = node.config as ManualConfig;
+    const { mode } = node.config as ManualConfig;
+    const assignees = [...new Set(processor.getParsedValue(node.config.assignees, node.id).flat().filter(Boolean))];
 
     const UserJobModel = this.workflow.app.db.getModel('users_jobs');
     const distribution = await UserJobModel.count({

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

@@ -0,0 +1,153 @@
+import Database from '@nocobase/database';
+import { EXECUTION_STATUS, JOB_STATUS } from '@nocobase/plugin-workflow';
+import { getApp, sleep } from '@nocobase/plugin-workflow-test';
+import { MockServer } from '@nocobase/test';
+
+// NOTE: skipped because time is not stable on github ci, but should work in local
+describe('workflow > instructions > manual > assignees', () => {
+  let app: MockServer;
+  let agent;
+  let userAgents;
+  let db: Database;
+  let PostRepo;
+  let CommentRepo;
+  let WorkflowModel;
+  let workflow;
+  let UserModel;
+  let users;
+  let UserJobModel;
+
+  beforeEach(async () => {
+    app = await getApp({
+      plugins: ['users', 'auth', 'workflow-manual'],
+    });
+    // await app.getPlugin('auth').install();
+    agent = app.agent();
+    db = app.db;
+    WorkflowModel = db.getCollection('workflows').model;
+    PostRepo = db.getCollection('posts').repository;
+    CommentRepo = db.getCollection('comments').repository;
+    UserModel = db.getCollection('users').model;
+    UserJobModel = db.getModel('users_jobs');
+
+    users = await UserModel.bulkCreate([
+      { id: 2, nickname: 'a' },
+      { id: 3, nickname: 'b' },
+    ]);
+
+    userAgents = users.map((user) => app.agent().login(user));
+
+    workflow = await WorkflowModel.create({
+      enabled: true,
+      type: 'collection',
+      config: {
+        mode: 1,
+        collection: 'posts',
+        appends: ['category', 'category.posts'],
+      },
+    });
+  });
+
+  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({
+        type: 'manual',
+        config: {
+          assignees: [`{{$context.data.category.posts.createdById}}`],
+          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.STARTED);
+      const [j1] = await pending.getJobs();
+      expect(j1.status).toBe(JOB_STATUS.PENDING);
+
+      const usersJobs = await UserJobModel.findAll();
+      expect(usersJobs.length).toBe(1);
+      expect(usersJobs[0].status).toBe(JOB_STATUS.PENDING);
+      expect(usersJobs[0].userId).toBe(users[0].id);
+      expect(usersJobs[0].jobId).toBe(j1.id);
+
+      const res1 = await agent.resource('users_jobs').submit({
+        filterByTk: usersJobs[0].id,
+        values: { result: { f1: {}, _: 'resolve' } },
+      });
+      expect(res1.status).toBe(401);
+
+      const res2 = await userAgents[1].resource('users_jobs').submit({
+        filterByTk: usersJobs[0].id,
+        values: {
+          result: { f1: {}, _: 'resolve' },
+        },
+      });
+      expect(res2.status).toBe(403);
+
+      const res3 = await userAgents[0].resource('users_jobs').submit({
+        filterByTk: usersJobs[0].id,
+        values: {
+          result: { f1: { a: 1 }, _: 'resolve' },
+        },
+      });
+      expect(res3.status).toBe(202);
+
+      await sleep(1000);
+
+      const [j2] = await pending.getJobs();
+      expect(j2.status).toBe(JOB_STATUS.RESOLVED);
+      expect(j2.result).toEqual({ f1: { a: 1 }, _: 'resolve' });
+
+      const usersJobsAfter = await UserJobModel.findAll();
+      expect(usersJobsAfter.length).toBe(1);
+      expect(usersJobsAfter[0].status).toBe(JOB_STATUS.RESOLVED);
+      expect(usersJobsAfter[0].result).toEqual({ f1: { a: 1 }, _: 'resolve' });
+
+      const res4 = await userAgents[0].resource('users_jobs').submit({
+        filterByTk: usersJobs[0].id,
+        values: {
+          result: { f1: { a: 2 }, _: 'resolve' },
+        },
+      });
+      expect(res4.status).toBe(400);
+    });
+  });
+});

package/src/server/actions.ts

@@ -50,7 +50,10 @@ export async function submit(context: Context, next) {
   await processor.prepare();
 
   // NOTE: validate assignee
-  const assignees = processor.getParsedValue(userJob.node.config.assignees ?? [], userJob.nodeId);
+  const assignees = processor
+    .getParsedValue(userJob.node.config.assignees ?? [], userJob.nodeId)
+    .flat()
+    .filter(Boolean);
   if (!assignees.includes(currentUser.id) || userJob.userId !== currentUser.id) {
     return context.throw(403);
   }