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

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.2",
   "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.2"
   },
   "devDependencies": {
     "@ant-design/icons": "5.x",
@@ -45,7 +45,7 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "5473d9039cfdb649a8c8c625edefc9a3ac464be5",
+  "gitHead": "90628f2e2da846208fb2d7966ddb4e467d187ffb",
   "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;