@nocobase/plugin-workflow-manual 0.20.0-alpha.16 → 0.20.0-alpha.17

package/src/client/__e2e__/updateRecordForm.test.ts

@@ -10,6 +10,7 @@ import {
   apiUpdateWorkflowTrigger,
   appendJsonCollectionName,
   generalWithNoRelationalFields,
+  apiGetDataSourceCount,
 } from '@nocobase/plugin-workflow-test/e2e';
 import { expect, test } from '@nocobase/test/e2e';
 import { dayjs } from '@nocobase/utils';
@@ -97,6 +98,10 @@ test.describe('field data update', () => {
     await manualNode.configureUserInterfaceButton.click();
     await manualNode.addBlockButton.hover();
     await manualNode.updateRecordFormMenu.hover();
+    const dataSourcesCount = await apiGetDataSourceCount();
+    if (dataSourcesCount > 1) {
+      await page.getByRole('menuitem', { name: 'Main right' }).hover();
+    }
     await page.getByRole('menuitem', { name: manualNodeCollectionDisplayName }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page
@@ -249,6 +254,10 @@ test.describe('field data update', () => {
     await manualNode.configureUserInterfaceButton.click();
     await manualNode.addBlockButton.hover();
     await manualNode.updateRecordFormMenu.hover();
+    const dataSourcesCount = await apiGetDataSourceCount();
+    if (dataSourcesCount > 1) {
+      await page.getByRole('menuitem', { name: 'Main right' }).hover();
+    }
     await page.getByRole('menuitem', { name: manualNodeCollectionDisplayName }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page
@@ -401,6 +410,10 @@ test.describe('field data update', () => {
     await manualNode.configureUserInterfaceButton.click();
     await manualNode.addBlockButton.hover();
     await manualNode.updateRecordFormMenu.hover();
+    const dataSourcesCount = await apiGetDataSourceCount();
+    if (dataSourcesCount > 1) {
+      await page.getByRole('menuitem', { name: 'Main right' }).hover();
+    }
     await page.getByRole('menuitem', { name: manualNodeCollectionDisplayName }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page
@@ -553,6 +566,10 @@ test.describe('field data update', () => {
     await manualNode.configureUserInterfaceButton.click();
     await manualNode.addBlockButton.hover();
     await manualNode.updateRecordFormMenu.hover();
+    const dataSourcesCount = await apiGetDataSourceCount();
+    if (dataSourcesCount > 1) {
+      await page.getByRole('menuitem', { name: 'Main right' }).hover();
+    }
     await page.getByRole('menuitem', { name: manualNodeCollectionDisplayName }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page
@@ -705,6 +722,10 @@ test.describe('field data update', () => {
     await manualNode.configureUserInterfaceButton.click();
     await manualNode.addBlockButton.hover();
     await manualNode.updateRecordFormMenu.hover();
+    const dataSourcesCount = await apiGetDataSourceCount();
+    if (dataSourcesCount > 1) {
+      await page.getByRole('menuitem', { name: 'Main right' }).hover();
+    }
     await page.getByRole('menuitem', { name: manualNodeCollectionDisplayName }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page
@@ -857,6 +878,10 @@ test.describe('field data update', () => {
     await manualNode.configureUserInterfaceButton.click();
     await manualNode.addBlockButton.hover();
     await manualNode.updateRecordFormMenu.hover();
+    const dataSourcesCount = await apiGetDataSourceCount();
+    if (dataSourcesCount > 1) {
+      await page.getByRole('menuitem', { name: 'Main right' }).hover();
+    }
     await page.getByRole('menuitem', { name: manualNodeCollectionDisplayName }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page
@@ -1025,6 +1050,10 @@ test.describe('field data update', () => {
     await manualNode.configureUserInterfaceButton.click();
     await manualNode.addBlockButton.hover();
     await manualNode.updateRecordFormMenu.hover();
+    const dataSourcesCount = await apiGetDataSourceCount();
+    if (dataSourcesCount > 1) {
+      await page.getByRole('menuitem', { name: 'Main right' }).hover();
+    }
     await page.getByRole('menuitem', { name: manualNodeCollectionDisplayName }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page
@@ -1193,6 +1222,10 @@ test.describe('field data update', () => {
     await manualNode.configureUserInterfaceButton.click();
     await manualNode.addBlockButton.hover();
     await manualNode.updateRecordFormMenu.hover();
+    const dataSourcesCount = await apiGetDataSourceCount();
+    if (dataSourcesCount > 1) {
+      await page.getByRole('menuitem', { name: 'Main right' }).hover();
+    }
     await page.getByRole('menuitem', { name: manualNodeCollectionDisplayName }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page
@@ -1361,6 +1394,10 @@ test.describe('field data update', () => {
     await manualNode.configureUserInterfaceButton.click();
     await manualNode.addBlockButton.hover();
     await manualNode.updateRecordFormMenu.hover();
+    const dataSourcesCount = await apiGetDataSourceCount();
+    if (dataSourcesCount > 1) {
+      await page.getByRole('menuitem', { name: 'Main right' }).hover();
+    }
     await page.getByRole('menuitem', { name: manualNodeCollectionDisplayName }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page
@@ -1530,6 +1567,10 @@ test.describe('field data update', () => {
     await manualNode.configureUserInterfaceButton.click();
     await manualNode.addBlockButton.hover();
     await manualNode.updateRecordFormMenu.hover();
+    const dataSourcesCount = await apiGetDataSourceCount();
+    if (dataSourcesCount > 1) {
+      await page.getByRole('menuitem', { name: 'Main right' }).hover();
+    }
     await page.getByRole('menuitem', { name: manualNodeCollectionDisplayName }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page
@@ -1707,6 +1748,10 @@ test.describe('field data update', () => {
     await manualNode.configureUserInterfaceButton.click();
     await manualNode.addBlockButton.hover();
     await manualNode.updateRecordFormMenu.hover();
+    const dataSourcesCount = await apiGetDataSourceCount();
+    if (dataSourcesCount > 1) {
+      await page.getByRole('menuitem', { name: 'Main right' }).hover();
+    }
     await page.getByRole('menuitem', { name: manualNodeCollectionDisplayName }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page
@@ -1875,6 +1920,10 @@ test.describe('field data update', () => {
     await manualNode.configureUserInterfaceButton.click();
     await manualNode.addBlockButton.hover();
     await manualNode.updateRecordFormMenu.hover();
+    const dataSourcesCount = await apiGetDataSourceCount();
+    if (dataSourcesCount > 1) {
+      await page.getByRole('menuitem', { name: 'Main right' }).hover();
+    }
     await page.getByRole('menuitem', { name: manualNodeCollectionDisplayName }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page
@@ -2049,6 +2098,10 @@ test.describe('field data update', () => {
     await manualNode.configureUserInterfaceButton.click();
     await manualNode.addBlockButton.hover();
     await manualNode.updateRecordFormMenu.hover();
+    const dataSourcesCount = await apiGetDataSourceCount();
+    if (dataSourcesCount > 1) {
+      await page.getByRole('menuitem', { name: 'Main right' }).hover();
+    }
     await page.getByRole('menuitem', { name: manualNodeCollectionDisplayName }).click();
     await page.mouse.move(300, 0, { steps: 100 });
     await page

package/src/client/__e2e__/workflowTodo.test.ts

@@ -8,6 +8,7 @@ import {
   apiUpdateWorkflowTrigger,
   appendJsonCollectionName,
   generalWithNoRelationalFields,
+  apiGetDataSourceCount,
 } from '@nocobase/plugin-workflow-test/e2e';
 import { expect, test } from '@nocobase/test/e2e';
 import { dayjs } from '@nocobase/utils';
@@ -69,6 +70,10 @@ test('filter task node', async ({ page, mockPage, mockCollections, mockRecords }
   await manualNode.configureUserInterfaceButton.click();
   await manualNode.addBlockButton.hover();
   await manualNode.createRecordFormMenu.hover();
+  const dataSourcesCount = await apiGetDataSourceCount();
+  if (dataSourcesCount > 1) {
+    await page.getByRole('menuitem', { name: 'Main right' }).hover();
+  }
   await page.getByRole('menuitem', { name: manualNodeCollectionDisplayName }).click();
   await page.mouse.move(300, 0, { steps: 100 });
   await page
@@ -179,6 +184,10 @@ test('filter workflow name', async ({ page, mockPage, mockCollections, mockRecor
   await manualNode.configureUserInterfaceButton.click();
   await manualNode.addBlockButton.hover();
   await manualNode.createRecordFormMenu.hover();
+  const dataSourcesCount = await apiGetDataSourceCount();
+  if (dataSourcesCount > 1) {
+    await page.getByRole('menuitem', { name: 'Main right' }).hover();
+  }
   await page.getByRole('menuitem', { name: manualNodeCollectionDisplayName }).click();
   await page.mouse.move(300, 0, { steps: 100 });
   await page

package/src/client/instruction/SchemaConfig.tsx

@@ -35,6 +35,8 @@ import {
 } from '@nocobase/client';
 import WorkflowPlugin, {
   JOB_STATUS,
+  DetailsBlockProvider,
+  SimpleDesigner,
   useAvailableUpstreams,
   useFlowContext,
   useNodeContext,
@@ -44,7 +46,6 @@ import WorkflowPlugin, {
 import { Registry, lodash } from '@nocobase/utils/client';
 
 import { NAMESPACE, useLang } from '../../locale';
-import { DetailsBlockProvider } from './DetailsBlockProvider';
 import { FormBlockProvider } from './FormBlockProvider';
 import createRecordForm from './forms/create';
 import customRecordForm from './forms/custom';
@@ -104,24 +105,6 @@ const blockTypeNames = {
   record: `{{t("Data record", { ns: "${NAMESPACE}" })}}`,
 };
 
-function SimpleDesigner() {
-  const schema = useFieldSchema();
-  const title = blockTypeNames[schema['x-designer-props']?.type] ?? '{{t("Block")}}';
-  const compile = useCompile();
-  return (
-    <GeneralSchemaDesigner title={compile(title)}>
-      <SchemaSettingsBlockTitleItem />
-      <SchemaSettingsDivider />
-      <SchemaSettingsRemove
-        removeParentsIfNoChildren
-        breakRemoveOn={{
-          'x-component': 'Grid',
-        }}
-      />
-    </GeneralSchemaDesigner>
-  );
-}
-
 /**
  * @deprecated
  */
@@ -153,7 +136,7 @@ export const addBlockButton_deprecated = new CompatibleSchemaInitializer({
                 {
                   name: 'nodes',
                   type: 'subMenu',
-                  title: `{{t("Node result", { ns: "${NAMESPACE}" })}}`,
+                  title: `{{t("Node result", { ns: "workflow" })}}`,
                   children: nodeBlockInitializers,
                 },
               ]

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

@@ -3,7 +3,7 @@ import React, { useContext, useMemo, useState } from 'react';
 import { ArrayTable } from '@formily/antd-v5';
 import { Field, createForm } from '@formily/core';
 import { useField, useFieldSchema, useForm } from '@formily/react';
-import lodash from 'lodash';
+import { cloneDeep, pick, set } from 'lodash';
 
 import {
   ActionContextProvider,
@@ -161,7 +161,7 @@ function getOptions(interfaces) {
     const schema = interfaces[type];
     const { group = 'others' } = schema;
     fields[group] = fields[group] || {};
-    lodash.set(fields, [group, type], schema);
+    set(fields, [group, type], schema);
   });
 
   return Object.keys(GroupLabels)
@@ -208,33 +208,51 @@ const CustomItemsComponent = (props) => {
   const items = useCommonInterfaceInitializers();
   const collection = useCollection_deprecated();
   const { setCollectionFields } = useContext(FormBlockContext);
+  const form = useMemo(() => createForm(), [interfaceOptions]);
 
   return (
     <AddCustomFormFieldButtonContext.Provider
       value={{
         onAddField(item) {
+          const fieldInterface: Record<string, any> = pick(item, [
+            'name',
+            'group',
+            'title',
+            'default',
+            'validateSchema',
+          ]);
           const {
-            properties: { unique, type, ...properties },
-            ...options
-          } = lodash.cloneDeep(item);
-          delete properties.name['x-disabled'];
-          setInterface({
-            ...options,
-            properties,
-          });
+            properties: { unique, type, layout, autoIncrement, ...properties },
+          } = item;
+          fieldInterface.properties = properties;
+          const result = cloneDeep(fieldInterface);
+          delete result.properties.name['x-disabled'];
+          setInterface(result);
         },
         setCallback,
       }}
     >
       <SchemaInitializerItems {...props} items={items} />
-      <ActionContextProvider value={{ visible: Boolean(interfaceOptions) }}>
+      <ActionContextProvider
+        value={{
+          visible: Boolean(interfaceOptions),
+          setVisible(v) {
+            if (!v) {
+              setInterface(null);
+            }
+          },
+        }}
+      >
         {interfaceOptions ? (
           <SchemaComponent
             schema={{
               type: 'void',
               name: 'drawer',
               title: '{{t("Configure field")}}',
-              'x-decorator': 'Form',
+              'x-decorator': 'FormV2',
+              'x-decorator-props': {
+                form,
+              },
               'x-component': 'Action.Drawer',
               properties: {
                 ...interfaceOptions.properties,
@@ -266,7 +284,7 @@ const CustomItemsComponent = (props) => {
                       'x-component-props': {
                         type: 'primary',
                         useAction() {
-                          const { values, query } = useForm();
+                          const { values, query, reset } = useForm();
                           const messages = [useLang('Field name existed in form')];
                           return {
                             async run() {
@@ -301,6 +319,7 @@ const CustomItemsComponent = (props) => {
                                 'x-toolbar': 'FormItemSchemaToolbar',
                                 'x-settings': 'fieldSettings:FormItem',
                               });
+                              reset();
                               setCallback(null);
                               setInterface(null);
                             },

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/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' });
+      });
+    });
+  });
+});