@nocobase/plugin-workflow-test 1.6.0-alpha.2 → 1.6.0-alpha.20

package/dist/e2e/e2ePageObjectModel.js

@@ -145,7 +145,7 @@ class ApprovalTriggerNode {
     this.page = page;
     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.nodeConfigure = this.node.locator(">div").first();
     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(
@@ -200,15 +200,15 @@ class ApprovalPassthroughModeNode {
     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.nodeConfigure = this.node.locator(">div").first();
+    this.addAssigneesButton = page.getByRole("button", { name: "plus Add" });
     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.votingThresholdEditBox = page.getByLabel("block-item-Negotiation-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" });
@@ -268,15 +268,15 @@ class ApprovalBranchModeNode {
     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.nodeConfigure = this.node.locator(">div").first();
+    this.addAssigneesButton = page.getByRole("button", { name: "plus Add" });
     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.votingThresholdEditBox = page.getByLabel("block-item-Negotiation-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" });
@@ -319,9 +319,9 @@ class ScheduleTriggerNode {
   addNodeButton;
   constructor(page, triggerName, collectionName) {
     this.page = page;
-    this.node = page.getByText("TriggeraConfigure");
+    this.node = page.getByLabel(`Trigger-${triggerName}`);
     this.nodeTitle = page.locator("textarea").filter({ hasText: triggerName });
-    this.nodeConfigure = page.getByRole("button", { name: "Configure" });
+    this.nodeConfigure = this.node.locator(">div").first();
     this.customTimeTriggerOptions = page.getByLabel("Based on certain date");
     this.startTimeEntryBox = page.getByPlaceholder("Select date");
     this.RrpeatModeDropdown = page.getByLabel("block-item-RepeatField-workflows-Repeat mode");
@@ -347,7 +347,7 @@ class CollectionTriggerNode {
     this.page = page;
     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.nodeConfigure = this.node.locator(">div").first();
     this.collectionDropDown = page.getByLabel("block-item-DataSourceCollectionCascader-workflows-Collection").locator(".ant-select-selection-search-input");
     this.triggerOnDropdown = page.getByLabel("block-item-Select-workflows-Trigger on").getByRole("button", { name: "Trigger on" });
     this.submitButton = page.getByLabel("action-Action-Submit-workflows");
@@ -369,7 +369,7 @@ class FormEventTriggerNode {
     this.page = page;
     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.nodeConfigure = this.node.locator(">div").first();
     this.collectionDropDown = page.getByLabel("block-item-DataSourceCollectionCascader-workflows-Collection").locator(".ant-select-selection-search-input");
     this.relationalDataDropdown = page.getByTestId("select-field-Preload associations");
     this.submitButton = page.getByLabel("action-Action-Submit-workflows");
@@ -391,7 +391,7 @@ class CustomActionEventTriggerNode {
     this.page = page;
     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.nodeConfigure = this.node.locator(">div").first();
     this.collectionDropDown = page.getByLabel("block-item-DataSourceCollectionCascader-workflows-Collection").locator(".ant-select-selection-search-input");
     this.relationalDataDropdown = page.getByTestId("select-field-Preload associations");
     this.submitButton = page.getByLabel("action-Action-Submit-workflows");
@@ -414,7 +414,7 @@ class CalculationNode {
     this.page = page;
     this.node = page.getByLabel(`Calculation-${nodeName}`, { exact: true });
     this.nodeTitle = page.getByLabel(`Calculation-${nodeName}`, { exact: true }).getByRole("textbox");
-    this.nodeConfigure = page.getByLabel(`Calculation-${nodeName}`, { exact: true }).getByRole("button", { name: "Configure" });
+    this.nodeConfigure = this.node.locator(">div").first();
     this.mathCalculationEngine = page.getByLabel("Math.js");
     this.formulaCalculationEngine = page.getByLabel("Formula.js");
     this.calculationExpression = page.getByLabel("textbox");
@@ -444,7 +444,7 @@ class QueryRecordNode {
     this.page = page;
     this.node = page.getByLabel(`Query record-${nodeName}`, { exact: true });
     this.nodeTitle = page.getByLabel(`Query record-${nodeName}`, { exact: true }).getByRole("textbox");
-    this.nodeConfigure = page.getByLabel(`Query record-${nodeName}`, { exact: true }).getByRole("button", { name: "Configure" });
+    this.nodeConfigure = this.node.locator(">div").first();
     this.collectionDropDown = page.getByLabel("block-item-DataSourceCollectionCascader-workflows-Collection").locator(".ant-select-selection-search-input");
     this.singleRecordRadioButton = page.getByLabel("block-item-RadioWithTooltip-").getByLabel("Single record");
     this.multipleRecordsRadioButton = page.getByLabel("block-item-RadioWithTooltip-").getByLabel("Multiple records");
@@ -472,7 +472,7 @@ class CreateRecordNode {
     this.page = page;
     this.node = page.getByLabel(`Create record-${nodeName}`, { exact: true });
     this.nodeTitle = page.getByLabel(`Create record-${nodeName}`, { exact: true }).getByRole("textbox");
-    this.nodeConfigure = page.getByLabel(`Create record-${nodeName}`, { exact: true }).getByRole("button", { name: "Configure" });
+    this.nodeConfigure = this.node.locator(">div").first();
     this.collectionDropDown = page.getByLabel("block-item-DataSourceCollectionCascader-workflows-Collection").locator(".ant-select-selection-search-input");
     this.addFieldsButton = page.getByLabel("schema-initializer-Grid-assignFieldValuesForm:configureFields");
     this.submitButton = page.getByLabel("action-Action-Submit-workflows");
@@ -496,7 +496,7 @@ class UpdateRecordNode {
     this.page = page;
     this.node = page.getByLabel(`Update record-${nodeName}`, { exact: true });
     this.nodeTitle = page.getByLabel(`Update record-${nodeName}`, { exact: true }).getByRole("textbox");
-    this.nodeConfigure = page.getByLabel(`Update record-${nodeName}`, { exact: true }).getByRole("button", { name: "Configure" });
+    this.nodeConfigure = this.node.locator(">div").first();
     this.collectionDropDown = page.getByLabel("block-item-DataSourceCollectionCascader-workflows-Collection").locator(".ant-select-selection-search-input");
     this.batchUpdateModeRadio = page.getByLabel("block-item-RadioWithTooltip-workflows-Update mode").getByLabel("Update in a batch");
     this.articleByArticleUpdateModeRadio = page.getByLabel("block-item-RadioWithTooltip-workflows-Update mode").getByLabel("Update one by one");
@@ -519,7 +519,7 @@ class DeleteRecordNode {
     this.page = page;
     this.node = page.getByLabel(`Delete record-${nodeName}`, { exact: true });
     this.nodeTitle = page.getByLabel(`Delete record-${nodeName}`, { exact: true }).getByRole("textbox");
-    this.nodeConfigure = page.getByLabel(`Delete record-${nodeName}`, { exact: true }).getByRole("button", { name: "Configure" });
+    this.nodeConfigure = this.node.locator(">div").first();
     this.collectionDropDown = page.getByLabel("block-item-DataSourceCollectionCascader-workflows-Collection").locator(".ant-select-selection-search-input");
     this.submitButton = page.getByLabel("action-Action-Submit-workflows");
     this.cancelButton = page.getByLabel("action-Action-Cancel-workflows");
@@ -548,7 +548,7 @@ class AggregateNode {
     this.page = page;
     this.node = page.getByLabel(`Aggregate-${nodeName}`, { exact: true });
     this.nodeTitle = page.getByLabel(`Aggregate-${nodeName}`, { exact: true }).getByRole("textbox");
-    this.nodeConfigure = page.getByLabel(`Aggregate-${nodeName}`, { exact: true }).getByRole("button", { name: "Configure" });
+    this.nodeConfigure = this.node.locator(">div").first();
     this.countRadio = page.getByLabel("COUNT");
     this.sumRadio = page.getByLabel("SUM", { exact: true });
     this.avgRadio = page.getByLabel("AVG", { exact: true });
@@ -584,7 +584,7 @@ class ManualNode {
     this.page = page;
     this.node = page.getByLabel(`Manual-${nodeName}`, { exact: true });
     this.nodeTitle = page.getByLabel(`Manual-${nodeName}`, { exact: true }).getByRole("textbox");
-    this.nodeConfigure = page.getByLabel(`Manual-${nodeName}`, { exact: true }).getByRole("button", { name: "Configure" });
+    this.nodeConfigure = this.node.locator(">div").first();
     this.assigneesDropDown = page.getByTestId("select-single");
     this.configureUserInterfaceButton = page.getByRole("button", { name: "Configure user interface" });
     this.addBlockButton = page.getByLabel(
@@ -616,7 +616,7 @@ class ConditionYesNode {
     this.page = page;
     this.node = page.getByLabel(`Condition-${nodeName}`, { exact: true });
     this.nodeTitle = page.getByLabel(`Condition-${nodeName}`, { exact: true }).getByRole("textbox");
-    this.nodeConfigure = page.getByLabel(`Condition-${nodeName}`, { exact: true }).getByRole("button", { name: "Configure" });
+    this.nodeConfigure = this.node.locator(">div").first();
     this.conditionExpressionEditBox = page.getByLabel("textbox");
     this.basicRadio = page.getByLabel("Basic");
     this.mathRadio = page.getByLabel("Math.js");
@@ -644,7 +644,7 @@ class ConditionBranchNode {
     this.page = page;
     this.node = page.getByLabel(`Condition-${nodeName}`, { exact: true });
     this.nodeTitle = page.getByLabel(`Condition-${nodeName}`, { exact: true }).getByRole("textbox");
-    this.nodeConfigure = page.getByLabel(`Condition-${nodeName}`, { exact: true }).getByRole("button", { name: "Configure" });
+    this.nodeConfigure = this.node.locator(">div").first();
     this.conditionExpressionEditBox = page.getByLabel("textbox");
     this.submitButton = page.getByLabel("action-Action-Submit-workflows");
     this.cancelButton = page.getByLabel("action-Action-Cancel-workflows");
@@ -669,7 +669,7 @@ class SQLNode {
     this.page = page;
     this.node = page.getByLabel(`SQL action-${nodeName}`, { exact: true });
     this.nodeTitle = page.getByLabel(`SQL action-${nodeName}`, { exact: true }).getByRole("textbox");
-    this.nodeConfigure = page.getByLabel(`SQL action-${nodeName}`, { exact: true }).getByRole("button", { name: "Configure" });
+    this.nodeConfigure = this.node.locator(">div").first();
     this.sqlEditBox = page.getByLabel("block-item-WorkflowVariableRawTextArea-workflows-SQL").getByRole("textbox");
     this.submitButton = page.getByLabel("action-Action-Submit-workflows");
     this.cancelButton = page.getByLabel("action-Action-Cancel-workflows");
@@ -692,7 +692,7 @@ class ParallelBranchNode {
     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.nodeConfigure = this.node.locator(">div").first();
     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 });

package/dist/e2e/e2eUtils.d.ts

@@ -27,6 +27,7 @@ export declare const apiCreateRecordTriggerActionEvent: (collectionName: string,
 export declare const apiTriggerCustomActionEvent: (collectionName: string, triggerWorkflows: string, data: any) => Promise<any>;
 export declare const apiApplyApprovalEvent: (data: any) => Promise<any>;
 export declare const apiCreateField: (collectionName: string, data: any) => Promise<any>;
+export declare const approvalUserPassword = "1a2B3c4#";
 export declare const userLogin: (browser: Browser, approvalUserEmail: string, approvalUser: string) => Promise<import("playwright-core").BrowserContext>;
 declare const _default: {
     apiCreateWorkflow: (data: any) => Promise<any>;
@@ -50,5 +51,6 @@ declare const _default: {
     userLogin: (browser: Browser, approvalUserEmail: string, approvalUser: string) => Promise<import("playwright-core").BrowserContext>;
     apiCreateField: (collectionName: string, data: any) => Promise<any>;
     apiTriggerCustomActionEvent: (collectionName: string, triggerWorkflows: string, data: any) => Promise<any>;
+    approvalUserPassword: string;
 };
 export default _default;

package/dist/e2e/e2eUtils.js

@@ -46,6 +46,7 @@ __export(e2eUtils_exports, {
   apiUpdateWorkflow: () => apiUpdateWorkflow,
   apiUpdateWorkflowNode: () => apiUpdateWorkflowNode,
   apiUpdateWorkflowTrigger: () => apiUpdateWorkflowTrigger,
+  approvalUserPassword: () => approvalUserPassword,
   default: () => e2eUtils_default,
   userLogin: () => userLogin
 });
@@ -387,12 +388,13 @@ function getHeaders(storageState) {
   }
   return headers;
 }
+const approvalUserPassword = "1a2B3c4#";
 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.getByPlaceholder("Password").fill(approvalUserPassword);
   await page.getByRole("button", { name: "Sign in" }).click();
   await page.waitForLoadState("load");
   return context;
@@ -418,7 +420,8 @@ var e2eUtils_default = module.exports = {
   apiApplyApprovalEvent,
   userLogin,
   apiCreateField,
-  apiTriggerCustomActionEvent
+  apiTriggerCustomActionEvent,
+  approvalUserPassword
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -442,5 +445,6 @@ var e2eUtils_default = module.exports = {
   apiUpdateWorkflow,
   apiUpdateWorkflowNode,
   apiUpdateWorkflowTrigger,
+  approvalUserPassword,
   userLogin
 });

package/dist/externalVersion.js

@@ -8,11 +8,11 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.6.0-alpha.2",
-  "@nocobase/utils": "1.6.0-alpha.2",
+  "@nocobase/client": "1.6.0-alpha.20",
+  "@nocobase/utils": "1.6.0-alpha.20",
   "lodash": "4.17.21",
-  "@nocobase/test": "1.6.0-alpha.2",
-  "@nocobase/server": "1.6.0-alpha.2",
-  "@nocobase/data-source-manager": "1.6.0-alpha.2",
-  "@nocobase/database": "1.6.0-alpha.2"
+  "@nocobase/test": "1.6.0-alpha.20",
+  "@nocobase/server": "1.6.0-alpha.20",
+  "@nocobase/data-source-manager": "1.6.0-alpha.20",
+  "@nocobase/database": "1.6.0-alpha.20"
 };

package/dist/server/collections/categories.js

@@ -39,6 +39,14 @@ var categories_default = {
     {
       type: "hasMany",
       name: "posts"
+    },
+    {
+      type: "date",
+      name: "createdAt"
+    },
+    {
+      type: "date",
+      name: "updatedAt"
     }
   ]
 };

package/dist/server/collections/comments.js

@@ -31,6 +31,8 @@ __export(comments_exports, {
 module.exports = __toCommonJS(comments_exports);
 var comments_default = {
   name: "comments",
+  createdBy: true,
+  updatedBy: true,
   fields: [
     {
       type: "belongsTo",
@@ -48,6 +50,14 @@ var comments_default = {
     {
       type: "hasMany",
       name: "replies"
+    },
+    {
+      type: "date",
+      name: "createdAt"
+    },
+    {
+      type: "date",
+      name: "updatedAt"
     }
   ]
 };

package/dist/server/collections/posts.js

@@ -64,6 +64,14 @@ var posts_default = {
       type: "integer",
       name: "read",
       defaultValue: 0
+    },
+    {
+      type: "date",
+      name: "createdAt"
+    },
+    {
+      type: "date",
+      name: "updatedAt"
     }
   ]
 };

package/dist/server/collections/replies.d.ts

@@ -8,6 +8,8 @@
  */
 declare const _default: {
     name: string;
+    createdBy: boolean;
+    updatedBy: boolean;
     fields: {
         type: string;
         name: string;

package/dist/server/collections/replies.js

@@ -31,10 +31,20 @@ __export(replies_exports, {
 module.exports = __toCommonJS(replies_exports);
 var replies_default = {
   name: "replies",
+  createdBy: true,
+  updatedBy: true,
   fields: [
     {
       type: "string",
       name: "content"
+    },
+    {
+      type: "date",
+      name: "createdAt"
+    },
+    {
+      type: "date",
+      name: "updatedAt"
     }
   ]
 };

package/dist/server/collections/tags.js

@@ -31,6 +31,8 @@ __export(tags_exports, {
 module.exports = __toCommonJS(tags_exports);
 var tags_default = {
   name: "tags",
+  createdBy: true,
+  updatedBy: true,
   fields: [
     {
       type: "belongsToMany",
@@ -39,6 +41,14 @@ var tags_default = {
     {
       type: "string",
       name: "name"
+    },
+    {
+      type: "date",
+      name: "createdAt"
+    },
+    {
+      type: "date",
+      name: "updatedAt"
     }
   ]
 };

package/dist/server/index.js

@@ -97,7 +97,7 @@ async function getApp({
     directory: import_path.default.resolve(__dirname, "collections")
   });
   await anotherDB.sync();
-  another.acl.allow("*", "*");
+  another.acl.allow("*", "*", "loggedIn");
   return app;
 }
 async function getCluster({ plugins = [], collectionsPath, ...options }) {

package/dist/server/instructions.d.ts

@@ -48,6 +48,10 @@ declare const _default: {
         };
         resume(node: any, input: any, processor: any): any;
     };
+    asyncResume: {
+        run(node: any, input: any, processor: any): Promise<any>;
+        resume(node: any, job: any, processor: any): any;
+    };
     customizedSuccess: {
         run(node: any, input: any, processor: any): {
             status: number;

package/dist/server/instructions.js

@@ -93,6 +93,26 @@ var instructions_default = {
       return null;
     }
   },
+  asyncResume: {
+    async run(node, input, processor) {
+      const job = await processor.saveJob({
+        status: 0,
+        nodeId: node.id,
+        nodeKey: node.key,
+        upstreamId: (input == null ? void 0 : input.id) ?? null
+      });
+      setTimeout(() => {
+        job.set({
+          status: 1
+        });
+        processor.options.plugin.resume(job);
+      }, 100);
+      return null;
+    },
+    resume(node, job, processor) {
+      return job;
+    }
+  },
   customizedSuccess: {
     run(node, input, processor) {
       return {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@nocobase/plugin-workflow-test",
   "displayName": "Workflow: test kit",
   "displayName.zh-CN": "工作流：测试工具包",
-  "version": "1.6.0-alpha.2",
+  "version": "1.6.0-alpha.20",
   "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": "08bbc34c21727fc0ad0880f397a42bf7741091ee"
+  "gitHead": "c127664eb2b900edd5c18c9344046cd663a06c3b"
 }