@nocobase/plugin-workflow 0.20.0-alpha.9 → 0.21.0-alpha.10

package/dist/server/Processor.d.ts

@@ -20,13 +20,31 @@ export default class Processor {
         [-6]: -6;
     };
     logger: Logger;
+    /**
+     * @experimental
+     */
     transaction: Transaction;
+    /**
+     * @experimental
+     */
     nodes: FlowNodeModel[];
+    /**
+     * @experimental
+     */
     nodesMap: Map<number, FlowNodeModel>;
+    /**
+     * @experimental
+     */
     jobsMap: Map<number, JobModel>;
+    /**
+     * @experimental
+     */
     jobsMapByNodeKey: {
         [key: string]: any;
     };
+    /**
+     * @experimental
+     */
     lastSavedJob: JobModel | null;
     constructor(execution: ExecutionModel, options: ProcessorOptions);
     private makeNodes;
@@ -37,15 +55,43 @@ export default class Processor {
     private exec;
     run(node: any, input?: any): any;
     end(node: any, job: JobModel): Promise<any>;
-    recall(node: any, job: any): Promise<any>;
+    private recall;
     exit(s?: number): Promise<any>;
+    /**
+     * @experimental
+     * @param {JobModel | Record<string, any>} payload
+     * @returns {JobModel}
+     */
     saveJob(payload: any): Promise<any>;
+    /**
+     * @experimental
+     */
     getBranches(node: FlowNodeModel): FlowNodeModel[];
+    /**
+     * @experimental
+     * find the first node in current branch
+     */
     findBranchStartNode(node: FlowNodeModel, parent?: FlowNodeModel): FlowNodeModel | null;
+    /**
+     * @experimental
+     * find the node start current branch
+     */
     findBranchParentNode(node: FlowNodeModel): FlowNodeModel | null;
+    /**
+     * @experimental
+     */
     findBranchEndNode(node: FlowNodeModel): FlowNodeModel | null;
+    /**
+     * @experimental
+     */
     findBranchParentJob(job: JobModel, node: FlowNodeModel): JobModel | null;
+    /**
+     * @experimental
+     */
     findBranchLastJob(node: FlowNodeModel, job: JobModel): JobModel | null;
+    /**
+     * @experimental
+     */
     getScope(sourceNodeId: number): {
         $context: any;
         $jobsMapByNodeKey: {
@@ -54,5 +100,8 @@ export default class Processor {
         $system: {};
         $scopes: {};
     };
+    /**
+     * @experimental
+     */
     getParsedValue(value: any, sourceNodeId: number, additionalScope?: object): any;
 }

package/dist/server/Processor.js

@@ -42,11 +42,29 @@ class Processor {
     [import_constants.JOB_STATUS.RETRY_NEEDED]: import_constants.EXECUTION_STATUS.RETRY_NEEDED
   };
   logger;
+  /**
+   * @experimental
+   */
   transaction;
+  /**
+   * @experimental
+   */
   nodes = [];
+  /**
+   * @experimental
+   */
   nodesMap = /* @__PURE__ */ new Map();
+  /**
+   * @experimental
+   */
   jobsMap = /* @__PURE__ */ new Map();
+  /**
+   * @experimental
+   */
   jobsMapByNodeKey = {};
+  /**
+   * @experimental
+   */
   lastSavedJob = null;
   // make dual linked nodes list then cache
   makeNodes(nodes = []) {
@@ -185,6 +203,11 @@ class Processor {
     return null;
   }
   // TODO(optimize)
+  /**
+   * @experimental
+   * @param {JobModel | Record<string, any>} payload
+   * @returns {JobModel}
+   */
   async saveJob(payload) {
     const { database } = this.execution.constructor;
     const { transaction } = this;
@@ -209,10 +232,16 @@ class Processor {
     this.jobsMapByNodeKey[job.nodeKey] = job.result;
     return job;
   }
+  /**
+   * @experimental
+   */
   getBranches(node) {
     return this.nodes.filter((item) => item.upstream === node && item.branchIndex !== null).sort((a, b) => Number(a.branchIndex) - Number(b.branchIndex));
   }
-  // find the first node in current branch
+  /**
+   * @experimental
+   * find the first node in current branch
+   */
   findBranchStartNode(node, parent) {
     for (let n = node; n; n = n.upstream) {
       if (!parent) {
@@ -227,7 +256,10 @@ class Processor {
     }
     return null;
   }
-  // find the node start current branch
+  /**
+   * @experimental
+   * find the node start current branch
+   */
   findBranchParentNode(node) {
     for (let n = node; n; n = n.upstream) {
       if (n.branchIndex !== null) {
@@ -236,6 +268,9 @@ class Processor {
     }
     return null;
   }
+  /**
+   * @experimental
+   */
   findBranchEndNode(node) {
     for (let n = node; n; n = n.downstream) {
       if (!n.downstream) {
@@ -244,6 +279,9 @@ class Processor {
     }
     return null;
   }
+  /**
+   * @experimental
+   */
   findBranchParentJob(job, node) {
     for (let j = job; j; j = this.jobsMap.get(j.upstreamId)) {
       if (j.nodeId === node.id) {
@@ -252,6 +290,9 @@ class Processor {
     }
     return null;
   }
+  /**
+   * @experimental
+   */
   findBranchLastJob(node, job) {
     const allJobs = Array.from(this.jobsMap.values());
     const branchJobs = [];
@@ -268,6 +309,9 @@ class Processor {
     }
     return null;
   }
+  /**
+   * @experimental
+   */
   getScope(sourceNodeId) {
     const node = this.nodesMap.get(sourceNodeId);
     const systemFns = {};
@@ -292,6 +336,9 @@ class Processor {
       $scopes
     };
   }
+  /**
+   * @experimental
+   */
   getParsedValue(value, sourceNodeId, additionalScope) {
     const template = (0, import_utils.parse)(value);
     const scope = Object.assign(this.getScope(sourceNodeId), additionalScope);

package/dist/server/collections/executions.js

@@ -32,7 +32,7 @@ var executions_default = {
       name: "workflow"
     },
     {
-      type: "uid",
+      type: "string",
       name: "key"
     },
     {

package/dist/server/instructions/CreateInstruction.js

@@ -21,20 +21,23 @@ __export(CreateInstruction_exports, {
   default: () => CreateInstruction_default
 });
 module.exports = __toCommonJS(CreateInstruction_exports);
+var import_data_source_manager = require("@nocobase/data-source-manager");
 var import_constants = require("../constants");
 var import_utils = require("../utils");
 var import__ = require(".");
 class CreateInstruction extends import__.Instruction {
   async run(node, input, processor) {
     const { collection, params: { appends = [], ...params } = {} } = node.config;
-    const { repository, model } = node.constructor.database.getCollection(collection);
+    const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(collection);
+    const { repository, filterTargetKey } = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(collectionName);
     const options = processor.getParsedValue(params, node.id);
+    const transaction = this.workflow.useDataSourceTransaction(dataSourceName, processor.transaction);
     const created = await repository.create({
       ...options,
       context: {
         stack: Array.from(new Set((processor.execution.context.stack ?? []).concat(processor.execution.id)))
       },
-      transaction: processor.transaction
+      transaction
     });
     let result = created;
     if (created && appends.length) {
@@ -44,9 +47,9 @@ class CreateInstruction extends import__.Instruction {
         return set;
       }, /* @__PURE__ */ new Set());
       result = await repository.findOne({
-        filterByTk: created[model.primaryKeyAttribute],
+        filterByTk: created[filterTargetKey],
         appends: Array.from(includeFields),
-        transaction: processor.transaction
+        transaction
       });
     }
     return {

package/dist/server/instructions/DestroyInstruction.js

@@ -21,19 +21,21 @@ __export(DestroyInstruction_exports, {
   default: () => DestroyInstruction_default
 });
 module.exports = __toCommonJS(DestroyInstruction_exports);
+var import_data_source_manager = require("@nocobase/data-source-manager");
 var import__ = require(".");
 var import_constants = require("../constants");
 class DestroyInstruction extends import__.Instruction {
   async run(node, input, processor) {
     const { collection, params = {} } = node.config;
-    const repo = node.constructor.database.getRepository(collection);
+    const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(collection);
+    const { repository } = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(collectionName);
     const options = processor.getParsedValue(params, node.id);
-    const result = await repo.destroy({
+    const result = await repository.destroy({
       ...options,
       context: {
         stack: Array.from(new Set((processor.execution.context.stack ?? []).concat(processor.execution.id)))
       },
-      transaction: processor.transaction
+      transaction: this.workflow.useDataSourceTransaction(dataSourceName, processor.transaction)
     });
     return {
       result,

package/dist/server/instructions/QueryInstruction.js

@@ -22,13 +22,15 @@ __export(QueryInstruction_exports, {
 });
 module.exports = __toCommonJS(QueryInstruction_exports);
 var import_actions = require("@nocobase/actions");
+var import_data_source_manager = require("@nocobase/data-source-manager");
 var import_constants = require("../constants");
 var import_utils = require("../utils");
 var import__ = require(".");
 class QueryInstruction extends import__.Instruction {
   async run(node, input, processor) {
     const { collection, multiple, params = {}, failOnEmpty = false } = node.config;
-    const repo = node.constructor.database.getRepository(collection);
+    const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(collection);
+    const { repository } = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(collectionName);
     const {
       page = import_actions.DEFAULT_PAGE,
       pageSize = import_actions.DEFAULT_PER_PAGE,
@@ -42,7 +44,7 @@ class QueryInstruction extends import__.Instruction {
         return set;
       }, /* @__PURE__ */ new Set())
     ) : options.appends;
-    const result = await (multiple ? repo.find : repo.findOne).call(repo, {
+    const result = await (multiple ? repository.find : repository.findOne).call(repository, {
       ...options,
       ...import_actions.utils.pageArgsToLimitArgs(page, pageSize),
       sort: sort.filter((item) => item.field).map((item) => {
@@ -50,7 +52,7 @@ class QueryInstruction extends import__.Instruction {
         return `${((_a = item.direction) == null ? void 0 : _a.toLowerCase()) === "desc" ? "-" : ""}${item.field}`;
       }),
       appends,
-      transaction: processor.transaction
+      transaction: this.workflow.useDataSourceTransaction(dataSourceName, processor.transaction)
     });
     if (failOnEmpty && (multiple ? !result.length : !result)) {
       return {

package/dist/server/instructions/UpdateInstruction.js

@@ -21,19 +21,21 @@ __export(UpdateInstruction_exports, {
   default: () => UpdateInstruction_default
 });
 module.exports = __toCommonJS(UpdateInstruction_exports);
+var import_data_source_manager = require("@nocobase/data-source-manager");
 var import_constants = require("../constants");
 var import__ = require(".");
 class UpdateInstruction extends import__.Instruction {
   async run(node, input, processor) {
     const { collection, params = {} } = node.config;
-    const repo = node.constructor.database.getRepository(collection);
+    const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(collection);
+    const { repository } = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(collectionName);
     const options = processor.getParsedValue(params, node.id);
-    const result = await repo.update({
+    const result = await repository.update({
       ...options,
       context: {
         stack: Array.from(new Set((processor.execution.context.stack ?? []).concat(processor.execution.id)))
       },
-      transaction: processor.transaction
+      transaction: this.workflow.useDataSourceTransaction(dataSourceName, processor.transaction)
     });
     return {
       result: result.length ?? result,

package/dist/server/migrations/20230411034722-manual-multi-form.js

@@ -112,12 +112,10 @@ function migrateConfig({ schema = {}, actions = [] }) {
     [formId]: {
       type: "void",
       "x-component": "FormV2",
-      "x-component-props": {
-        useProps: "{{ useFormBlockProps }}"
-      },
+      "x-use-component-props": "useFormBlockProps",
       properties: {
         grid: Object.assign(formBlock.properties.grid, {
-          "x-initializer": "AddCustomFormField"
+          "x-initializer": "workflowManual:customForm:configureFields"
         }),
         // 7.
         actions: {
@@ -130,7 +128,7 @@ function migrateConfig({ schema = {}, actions = [] }) {
               marginTop: "1.5em"
             }
           },
-          "x-initializer": "AddActionButton",
+          "x-initializer": "workflowManual:form:configureActions",
           properties: schema.actions
         }
       }

package/dist/server/migrations/20230612021134-manual-collection-block.js

@@ -67,15 +67,13 @@ function migrateSchema(schema = {}) {
           type: "void",
           name: id,
           "x-component": "FormV2",
-          "x-component-props": {
-            useProps: "{{useDetailsBlockProps}}"
-          },
+          "x-use-component-props": "useDetailsBlockProps",
           properties: {
             grid: {
               type: "void",
               name: "grid",
               "x-component": "Grid",
-              "x-initializer": "ReadPrettyFormItemInitializers",
+              "x-initializer": "details:configureFields",
               properties: grid.properties
             }
           }

package/dist/server/triggers/CollectionTrigger.js

@@ -32,6 +32,7 @@ __export(CollectionTrigger_exports, {
 module.exports = __toCommonJS(CollectionTrigger_exports);
 var import__ = __toESM(require("."));
 var import_utils = require("../utils");
+var import_data_source_manager = require("@nocobase/data-source-manager");
 const MODE_BITMAP = {
   CREATE: 1,
   UPDATE: 2,
@@ -46,24 +47,27 @@ function getHookId(workflow, type) {
 }
 function getFieldRawName(collection, name) {
   const field = collection.getField(name);
-  if (field && field.type === "belongsTo") {
-    return field.foreignKey;
+  if (field && field.options.type === "belongsTo") {
+    return field.options.foreignKey;
   }
   return name;
 }
 async function handler(workflow, data, options) {
-  var _a;
-  const { collection: collectionName, condition, changed, mode, appends } = workflow.config;
-  const collection = data.constructor.database.getCollection(collectionName);
+  var _a, _b;
+  const { condition, changed, mode, appends } = workflow.config;
+  const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(workflow.config.collection);
+  const collection = (_a = this.workflow.app.dataSourceManager) == null ? void 0 : _a.dataSources.get(dataSourceName).collectionManager.getCollection(collectionName);
   const { transaction, context } = options;
-  const { repository, model } = collection;
-  if (changed && changed.length && changed.filter((name) => !["linkTo", "hasOne", "hasMany", "belongsToMany"].includes(collection.getField(name).type)).every((name) => !data.changedWithAssociations(getFieldRawName(collection, name)))) {
+  const { repository, filterTargetKey } = collection;
+  if (changed && changed.length && changed.filter(
+    (name) => !["linkTo", "hasOne", "hasMany", "belongsToMany"].includes(collection.getField(name).options.type)
+  ).every((name) => !data.changedWithAssociations(getFieldRawName(collection, name)))) {
     return;
   }
-  if (condition && ((_a = condition.$and) == null ? void 0 : _a.length)) {
+  if (condition && ((_b = condition.$and) == null ? void 0 : _b.length)) {
     const count = await repository.count({
       filter: {
-        $and: [condition, { [model.primaryKeyAttribute]: data[model.primaryKeyAttribute] }]
+        $and: [condition, { [filterTargetKey]: data[filterTargetKey] }]
       },
       context,
       transaction
@@ -80,7 +84,7 @@ async function handler(workflow, data, options) {
       return set;
     }, /* @__PURE__ */ new Set());
     result = await repository.findOne({
-      filterByTk: data[model.primaryKeyAttribute],
+      filterByTk: data[filterTargetKey],
       appends: Array.from(includeFields),
       transaction
     });
@@ -91,7 +95,7 @@ async function handler(workflow, data, options) {
       workflow,
       { data: json, stack: context == null ? void 0 : context.stack },
       {
-        transaction
+        transaction: this.workflow.useDataSourceTransaction(dataSourceName, transaction)
       }
     );
   } else {
@@ -101,15 +105,19 @@ async function handler(workflow, data, options) {
 class CollectionTrigger extends import__.default {
   events = /* @__PURE__ */ new Map();
   on(workflow) {
-    const { db } = this.workflow.app;
+    var _a, _b;
     const { collection, mode } = workflow.config;
-    const Collection2 = db.getCollection(collection);
-    if (!Collection2) {
+    if (!collection) {
+      return;
+    }
+    const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(collection);
+    const { db } = ((_b = (_a = this.workflow.app.dataSourceManager) == null ? void 0 : _a.dataSources.get(dataSourceName)) == null ? void 0 : _b.collectionManager) ?? {};
+    if (!db || !db.getCollection(collectionName)) {
       return;
     }
     for (const [key, type] of MODE_BITMAP_EVENTS.entries()) {
-      const event = `${collection}.${type}`;
-      const name = getHookId(workflow, event);
+      const event = `${collectionName}.${type}`;
+      const name = getHookId(workflow, `${collection}.${type}`);
       if (mode & key) {
         if (!this.events.has(name)) {
           const listener = handler.bind(this, workflow);
@@ -126,19 +134,22 @@ class CollectionTrigger extends import__.default {
     }
   }
   off(workflow) {
-    const { db } = this.workflow.app;
+    var _a;
     const { collection, mode } = workflow.config;
-    const Collection2 = db.getCollection(collection);
-    if (!Collection2) {
+    if (!collection) {
+      return;
+    }
+    const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(collection);
+    const { db } = ((_a = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName)) == null ? void 0 : _a.collectionManager) ?? {};
+    if (!db || !db.getCollection(collectionName)) {
       return;
     }
     for (const [key, type] of MODE_BITMAP_EVENTS.entries()) {
-      const event = `${collection}.${type}`;
-      const name = getHookId(workflow, event);
+      const name = getHookId(workflow, `${collection}.${type}`);
       if (mode & key) {
         const listener = this.events.get(name);
         if (listener) {
-          db.off(event, listener);
+          db.off(`${collectionName}.${type}`, listener);
           this.events.delete(name);
         }
       }

package/dist/server/triggers/ScheduleTrigger/DateFieldScheduleTrigger.js

@@ -33,6 +33,7 @@ module.exports = __toCommonJS(DateFieldScheduleTrigger_exports);
 var import_database = require("@nocobase/database");
 var import_cron_parser = __toESM(require("cron-parser"));
 var import_utils = require("./utils");
+var import_data_source_manager = require("@nocobase/data-source-manager");
 function getOnTimestampWithOffset({ field, offset = 0, unit = 1e3 }, now) {
   if (!field) {
     return null;
@@ -257,8 +258,9 @@ class ScheduleTrigger {
     return nextTime;
   }
   schedule(workflow, record, nextTime, toggle = true, options = {}) {
-    const { model } = this.workflow.app.db.getCollection(workflow.config.collection);
-    const recordPk = record.get(model.primaryKeyAttribute);
+    const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(workflow.config.collection);
+    const { filterTargetKey } = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(collectionName);
+    const recordPk = record.get(filterTargetKey);
     if (toggle) {
       const nextInterval = Math.max(0, nextTime - Date.now());
       const key = `${workflow.id}:${recordPk}@${nextTime}`;
@@ -279,8 +281,9 @@ class ScheduleTrigger {
     }
   }
   async trigger(workflow, record, nextTime, { transaction } = {}) {
-    const { repository, model } = this.workflow.app.db.getCollection(workflow.config.collection);
-    const recordPk = record.get(model.primaryKeyAttribute);
+    const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(workflow.config.collection);
+    const { repository, filterTargetKey } = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(collectionName);
+    const recordPk = record.get(filterTargetKey);
     const data = await repository.findOne({
       filterByTk: recordPk,
       appends: workflow.config.appends,
@@ -303,7 +306,9 @@ class ScheduleTrigger {
   on(workflow) {
     this.inspect([workflow]);
     const { collection } = workflow.config;
-    const event = `${collection}.afterSaveWithAssociations`;
+    const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(collection);
+    const event = `${collectionName}.afterSaveWithAssociations`;
+    const eventKey = `${collection}.afterSaveWithAssociations`;
     const name = getHookId(workflow, event);
     if (this.events.has(name)) {
       return;
@@ -313,7 +318,7 @@ class ScheduleTrigger {
       return this.schedule(workflow, data, nextTime, Boolean(nextTime), { transaction });
     };
     this.events.set(name, listener);
-    this.workflow.app.db.on(event, listener);
+    this.workflow.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.db.on(event, listener);
   }
   off(workflow) {
     for (const [key, timer] of this.cache.entries()) {
@@ -323,12 +328,15 @@ class ScheduleTrigger {
       }
     }
     const { collection } = workflow.config;
-    const event = `${collection}.afterSave`;
+    const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(collection);
+    const event = `${collectionName}.afterSaveWithAssociations`;
+    const eventKey = `${collection}.afterSaveWithAssociations`;
     const name = getHookId(workflow, event);
-    if (this.events.has(name)) {
+    if (this.events.has(eventKey)) {
       const listener = this.events.get(name);
-      this.events.delete(name);
-      this.workflow.app.db.off(event, listener);
+      const { db } = this.workflow.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager;
+      db.off(event, listener);
+      this.events.delete(eventKey);
     }
   }
 }

package/package.json

@@ -4,13 +4,13 @@
   "displayName.zh-CN": "工作流",
   "description": "A powerful BPM tool that provides foundational support for business automation, with the capability to extend unlimited triggers and nodes.",
   "description.zh-CN": "一个强大的 BPM 工具，为业务自动化提供基础支持，并且可任意扩展更多的触发器和节点。",
-  "version": "0.20.0-alpha.9",
+  "version": "0.21.0-alpha.10",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/workflow",
   "dependencies": {
-    "@nocobase/plugin-workflow-test": "0.20.0-alpha.9"
+    "@nocobase/plugin-workflow-test": "0.21.0-alpha.10"
   },
   "devDependencies": {
     "@ant-design/icons": "5.x",
@@ -19,7 +19,6 @@
     "@formily/react": "2.x",
     "@types/ejs": "^3.1.1",
     "antd": "5.x",
-    "axios": "^0.26.1",
     "classnames": "^2.3.1",
     "cron-parser": "4.4.0",
     "dayjs": "^1.11.8",
@@ -45,7 +44,7 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "5473d9039cfdb649a8c8c625edefc9a3ac464be5",
+  "gitHead": "98adf5ec996a4f359c6ca1c4a6ac837c43b6e268",
   "keywords": [
     "Workflow"
   ]

package/dist/client/constant.d.ts

@@ -1,2 +0,0 @@
-export declare const getWorkflowDetailPath: (id: string | number) => string;
-export declare const getWorkflowExecutionsPath: (id: string | number) => string;