@nocobase/plugin-workflow-manual 0.20.0-alpha.9 → 0.21.0-alpha.2

package/src/client/instruction/forms/update.tsx

@@ -15,6 +15,7 @@ import {
   useDesignable,
   useMenuSearch,
 } from '@nocobase/client';
+import { isValidFilter } from '@nocobase/utils/client';
 import { FilterDynamicComponent } from '@nocobase/plugin-workflow/client';
 
 import { NAMESPACE } from '../../../locale';
@@ -37,15 +38,15 @@ function UpdateFormDesigner() {
           name: 'filter',
           type: 'object',
           title: `{{t("Filter")}}`,
-          // 'x-decorator': 'FormItem',
           'x-component': 'Filter',
+          'x-use-component-props': () => {
+            // eslint-disable-next-line react-hooks/rules-of-hooks
+            const options = useCollectionFilterOptions(fieldSchema?.['x-decorator-props']?.collection);
+            return {
+              options,
+            };
+          },
           'x-component-props': {
-            useProps() {
-              const options = useCollectionFilterOptions(fieldSchema?.['x-decorator-props']?.collection);
-              return {
-                options,
-              };
-            },
             dynamicComponent: 'FilterDynamicComponent',
           },
         }}
@@ -101,7 +102,7 @@ export default {
         [allCollections],
       );
       const [openMenuKeys, setOpenMenuKeys] = useState([]);
-      const searchedChildren = useMenuSearch(childItems, openMenuKeys);
+      const searchedChildren = useMenuSearch({ data: childItems, openKeys: openMenuKeys });
       return {
         name: 'updateRecordForm',
         key: 'updateRecordForm',
@@ -156,4 +157,11 @@ export default {
     },
     components: {},
   },
+  validate({ filter }) {
+    if (!filter || !isValidFilter(filter)) {
+      return 'Please check one of your update record form, and add at least one filter condition in form settings.';
+    }
+
+    return null;
+  },
 } as ManualFormType;

package/src/client/instruction/index.tsx

@@ -138,7 +138,7 @@ export default class extends Instruction {
               title: form.title ?? formKey,
               Component: CollectionBlockInitializer,
               collection: form.collection,
-              dataSource: `{{$jobsMapByNodeKey.${node.key}.${formKey}}}`,
+              dataPath: `$jobsMapByNodeKey.${node.key}.${formKey}`,
             } as SchemaInitializerItemType)
           : null;
       })

package/src/locale/index.ts

@@ -7,6 +7,8 @@ export function useLang(key: string, options = {}) {
   return t(key);
 }
 
-export function usePluginTranslation(options) {
+export const lang = useLang;
+
+export function usePluginTranslation(options?) {
   return useTranslation(NAMESPACE, options);
 }

package/src/locale/zh-CN.json

@@ -27,5 +27,6 @@
   "Filter settings": "筛选设置",
   "Workflow todos": "工作流待办",
   "Task node": "任务节点",
-  "Unprocessed": "未处理"
+  "Unprocessed": "未处理",
+  "Please check one of your update record form, and add at least one filter condition in form settings.": "请检查您的其中的更新数据表单，并在表单设置中至少添加一个筛选条件。"
 }

package/src/server/__tests__/data-source.test.ts

@@ -0,0 +1,223 @@
+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', () => {
+  let app: MockServer;
+  let agent;
+  let userAgents;
+  let db: Database;
+  let PostRepo;
+  let AnotherPostRepo;
+  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;
+    AnotherPostRepo = app.dataSourceManager.dataSources.get('another').collectionManager.getRepository('posts');
+    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',
+      },
+    });
+  });
+
+  afterEach(() => app.destroy());
+
+  describe('multiple data source', () => {
+    describe('create', () => {
+      it('create as configured', async () => {
+        const n1 = await workflow.createNode({
+          type: 'manual',
+          config: {
+            assignees: [users[0].id],
+            forms: {
+              f1: {
+                type: 'create',
+                actions: [{ status: JOB_STATUS.RESOLVED, key: 'resolve' }],
+                collection: 'posts',
+                dataSource: 'another',
+              },
+            },
+          },
+        });
+
+        const post = await PostRepo.create({ values: { title: 't1' } });
+
+        await sleep(500);
+
+        const UserJobModel = db.getModel('users_jobs');
+        const pendingJobs = await UserJobModel.findAll({
+          order: [['userId', 'ASC']],
+        });
+        expect(pendingJobs.length).toBe(1);
+
+        const res1 = await userAgents[0].resource('users_jobs').submit({
+          filterByTk: pendingJobs[0].get('id'),
+          values: {
+            result: { f1: { title: 't1' }, _: 'resolve' },
+          },
+        });
+        expect(res1.status).toBe(202);
+
+        await sleep(500);
+
+        const [e1] = await workflow.getExecutions();
+        expect(e1.status).toBe(EXECUTION_STATUS.RESOLVED);
+        const [j1] = await e1.getJobs();
+        expect(j1.status).toBe(JOB_STATUS.RESOLVED);
+        expect(j1.result).toMatchObject({ f1: { title: 't1' } });
+
+        const posts = await AnotherPostRepo.find();
+        expect(posts.length).toBe(1);
+        expect(posts[0]).toMatchObject({ title: 't1' });
+      });
+
+      it('save first and then commit', async () => {
+        const n1 = await workflow.createNode({
+          type: 'manual',
+          config: {
+            assignees: [users[0].id],
+            forms: {
+              f1: {
+                type: 'create',
+                actions: [
+                  { status: JOB_STATUS.RESOLVED, key: 'resolve' },
+                  { status: JOB_STATUS.PENDING, key: 'pending' },
+                ],
+                collection: 'posts',
+                dataSource: 'another',
+              },
+            },
+          },
+        });
+
+        const post = await PostRepo.create({ values: { title: 't1' } });
+
+        await sleep(500);
+
+        const UserJobModel = db.getModel('users_jobs');
+        const pendingJobs = await UserJobModel.findAll({
+          order: [['userId', 'ASC']],
+        });
+        expect(pendingJobs.length).toBe(1);
+
+        const res1 = await userAgents[0].resource('users_jobs').submit({
+          filterByTk: pendingJobs[0].get('id'),
+          values: {
+            result: { f1: { title: 't1' }, _: 'pending' },
+          },
+        });
+        expect(res1.status).toBe(202);
+
+        await sleep(500);
+
+        const [e1] = await workflow.getExecutions();
+        expect(e1.status).toBe(EXECUTION_STATUS.STARTED);
+        const [j1] = await e1.getJobs();
+        expect(j1.status).toBe(JOB_STATUS.PENDING);
+        expect(j1.result).toMatchObject({ f1: { title: 't1' } });
+
+        const c1 = await AnotherPostRepo.find();
+        expect(c1.length).toBe(0);
+
+        const res2 = await userAgents[0].resource('users_jobs').submit({
+          filterByTk: pendingJobs[0].get('id'),
+          values: {
+            result: { f1: { title: 't2' }, _: 'resolve' },
+          },
+        });
+
+        await sleep(500);
+
+        const [e2] = await workflow.getExecutions();
+        expect(e2.status).toBe(EXECUTION_STATUS.RESOLVED);
+        const [j2] = await e2.getJobs();
+        expect(j2.status).toBe(JOB_STATUS.RESOLVED);
+        expect(j2.result).toMatchObject({ f1: { title: 't2' } });
+
+        const c2 = await AnotherPostRepo.find();
+        expect(c2.length).toBe(1);
+      });
+    });
+
+    describe('update', () => {
+      it('update as configured', async () => {
+        const post = await AnotherPostRepo.create({ values: { title: 't1' } });
+
+        const n1 = await workflow.createNode({
+          type: 'manual',
+          config: {
+            assignees: [users[0].id],
+            forms: {
+              f1: {
+                type: 'update',
+                actions: [{ status: JOB_STATUS.RESOLVED, key: 'resolve' }],
+                collection: 'posts',
+                dataSource: 'another',
+                filter: {
+                  id: post.id,
+                },
+              },
+            },
+          },
+        });
+
+        await PostRepo.create({ values: { title: 't1' } });
+
+        await sleep(500);
+
+        const UserJobModel = db.getModel('users_jobs');
+        const pendingJobs = await UserJobModel.findAll({
+          order: [['userId', 'ASC']],
+        });
+        expect(pendingJobs.length).toBe(1);
+
+        const res1 = await userAgents[0].resource('users_jobs').submit({
+          filterByTk: pendingJobs[0].get('id'),
+          values: {
+            result: { f1: { title: 't2' }, _: 'resolve' },
+          },
+        });
+        expect(res1.status).toBe(202);
+
+        await sleep(500);
+
+        const [e2] = await workflow.getExecutions();
+        expect(e2.status).toBe(EXECUTION_STATUS.RESOLVED);
+        const [j1] = await e2.getJobs();
+        expect(j1.status).toBe(JOB_STATUS.RESOLVED);
+        expect(j1.result).toMatchObject({ f1: { title: 't2' } });
+
+        const postsAfter = await AnotherPostRepo.find();
+        expect(postsAfter.length).toBe(1);
+        expect(postsAfter[0]).toMatchObject({ title: 't2' });
+      });
+    });
+  });
+});