@nocobase/plugin-workflow-test 1.2.10-alpha → 1.2.12-alpha

package/dist/e2e/e2ePageObjectModel.d.ts

@@ -59,6 +59,7 @@ export declare class ApprovalTriggerNode {
     configureFieldsButton: Locator;
     configureActionsButton: Locator;
     saveDraftSwitch: Locator;
+    preloadAssociationsDropDown: Locator;
     submitButton: Locator;
     cancelButton: Locator;
     addNodeButton: Locator;
@@ -70,10 +71,13 @@ export declare class ApprovalPassthroughModeNode {
     nodeTitle: Locator;
     nodeConfigure: Locator;
     addAssigneesButton: Locator;
+    addSelectAssigneesMenu: Locator;
+    addQueryAssigneesMenu: Locator;
     assigneesDropDown: Locator;
     OrRadio: Locator;
     AndRadio: Locator;
     votingRadio: Locator;
+    votingThresholdEditBox: Locator;
     parallellyRadio: Locator;
     sequentiallyRadio: Locator;
     goToconfigureButton: Locator;
@@ -92,6 +96,41 @@ export declare class ApprovalPassthroughModeNode {
     addNodeButton: Locator;
     constructor(page: Page, nodeName: string, collectionName: string);
 }
+export declare class ApprovalBranchModeNode {
+    readonly page: Page;
+    node: Locator;
+    nodeTitle: Locator;
+    nodeConfigure: Locator;
+    addAssigneesButton: Locator;
+    addSelectAssigneesMenu: Locator;
+    addQueryAssigneesMenu: Locator;
+    assigneesDropDown: Locator;
+    OrRadio: Locator;
+    AndRadio: Locator;
+    votingRadio: Locator;
+    votingThresholdEditBox: Locator;
+    parallellyRadio: Locator;
+    sequentiallyRadio: Locator;
+    goToconfigureButton: Locator;
+    addBlockButton: Locator;
+    addDetailsMenu: Locator;
+    detailsConfigureFieldsButton: Locator;
+    addActionsMenu: Locator;
+    actionsConfigureFieldsButton: Locator;
+    actionsConfigureActionsButton: Locator;
+    addApproveButton: Locator;
+    addRejectButton: Locator;
+    addReturnButton: Locator;
+    addNodeResult: Locator;
+    submitButton: Locator;
+    cancelButton: Locator;
+    addNodeButton: Locator;
+    addReturnBranchNodeButton: Locator;
+    addRejectBranchNodeButton: Locator;
+    addApproveBranchNodeButton: Locator;
+    endOnRejectCheckbox: Locator;
+    constructor(page: Page, nodeName: string, collectionName: string);
+}
 export declare class ScheduleTriggerNode {
     readonly page: Page;
     node: Locator;
@@ -314,5 +353,6 @@ declare const _default: {
     ConditionBranchNode: typeof ConditionBranchNode;
     SQLNode: typeof SQLNode;
     ParallelBranchNode: typeof ParallelBranchNode;
+    ApprovalBranchModeNode: typeof ApprovalBranchModeNode;
 };
 export default _default;

package/dist/e2e/e2ePageObjectModel.js

@@ -27,6 +27,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var e2ePageObjectModel_exports = {};
 __export(e2ePageObjectModel_exports, {
   AggregateNode: () => AggregateNode,
+  ApprovalBranchModeNode: () => ApprovalBranchModeNode,
   ApprovalPassthroughModeNode: () => ApprovalPassthroughModeNode,
   ApprovalTriggerNode: () => ApprovalTriggerNode,
   CalculationNode: () => CalculationNode,
@@ -130,14 +131,15 @@ class ApprovalTriggerNode {
   configureFieldsButton;
   configureActionsButton;
   saveDraftSwitch;
+  preloadAssociationsDropDown;
   submitButton;
   cancelButton;
   addNodeButton;
   constructor(page, triggerName, collectionName) {
     this.page = page;
-    this.node = page.getByText("TriggeraConfigure");
-    this.nodeTitle = page.locator("textarea").filter({ hasText: triggerName });
-    this.nodeConfigure = page.getByRole("button", { name: "Configure" });
+    this.node = page.getByLabel(`Trigger-${triggerName}`);
+    this.nodeTitle = page.getByLabel(`Trigger-${triggerName}`).getByRole("textbox");
+    this.nodeConfigure = page.getByLabel(`Trigger-${triggerName}`).getByRole("button", { name: "Configure" });
     this.collectionDropDown = page.getByLabel("block-item-DataSourceCollectionCascader-workflows-Collection").locator(".ant-select-selection-search-input");
     this.dataBlocksInitiationRadio = page.getByLabel("Initiate and approve in data blocks only");
     this.dataBlocksAndGlobalApprovalBlocksInitiationRadio = page.getByLabel(
@@ -148,10 +150,9 @@ class ApprovalTriggerNode {
     this.addBlockButton = page.getByLabel(`schema-initializer-Grid-ApprovalApplyAddBlockButton-${collectionName}`);
     this.addApplyFormMenu = page.getByRole("menuitem", { name: "Apply form" });
     this.configureFieldsButton = page.getByLabel(`schema-initializer-Grid-form:configureFields-${collectionName}`);
-    this.configureActionsButton = page.getByLabel(
-      `schema-initializer-ActionBar-ApprovalApplyAddActionButton-${collectionName}`
-    );
+    this.configureActionsButton = page.getByLabel(`schema-initializer-ActionBar-ApprovalApplyAddActionButton-${collectionName}`);
     this.saveDraftSwitch = page.getByRole("menuitem", { name: "Save draft" }).getByRole("switch");
+    this.preloadAssociationsDropDown = page.getByTestId("select-field-Preload associations");
     this.submitButton = page.getByLabel("action-Action-Submit-workflows");
     this.cancelButton = page.getByLabel("action-Action-Cancel-workflows");
     this.addNodeButton = this.addNodeButton = page.getByLabel("add-button", { exact: true });
@@ -163,10 +164,13 @@ class ApprovalPassthroughModeNode {
   nodeTitle;
   nodeConfigure;
   addAssigneesButton;
+  addSelectAssigneesMenu;
+  addQueryAssigneesMenu;
   assigneesDropDown;
   OrRadio;
   AndRadio;
   votingRadio;
+  votingThresholdEditBox;
   parallellyRadio;
   sequentiallyRadio;
   goToconfigureButton;
@@ -189,18 +193,85 @@ class ApprovalPassthroughModeNode {
     this.nodeTitle = page.getByLabel(`Approval-${nodeName}`, { exact: true }).getByRole("textbox");
     this.nodeConfigure = page.getByLabel(`Approval-${nodeName}`, { exact: true }).getByRole("button", { name: "Configure" });
     this.addAssigneesButton = page.getByRole("button", { name: "plus Add assignee" });
+    this.addSelectAssigneesMenu = page.getByRole("button", { name: "Select assignees" });
+    this.addQueryAssigneesMenu = page.getByRole("button", { name: "Query assignees" });
     this.assigneesDropDown = page.getByTestId("select-single");
     this.OrRadio = page.getByLabel("Or", { exact: true });
     this.AndRadio = page.getByLabel("And", { exact: true });
     this.votingRadio = page.getByLabel("Voting", { exact: true });
+    this.votingThresholdEditBox = page.getByLabel("block-item-NegotiationConfig-workflows-Negotiation mode").getByRole("spinbutton");
     this.parallellyRadio = page.getByLabel("Parallelly", { exact: true });
     this.sequentiallyRadio = page.getByLabel("Sequentially", { exact: true });
     this.goToconfigureButton = page.getByRole("button", { name: "Go to configure" });
     this.addBlockButton = page.getByLabel("schema-initializer-Grid-ApprovalProcessAddBlockButton-workflows");
     this.addDetailsMenu = page.getByRole("menuitem", { name: "Details" });
-    this.detailsConfigureFieldsButton = page.getByLabel(
-      `schema-initializer-Grid-ReadPrettyFormItemInitializers-${collectionName}`
+    this.detailsConfigureFieldsButton = page.getByLabel(`schema-initializer-Grid-details:configureFields-${collectionName}`);
+    this.addActionsMenu = page.getByRole("menuitem", { name: "Actions" }).getByRole("switch");
+    this.actionsConfigureFieldsButton = page.getByLabel("schema-initializer-Grid-FormItemInitializers-approvalRecords");
+    this.actionsConfigureActionsButton = page.getByLabel(
+      "schema-initializer-ActionBar-ApprovalProcessAddActionButton-approvalRecords"
     );
+    this.addApproveButton = page.getByRole("menuitem", { name: "Approve" }).getByRole("switch");
+    this.addRejectButton = page.getByRole("menuitem", { name: "Reject" }).getByRole("switch");
+    this.addReturnButton = page.getByRole("menuitem", { name: "Return" }).getByRole("switch");
+    this.addNodeResult = page.getByRole("menuitem", { name: "Node result right" });
+    this.submitButton = page.getByLabel("action-Action-Submit-workflows");
+    this.cancelButton = page.getByLabel("action-Action-Cancel-workflows");
+    this.addNodeButton = page.getByLabel(`add-button-calculation-${nodeName}`, { exact: true });
+  }
+}
+class ApprovalBranchModeNode {
+  page;
+  node;
+  nodeTitle;
+  nodeConfigure;
+  addAssigneesButton;
+  addSelectAssigneesMenu;
+  addQueryAssigneesMenu;
+  assigneesDropDown;
+  OrRadio;
+  AndRadio;
+  votingRadio;
+  votingThresholdEditBox;
+  parallellyRadio;
+  sequentiallyRadio;
+  goToconfigureButton;
+  addBlockButton;
+  addDetailsMenu;
+  detailsConfigureFieldsButton;
+  addActionsMenu;
+  actionsConfigureFieldsButton;
+  actionsConfigureActionsButton;
+  addApproveButton;
+  addRejectButton;
+  addReturnButton;
+  addNodeResult;
+  submitButton;
+  cancelButton;
+  addNodeButton;
+  addReturnBranchNodeButton;
+  addRejectBranchNodeButton;
+  addApproveBranchNodeButton;
+  endOnRejectCheckbox;
+  constructor(page, nodeName, collectionName) {
+    this.page = page;
+    this.node = page.getByLabel(`Approval-${nodeName}`, { exact: true });
+    this.nodeTitle = page.getByLabel(`Approval-${nodeName}`, { exact: true }).getByRole("textbox");
+    this.nodeConfigure = page.getByLabel(`Approval-${nodeName}`, { exact: true }).getByRole("button", { name: "Configure" });
+    this.addAssigneesButton = page.getByRole("button", { name: "plus Add assignee" });
+    this.addSelectAssigneesMenu = page.getByRole("button", { name: "Select assignees" });
+    this.addQueryAssigneesMenu = page.getByRole("button", { name: "Query assignees" });
+    this.assigneesDropDown = page.getByTestId("select-single");
+    this.OrRadio = page.getByLabel("Or", { exact: true });
+    this.AndRadio = page.getByLabel("And", { exact: true });
+    this.votingRadio = page.getByLabel("Voting", { exact: true });
+    this.votingThresholdEditBox = page.getByLabel("block-item-NegotiationConfig-workflows-Negotiation mode").getByRole("spinbutton");
+    this.parallellyRadio = page.getByLabel("Parallelly", { exact: true });
+    this.sequentiallyRadio = page.getByLabel("Sequentially", { exact: true });
+    this.goToconfigureButton = page.getByRole("button", { name: "Go to configure" });
+    this.addBlockButton = page.getByLabel("schema-initializer-Grid-ApprovalProcessAddBlockButton-workflows");
+    this.addDetailsMenu = page.getByRole("menuitem", { name: "Details" });
+    this.detailsConfigureFieldsButton = page.getByLabel(`schema-initializer-Grid-details:configureFields-${collectionName}`);
     this.addActionsMenu = page.getByRole("menuitem", { name: "Actions" }).getByRole("switch");
     this.actionsConfigureFieldsButton = page.getByLabel("schema-initializer-Grid-FormItemInitializers-approvalRecords");
     this.actionsConfigureActionsButton = page.getByLabel(
@@ -213,6 +284,10 @@ class ApprovalPassthroughModeNode {
     this.submitButton = page.getByLabel("action-Action-Submit-workflows");
     this.cancelButton = page.getByLabel("action-Action-Cancel-workflows");
     this.addNodeButton = page.getByLabel(`add-button-calculation-${nodeName}`, { exact: true });
+    this.addReturnBranchNodeButton = page.getByLabel(`add-button-approval-${nodeName}-1`);
+    this.addApproveBranchNodeButton = page.getByLabel(`add-button-approval-${nodeName}-2`);
+    this.addRejectBranchNodeButton = page.getByLabel(`add-button-approval-${nodeName}--1`);
+    this.endOnRejectCheckbox = page.getByLabel("End the workflow after");
   }
 }
 class ScheduleTriggerNode {
@@ -612,11 +687,13 @@ var e2ePageObjectModel_default = module.exports = {
   ConditionYesNode,
   ConditionBranchNode,
   SQLNode,
-  ParallelBranchNode
+  ParallelBranchNode,
+  ApprovalBranchModeNode
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AggregateNode,
+  ApprovalBranchModeNode,
   ApprovalPassthroughModeNode,
   ApprovalTriggerNode,
   CalculationNode,

package/dist/e2e/e2eUtils.d.ts

@@ -6,7 +6,7 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import { Page } from '@nocobase/test/e2e';
+import { Browser } from '@nocobase/test/e2e';
 export declare const apiCreateWorkflow: (data: any) => Promise<any>;
 export declare const apiUpdateWorkflow: (id: number, data: any) => Promise<any>;
 export declare const apiDeleteWorkflow: (id: number) => Promise<any>;
@@ -25,7 +25,8 @@ export declare const apiSubmitRecordTriggerFormEvent: (triggerWorkflows: string,
 export declare const apiGetDataSourceCount: () => Promise<any>;
 export declare const apiCreateRecordTriggerActionEvent: (collectionName: string, triggerWorkflows: string, data: any) => Promise<any>;
 export declare const apiApplyApprovalEvent: (data: any) => Promise<any>;
-export declare const userLogin: (page: Page, approvalUserEmail: string, approvalUser: string) => Promise<Page>;
+export declare const apiCreateField: (collectionName: string, data: any) => Promise<any>;
+export declare const userLogin: (browser: Browser, approvalUserEmail: string, approvalUser: string) => Promise<import("playwright-core").BrowserContext>;
 declare const _default: {
     apiCreateWorkflow: (data: any) => Promise<any>;
     apiUpdateWorkflow: (id: number, data: any) => Promise<any>;
@@ -45,6 +46,7 @@ declare const _default: {
     apiGetDataSourceCount: () => Promise<any>;
     apiCreateRecordTriggerActionEvent: (collectionName: string, triggerWorkflows: string, data: any) => Promise<any>;
     apiApplyApprovalEvent: (data: any) => Promise<any>;
-    userLogin: (page: Page, approvalUserEmail: string, approvalUser: string) => Promise<Page>;
+    userLogin: (browser: Browser, approvalUserEmail: string, approvalUser: string) => Promise<import("playwright-core").BrowserContext>;
+    apiCreateField: (collectionName: string, data: any) => Promise<any>;
 };
 export default _default;

package/dist/e2e/e2eUtils.js

@@ -27,6 +27,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var e2eUtils_exports = {};
 __export(e2eUtils_exports, {
   apiApplyApprovalEvent: () => apiApplyApprovalEvent,
+  apiCreateField: () => apiCreateField,
   apiCreateRecordTriggerActionEvent: () => apiCreateRecordTriggerActionEvent,
   apiCreateRecordTriggerFormEvent: () => apiCreateRecordTriggerFormEvent,
   apiCreateWorkflow: () => apiCreateWorkflow,
@@ -314,6 +315,21 @@ const apiApplyApprovalEvent = async (data) => {
   }
   return (await result.json()).data;
 };
+const apiCreateField = async (collectionName, data) => {
+  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.post(`/api/collections/${collectionName}/fields:create`, {
+    headers,
+    data
+  });
+  if (!result.ok()) {
+    throw new Error(await result.text());
+  }
+  return (await result.json()).data;
+};
 const getStorageItem = (key, storageState) => {
   var _a, _b;
   return (_b = (_a = storageState.origins.find((item) => item.origin === APP_BASE_URL)) == null ? void 0 : _a.localStorage.find((item) => item.name === key)) == null ? void 0 : _b.value;
@@ -355,13 +371,15 @@ function getHeaders(storageState) {
   }
   return headers;
 }
-const userLogin = async (page, approvalUserEmail, approvalUser) => {
-  await page.goto(`${process.env.APP_BASE_URL}/signin`);
+const userLogin = async (browser, approvalUserEmail, approvalUser) => {
+  const context = await browser.newContext();
+  const page = await context.newPage();
+  await page.goto("signin");
   await page.getByPlaceholder("Email").fill(approvalUserEmail);
   await page.getByPlaceholder("Password").fill(approvalUser);
   await page.getByRole("button", { name: "Sign in" }).click();
   await page.waitForLoadState("networkidle");
-  return page;
+  return context;
 };
 var e2eUtils_default = module.exports = {
   apiCreateWorkflow,
@@ -382,11 +400,13 @@ var e2eUtils_default = module.exports = {
   apiGetDataSourceCount,
   apiCreateRecordTriggerActionEvent,
   apiApplyApprovalEvent,
-  userLogin
+  userLogin,
+  apiCreateField
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   apiApplyApprovalEvent,
+  apiCreateField,
   apiCreateRecordTriggerActionEvent,
   apiCreateRecordTriggerFormEvent,
   apiCreateWorkflow,

package/dist/externalVersion.js

@@ -8,12 +8,12 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.2.10-alpha",
-  "@nocobase/utils": "1.2.10-alpha",
+  "@nocobase/client": "1.2.12-alpha",
+  "@nocobase/utils": "1.2.12-alpha",
   "lodash": "4.17.21",
-  "@nocobase/test": "1.2.10-alpha",
-  "@nocobase/server": "1.2.10-alpha",
-  "@nocobase/resourcer": "1.2.10-alpha",
-  "@nocobase/data-source-manager": "1.2.10-alpha",
-  "@nocobase/database": "1.2.10-alpha"
+  "@nocobase/test": "1.2.12-alpha",
+  "@nocobase/server": "1.2.12-alpha",
+  "@nocobase/resourcer": "1.2.12-alpha",
+  "@nocobase/data-source-manager": "1.2.12-alpha",
+  "@nocobase/database": "1.2.12-alpha"
 };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@nocobase/plugin-workflow-test",
   "displayName": "Workflow: test kit",
   "displayName.zh-CN": "工作流：测试工具包",
-  "version": "1.2.10-alpha",
+  "version": "1.2.12-alpha",
   "license": "AGPL-3.0",
   "main": "dist/server/index.js",
   "types": "./dist/server/index.d.ts",
@@ -11,5 +11,5 @@
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x"
   },
-  "gitHead": "378bfb33c8d124ef79074e5474c1cf2199aeb8da"
+  "gitHead": "553231d4882496cb7f1f17fa7541899ce82a27ab"
 }