@nocobase/plugin-workflow-test 0.19.0-alpha.4 → 0.19.0-alpha.6

package/dist/e2e/e2ePageObjectModel.d.ts

@@ -254,6 +254,20 @@ export declare class SQLNode {
     addNodeButton: Locator;
     constructor(page: Page, nodeName: string);
 }
+export declare class ParallelBranchNode {
+    readonly page: Page;
+    node: Locator;
+    nodeTitle: Locator;
+    nodeConfigure: Locator;
+    addBranchButton: Locator;
+    allSucceededRadio: Locator;
+    anySucceededRadio: Locator;
+    anySucceededOrFailedRadio: Locator;
+    submitButton: Locator;
+    cancelButton: Locator;
+    addNodeButton: Locator;
+    constructor(page: Page, nodeName: string);
+}
 declare const _default: {
     CreateWorkFlow: typeof CreateWorkFlow;
     EditWorkFlow: typeof EditWorkFlow;
@@ -274,5 +288,6 @@ declare const _default: {
     ConditionYesNode: typeof ConditionYesNode;
     ConditionBranchNode: typeof ConditionBranchNode;
     SQLNode: typeof SQLNode;
+    ParallelBranchNode: typeof ParallelBranchNode;
 };
 export default _default;

package/dist/e2e/e2ePageObjectModel.js

@@ -30,6 +30,7 @@ __export(e2ePageObjectModel_exports, {
   EditWorkFlow: () => EditWorkFlow,
   FormEventTriggerNode: () => FormEventTriggerNode,
   ManualNode: () => ManualNode,
+  ParallelBranchNode: () => ParallelBranchNode,
   QueryRecordNode: () => QueryRecordNode,
   SQLNode: () => SQLNode,
   ScheduleTriggerNode: () => ScheduleTriggerNode,
@@ -431,11 +432,11 @@ class ManualNode {
     this.assigneesDropDown = page.getByTestId("select-single");
     this.configureUserInterfaceButton = page.getByRole("button", { name: "Configure user interface" });
     this.addBlockButton = page.getByLabel("schema-initializer-Grid-AddBlockButton-workflows");
-    this.triggerDataMenu = page.getByLabel("Data blocks-triggerData");
-    this.nodeDataMenu = page.getByLabel("nodes", { exact: true });
+    this.triggerDataMenu = page.getByRole("menuitem", { name: "Trigger data" });
+    this.nodeDataMenu = page.getByRole("menuitem", { name: "Node result right" });
     this.customFormMenu = page.getByRole("menuitem", { name: "Custom form" });
-    this.createRecordFormMenu = page.getByRole("menuitem", { name: "Create record form" });
-    this.updateRecordFormMenu = page.getByRole("menuitem", { name: "Update record form" });
+    this.createRecordFormMenu = page.getByRole("menuitem", { name: "Create record form right" });
+    this.updateRecordFormMenu = page.getByRole("menuitem", { name: "Update record form right" });
     this.submitButton = page.getByLabel("action-Action-Submit-workflows");
     this.cancelButton = page.getByLabel("action-Action-Cancel-workflows");
     this.addNodeButton = page.getByLabel(`add-button-manual-${nodeName}`, { exact: true });
@@ -517,6 +518,32 @@ class SQLNode {
     this.addNodeButton = page.getByLabel(`add-button-sql-${nodeName}`, { exact: true });
   }
 }
+class ParallelBranchNode {
+  page;
+  node;
+  nodeTitle;
+  nodeConfigure;
+  addBranchButton;
+  allSucceededRadio;
+  anySucceededRadio;
+  anySucceededOrFailedRadio;
+  submitButton;
+  cancelButton;
+  addNodeButton;
+  constructor(page, nodeName) {
+    this.page = page;
+    this.node = page.getByLabel(`Parallel branch-${nodeName}`, { exact: true });
+    this.nodeTitle = page.locator("textarea").filter({ hasText: nodeName });
+    this.nodeConfigure = page.getByLabel(`Parallel branch-${nodeName}`).getByRole("button", { name: "Configure" });
+    this.addBranchButton = page.getByLabel(`add-button-parallel-${nodeName}-add-branch`, { exact: true });
+    this.allSucceededRadio = page.getByLabel("All succeeded", { exact: true });
+    this.anySucceededRadio = page.getByLabel("Any succeeded", { exact: true });
+    this.anySucceededOrFailedRadio = page.getByLabel("Any succeeded or failed", { exact: true });
+    this.submitButton = page.getByLabel("action-Action-Submit-workflows");
+    this.cancelButton = page.getByLabel("action-Action-Cancel-workflows");
+    this.addNodeButton = page.getByLabel(`add-button-parallel-${nodeName}`, { exact: true });
+  }
+}
 var e2ePageObjectModel_default = module.exports = {
   CreateWorkFlow,
   EditWorkFlow,
@@ -536,7 +563,8 @@ var e2ePageObjectModel_default = module.exports = {
   ManualNode,
   ConditionYesNode,
   ConditionBranchNode,
-  SQLNode
+  SQLNode,
+  ParallelBranchNode
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -553,6 +581,7 @@ var e2ePageObjectModel_default = module.exports = {
   EditWorkFlow,
   FormEventTriggerNode,
   ManualNode,
+  ParallelBranchNode,
   QueryRecordNode,
   SQLNode,
   ScheduleTriggerNode,

package/dist/e2e/e2eUtils.d.ts

@@ -10,6 +10,7 @@ export declare const apiGetWorkflowNodeExecutions: (id: number) => Promise<any>;
 export declare const apiUpdateRecord: (collectionName: string, id: number, data: any) => Promise<any>;
 export declare const apiGetRecord: (collectionName: string, id: number) => Promise<any>;
 export declare const apiGetList: (collectionName: string) => Promise<any>;
+export declare const apiFilterList: (collectionName: string, filter: string) => Promise<any>;
 export declare const apiCreateRecordTriggerFormEvent: (collectionName: string, triggerWorkflows: string, data: any) => Promise<any>;
 export declare const apiSubmitRecordTriggerFormEvent: (triggerWorkflows: string, data: any) => Promise<any>;
 declare const _default: {
@@ -27,5 +28,6 @@ declare const _default: {
     apiGetList: (collectionName: string) => Promise<any>;
     apiCreateRecordTriggerFormEvent: (collectionName: string, triggerWorkflows: string, data: any) => Promise<any>;
     apiSubmitRecordTriggerFormEvent: (triggerWorkflows: string, data: any) => Promise<any>;
+    apiFilterList: (collectionName: string, filter: string) => Promise<any>;
 };
 export default _default;

package/dist/e2e/e2eUtils.js

@@ -21,6 +21,7 @@ __export(e2eUtils_exports, {
   apiCreateWorkflow: () => apiCreateWorkflow,
   apiCreateWorkflowNode: () => apiCreateWorkflowNode,
   apiDeleteWorkflow: () => apiDeleteWorkflow,
+  apiFilterList: () => apiFilterList,
   apiGetList: () => apiGetList,
   apiGetRecord: () => apiGetRecord,
   apiGetWorkflow: () => apiGetWorkflow,
@@ -212,6 +213,20 @@ const apiGetList = async (collectionName) => {
   }
   return await result.json();
 };
+const apiFilterList = async (collectionName, filter) => {
+  const api = await import_e2e.request.newContext({
+    storageState: process.env.PLAYWRIGHT_AUTH_FILE
+  });
+  const state = await api.storageState();
+  const headers = getHeaders(state);
+  const result = await api.get(`/api/${collectionName}:list?${filter}`, {
+    headers
+  });
+  if (!result.ok()) {
+    throw new Error(await result.text());
+  }
+  return await result.json();
+};
 const apiCreateRecordTriggerFormEvent = async (collectionName, triggerWorkflows, data) => {
   const api = await import_e2e.request.newContext({
     storageState: process.env.PLAYWRIGHT_AUTH_FILE
@@ -297,7 +312,8 @@ var e2eUtils_default = module.exports = {
   apiGetRecord,
   apiGetList,
   apiCreateRecordTriggerFormEvent,
-  apiSubmitRecordTriggerFormEvent
+  apiSubmitRecordTriggerFormEvent,
+  apiFilterList
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -305,6 +321,7 @@ var e2eUtils_default = module.exports = {
   apiCreateWorkflow,
   apiCreateWorkflowNode,
   apiDeleteWorkflow,
+  apiFilterList,
   apiGetList,
   apiGetRecord,
   apiGetWorkflow,

package/dist/externalVersion.js

@@ -1,8 +1,8 @@
 module.exports = {
-  "@nocobase/client": "0.19.0-alpha.4",
-  "@nocobase/utils": "0.19.0-alpha.4",
+  "@nocobase/client": "0.19.0-alpha.6",
+  "@nocobase/utils": "0.19.0-alpha.6",
   "lodash": "4.17.21",
-  "@nocobase/test": "0.19.0-alpha.4",
-  "@nocobase/server": "0.19.0-alpha.4",
-  "@nocobase/database": "0.19.0-alpha.4"
+  "@nocobase/test": "0.19.0-alpha.6",
+  "@nocobase/server": "0.19.0-alpha.6",
+  "@nocobase/database": "0.19.0-alpha.6"
 };

package/dist/server/triggers.d.ts

@@ -5,6 +5,7 @@ declare const _default: {
             on(): void;
             off(): void;
             sync: boolean;
+            validateEvent(): boolean;
         };
     };
     asyncTrigger: {
@@ -12,6 +13,7 @@ declare const _default: {
             readonly workflow: any;
             on(): void;
             off(): void;
+            validateEvent(): boolean;
         };
     };
 };

package/dist/server/triggers.js

@@ -30,6 +30,9 @@ var triggers_default = {
     off() {
     }
     sync = true;
+    validateEvent() {
+      return true;
+    }
   },
   asyncTrigger: class {
     constructor(workflow) {
@@ -39,5 +42,8 @@ var triggers_default = {
     }
     off() {
     }
+    validateEvent() {
+      return true;
+    }
   }
 };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@nocobase/plugin-workflow-test",
   "displayName": "Workflow: test kit",
   "displayName.zh-CN": "工作流：测试工具包",
-  "version": "0.19.0-alpha.4",
+  "version": "0.19.0-alpha.6",
   "license": "AGPL-3.0",
   "main": "dist/server/index.js",
   "types": "./dist/server/index.d.ts",
@@ -11,5 +11,5 @@
     "@nocobase/server": "0.x",
     "@nocobase/test": "0.x"
   },
-  "gitHead": "9583023f7bea828da5192384a5c002782c341b65"
+  "gitHead": "2eb524db98c7f4136fe1a9a1b1259cd72cf6635f"
 }

package/src/e2e/e2ePageObjectModel.ts

@@ -435,11 +435,11 @@ export class ManualNode {
     this.assigneesDropDown = page.getByTestId('select-single');
     this.configureUserInterfaceButton = page.getByRole('button', { name: 'Configure user interface' });
     this.addBlockButton = page.getByLabel('schema-initializer-Grid-AddBlockButton-workflows');
-    this.triggerDataMenu = page.getByLabel('Data blocks-triggerData');
-    this.nodeDataMenu = page.getByLabel('nodes', { exact: true });
+    this.triggerDataMenu = page.getByRole('menuitem', { name: 'Trigger data' });
+    this.nodeDataMenu = page.getByRole('menuitem', { name: 'Node result right' });
     this.customFormMenu = page.getByRole('menuitem', { name: 'Custom form' });
-    this.createRecordFormMenu = page.getByRole('menuitem', { name: 'Create record form' });
-    this.updateRecordFormMenu = page.getByRole('menuitem', { name: 'Update record form' });
+    this.createRecordFormMenu = page.getByRole('menuitem', { name: 'Create record form right' });
+    this.updateRecordFormMenu = page.getByRole('menuitem', { name: 'Update record form right' });
     this.submitButton = page.getByLabel('action-Action-Submit-workflows');
     this.cancelButton = page.getByLabel('action-Action-Cancel-workflows');
     this.addNodeButton = page.getByLabel(`add-button-manual-${nodeName}`, { exact: true });
@@ -537,6 +537,33 @@ export class SQLNode {
   }
 }
 
+export class ParallelBranchNode {
+  readonly page: Page;
+  node: Locator;
+  nodeTitle: Locator;
+  nodeConfigure: Locator;
+  addBranchButton: Locator;
+  allSucceededRadio: Locator;
+  anySucceededRadio: Locator;
+  anySucceededOrFailedRadio: Locator;
+  submitButton: Locator;
+  cancelButton: Locator;
+  addNodeButton: Locator;
+  constructor(page: Page, nodeName: string) {
+    this.page = page;
+    this.node = page.getByLabel(`Parallel branch-${nodeName}`, { exact: true });
+    this.nodeTitle = page.locator('textarea').filter({ hasText: nodeName });
+    this.nodeConfigure = page.getByLabel(`Parallel branch-${nodeName}`).getByRole('button', { name: 'Configure' });
+    this.addBranchButton = page.getByLabel(`add-button-parallel-${nodeName}-add-branch`, { exact: true });
+    this.allSucceededRadio = page.getByLabel('All succeeded', { exact: true });
+    this.anySucceededRadio = page.getByLabel('Any succeeded', { exact: true });
+    this.anySucceededOrFailedRadio = page.getByLabel('Any succeeded or failed', { exact: true });
+    this.submitButton = page.getByLabel('action-Action-Submit-workflows');
+    this.cancelButton = page.getByLabel('action-Action-Cancel-workflows');
+    this.addNodeButton = page.getByLabel(`add-button-parallel-${nodeName}`, { exact: true });
+  }
+}
+
 export default module.exports = {
   CreateWorkFlow,
   EditWorkFlow,
@@ -557,4 +584,5 @@ export default module.exports = {
   ConditionYesNode,
   ConditionBranchNode,
   SQLNode,
+  ParallelBranchNode,
 };

package/src/e2e/e2eUtils.ts

@@ -605,6 +605,44 @@ export const apiGetList = async (collectionName: string) => {
   return await result.json();
 };
 
+// 查询业务表list
+export const apiFilterList = async (collectionName: string, filter: string) => {
+  const api = await request.newContext({
+    storageState: process.env.PLAYWRIGHT_AUTH_FILE,
+  });
+  const state = await api.storageState();
+  const headers = getHeaders(state);
+  const result = await api.get(`/api/${collectionName}:list?${filter}`, {
+    headers,
+  });
+
+  if (!result.ok()) {
+    throw new Error(await result.text());
+  }
+  /*
+        {
+            "data": [
+                {
+                    "id": 1,
+                    "createdAt": "2023-12-12T02:43:53.793Z",
+                    "updatedAt": "2023-12-12T05:41:33.300Z",
+                    "key": "fzk3j2oj4el",
+                    "title": "a11",
+                    "enabled": true,
+                    "description": null
+                }
+            ],
+            "meta": {
+                "count": 1,
+                "page": 1,
+                "pageSize": 20,
+                "totalPage": 1
+            }
+        }
+    */
+  return await result.json();
+};
+
 // 添加业务表单条数据触发工作流表单事件,triggerWorkflows=key1!field,key2,key3!field.subfield
 export const apiCreateRecordTriggerFormEvent = async (collectionName: string, triggerWorkflows: string, data: any) => {
   const api = await request.newContext({
@@ -744,4 +782,5 @@ export default module.exports = {
   apiGetList,
   apiCreateRecordTriggerFormEvent,
   apiSubmitRecordTriggerFormEvent,
+  apiFilterList,
 };

package/src/server/triggers.ts

@@ -4,10 +4,16 @@ export default {
     on() {}
     off() {}
     sync = true;
+    validateEvent() {
+      return true;
+    }
   },
   asyncTrigger: class {
     constructor(public readonly workflow) {}
     on() {}
     off() {}
+    validateEvent() {
+      return true;
+    }
   },
 };