@nocobase/plugin-workflow-test 0.18.0-alpha.8 → 0.19.0-alpha.1

package/dist/e2e/e2ePageObjectModel.d.ts

@@ -189,6 +189,7 @@ export declare class AggregateNode {
     linkedDataTableDataRadio: Locator;
     collectionDropDown: Locator;
     aggregatedFieldDropDown: Locator;
+    distinctCheckBox: Locator;
     submitButton: Locator;
     cancelButton: Locator;
     addNodeButton: Locator;
@@ -240,6 +241,17 @@ export declare class ConditionBranchNode {
     addNodeButton: Locator;
     constructor(page: Page, nodeName: string);
 }
+export declare class SQLNode {
+    readonly page: Page;
+    node: Locator;
+    nodeTitle: Locator;
+    nodeConfigure: Locator;
+    sqlEditBox: Locator;
+    submitButton: Locator;
+    cancelButton: Locator;
+    addNodeButton: Locator;
+    constructor(page: Page, nodeName: string);
+}
 declare const _default: {
     CreateWorkFlow: typeof CreateWorkFlow;
     EditWorkFlow: typeof EditWorkFlow;
@@ -259,5 +271,6 @@ declare const _default: {
     ManualNode: typeof ManualNode;
     ConditionYesNode: typeof ConditionYesNode;
     ConditionBranchNode: typeof ConditionBranchNode;
+    SQLNode: typeof SQLNode;
 };
 export default _default;

package/dist/e2e/e2ePageObjectModel.js

@@ -31,6 +31,7 @@ __export(e2ePageObjectModel_exports, {
   FormEventTriggerNode: () => FormEventTriggerNode,
   ManualNode: () => ManualNode,
   QueryRecordNode: () => QueryRecordNode,
+  SQLNode: () => SQLNode,
   ScheduleTriggerNode: () => ScheduleTriggerNode,
   UpdateRecordNode: () => UpdateRecordNode,
   WorkflowListRecords: () => WorkflowListRecords,
@@ -380,6 +381,7 @@ class AggregateNode {
   linkedDataTableDataRadio;
   collectionDropDown;
   aggregatedFieldDropDown;
+  distinctCheckBox;
   submitButton;
   cancelButton;
   addNodeButton;
@@ -399,6 +401,7 @@ class AggregateNode {
     this.aggregatedFieldDropDown = page.locator(
       'input.ant-select-selection-search-input[role="combobox"][aria-haspopup="listbox"]'
     );
+    this.distinctCheckBox = page.getByLabel("block-item-Checkbox-workflows-Distinct").locator('input.ant-checkbox-input[type="checkbox"]');
     this.submitButton = page.getByLabel("action-Action-Submit-workflows");
     this.cancelButton = page.getByLabel("action-Action-Cancel-workflows");
     this.addNodeButton = page.getByLabel(`add-button-aggregate-${nodeName}`, { exact: true });
@@ -490,6 +493,26 @@ class ConditionBranchNode {
     this.addYesBranchNode = page.getByLabel(`add-button-condition-${nodeName}-1`);
   }
 }
+class SQLNode {
+  page;
+  node;
+  nodeTitle;
+  nodeConfigure;
+  sqlEditBox;
+  submitButton;
+  cancelButton;
+  addNodeButton;
+  constructor(page, nodeName) {
+    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.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");
+    this.addNodeButton = page.getByLabel(`add-button-sql-${nodeName}`, { exact: true });
+  }
+}
 var e2ePageObjectModel_default = module.exports = {
   CreateWorkFlow,
   EditWorkFlow,
@@ -508,7 +531,8 @@ var e2ePageObjectModel_default = module.exports = {
   AggregateNode,
   ManualNode,
   ConditionYesNode,
-  ConditionBranchNode
+  ConditionBranchNode,
+  SQLNode
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -526,6 +550,7 @@ var e2ePageObjectModel_default = module.exports = {
   FormEventTriggerNode,
   ManualNode,
   QueryRecordNode,
+  SQLNode,
   ScheduleTriggerNode,
   UpdateRecordNode,
   WorkflowListRecords,

package/dist/externalVersion.js

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

package/dist/server/index.d.ts

@@ -1,13 +1,10 @@
-import { Plugin, ApplicationOptions } from '@nocobase/server';
+import { ApplicationOptions, Plugin } from '@nocobase/server';
 import { MockServer } from '@nocobase/test';
-interface MockServerOptions extends ApplicationOptions {
-    autoStart?: boolean;
+export interface MockServerOptions extends ApplicationOptions {
     collectionsPath?: string;
-    cleanDb?: boolean;
 }
 export declare function sleep(ms: number): Promise<unknown>;
-export declare function getApp({ autoStart, cleanDb, plugins, ...options }?: MockServerOptions): Promise<MockServer>;
+export declare function getApp(options?: MockServerOptions): Promise<MockServer>;
 export default class WorkflowTestPlugin extends Plugin {
     load(): Promise<void>;
 }
-export {};

package/dist/server/index.js

@@ -35,42 +35,24 @@ module.exports = __toCommonJS(server_exports);
 var import_path = __toESM(require("path"));
 var import_server = require("@nocobase/server");
 var import_test = require("@nocobase/test");
-var import_instructions = __toESM(require("./instructions"));
 var import_functions = __toESM(require("./functions"));
-async function createMockServer({ autoStart, collectionsPath, cleanDb, ...options }) {
-  const app = (0, import_test.mockServer)(options);
-  if (cleanDb) {
-    await app.cleanDb();
-  }
-  await app.load();
-  if (collectionsPath) {
-    await app.db.import({ directory: collectionsPath });
-  }
-  try {
-    await app.db.sync();
-  } catch (error) {
-    console.error(error);
-  }
-  if (autoStart) {
-    await app.start();
-  }
-  return app;
-}
+var import_instructions = __toESM(require("./instructions"));
 function sleep(ms) {
   return new Promise((resolve) => {
     setTimeout(resolve, ms);
   });
 }
-async function getApp({
-  autoStart = true,
-  cleanDb = true,
-  plugins = [],
-  ...options
-} = {}) {
-  return createMockServer({
-    ...options,
-    autoStart,
-    cleanDb,
+async function getApp(options = {}) {
+  const { plugins = [], collectionsPath, ...others } = options;
+  class TestCollectionPlugin extends import_server.Plugin {
+    async load() {
+      if (collectionsPath) {
+        await this.db.import({ directory: collectionsPath });
+      }
+    }
+  }
+  return (0, import_test.createMockServer)({
+    ...others,
     plugins: [
       [
         "workflow",
@@ -79,16 +61,15 @@ async function getApp({
           functions: import_functions.default
         }
       ],
-      WorkflowTestPlugin,
+      "workflow-test",
+      TestCollectionPlugin,
       ...plugins
     ]
   });
 }
 class WorkflowTestPlugin extends import_server.Plugin {
   async load() {
-    await this.db.import({
-      directory: import_path.default.resolve(__dirname, "collections")
-    });
+    await this.importCollections(import_path.default.resolve(__dirname, "collections"));
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

@@ -2,7 +2,7 @@
   "name": "@nocobase/plugin-workflow-test",
   "displayName": "Workflow: test kit",
   "displayName.zh-CN": "工作流：测试工具包",
-  "version": "0.18.0-alpha.8",
+  "version": "0.19.0-alpha.1",
   "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": "727d42f6f14e5f863831da3dbf3255ba1165b567"
+  "gitHead": "64601944412fc4d2e2bd05f4b982118dd28247dc"
 }

package/src/e2e/e2ePageObjectModel.ts

@@ -377,6 +377,7 @@ export class AggregateNode {
   linkedDataTableDataRadio: Locator;
   collectionDropDown: Locator;
   aggregatedFieldDropDown: Locator;
+  distinctCheckBox: Locator;
   submitButton: Locator;
   cancelButton: Locator;
   addNodeButton: Locator;
@@ -399,6 +400,9 @@ export class AggregateNode {
     this.aggregatedFieldDropDown = page.locator(
       'input.ant-select-selection-search-input[role="combobox"][aria-haspopup="listbox"]',
     );
+    this.distinctCheckBox = page
+      .getByLabel('block-item-Checkbox-workflows-Distinct')
+      .locator('input.ant-checkbox-input[type="checkbox"]');
     this.submitButton = page.getByLabel('action-Action-Submit-workflows');
     this.cancelButton = page.getByLabel('action-Action-Cancel-workflows');
     this.addNodeButton = page.getByLabel(`add-button-aggregate-${nodeName}`, { exact: true });
@@ -506,6 +510,29 @@ export class ConditionBranchNode {
   }
 }
 
+export class SQLNode {
+  readonly page: Page;
+  node: Locator;
+  nodeTitle: Locator;
+  nodeConfigure: Locator;
+  sqlEditBox: Locator;
+  submitButton: Locator;
+  cancelButton: Locator;
+  addNodeButton: Locator;
+  constructor(page: Page, nodeName: string) {
+    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.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');
+    this.addNodeButton = page.getByLabel(`add-button-sql-${nodeName}`, { exact: true });
+  }
+}
+
 export default module.exports = {
   CreateWorkFlow,
   EditWorkFlow,
@@ -525,4 +552,5 @@ export default module.exports = {
   ManualNode,
   ConditionYesNode,
   ConditionBranchNode,
+  SQLNode,
 };

package/src/server/index.ts

@@ -1,43 +1,21 @@
 import path from 'path';
 
-import { Plugin, ApplicationOptions } from '@nocobase/server';
-import { MockServer, mockServer } from '@nocobase/test';
+import { ApplicationOptions, Plugin } from '@nocobase/server';
+import { MockServer, createMockServer } from '@nocobase/test';
 
-import instructions from './instructions';
 import functions from './functions';
+import instructions from './instructions';
 
-interface MockServerOptions extends ApplicationOptions {
-  autoStart?: boolean;
+export interface MockServerOptions extends ApplicationOptions {
   collectionsPath?: string;
-  cleanDb?: boolean;
 }
 
-async function createMockServer({ autoStart, collectionsPath, cleanDb, ...options }: MockServerOptions) {
-  const app = mockServer(options);
-
-  if (cleanDb) {
-    await app.cleanDb();
-  }
-
-  await app.load();
-
-  if (collectionsPath) {
-    await app.db.import({ directory: collectionsPath });
-  }
-
-  try {
-    await app.db.sync();
-  } catch (error) {
-    console.error(error);
-  }
-
-  if (autoStart) {
-    await app.start();
-    // await app.runCommand('start', '--quickstart');
-  }
-
-  return app;
-}
+// async function createMockServer(options: MockServerOptions) {
+//   const app = mockServer(options);
+//   await app.cleanDb();
+//   await app.runCommand('start', '--quickstart');
+//   return app;
+// }
 
 export function sleep(ms: number) {
   return new Promise((resolve) => {
@@ -45,16 +23,17 @@ export function sleep(ms: number) {
   });
 }
 
-export async function getApp({
-  autoStart = true,
-  cleanDb = true,
-  plugins = [],
-  ...options
-}: MockServerOptions = {}): Promise<MockServer> {
+export async function getApp(options: MockServerOptions = {}): Promise<MockServer> {
+  const { plugins = [], collectionsPath, ...others } = options;
+  class TestCollectionPlugin extends Plugin {
+    async load() {
+      if (collectionsPath) {
+        await this.db.import({ directory: collectionsPath });
+      }
+    }
+  }
   return createMockServer({
-    ...options,
-    autoStart,
-    cleanDb,
+    ...others,
     plugins: [
       [
         'workflow',
@@ -63,7 +42,8 @@ export async function getApp({
           functions,
         },
       ],
-      WorkflowTestPlugin,
+      'workflow-test',
+      TestCollectionPlugin,
       ...plugins,
     ],
   });
@@ -71,8 +51,6 @@ export async function getApp({
 
 export default class WorkflowTestPlugin extends Plugin {
   async load() {
-    await this.db.import({
-      directory: path.resolve(__dirname, 'collections'),
-    });
+    await this.importCollections(path.resolve(__dirname, 'collections'));
   }
 }