@nocobase/plugin-workflow-action-trigger 0.21.0-alpha.6 → 0.21.0-alpha.7

package/dist/externalVersion.js

@@ -1,15 +1,15 @@
 module.exports = {
   "@formily/react": "2.3.0",
-  "@nocobase/client": "0.21.0-alpha.6",
-  "@nocobase/plugin-workflow": "0.21.0-alpha.6",
+  "@nocobase/client": "0.21.0-alpha.7",
+  "@nocobase/plugin-workflow": "0.21.0-alpha.7",
   "react-i18next": "11.18.6",
   "lodash": "4.17.21",
   "sequelize": "6.35.2",
-  "@nocobase/database": "0.21.0-alpha.6",
-  "@nocobase/server": "0.21.0-alpha.6",
-  "@nocobase/actions": "0.21.0-alpha.6",
-  "@nocobase/data-source-manager": "0.21.0-alpha.6",
-  "@nocobase/plugin-workflow-test": "0.21.0-alpha.6",
-  "@nocobase/test": "0.21.0-alpha.6",
-  "@nocobase/utils": "0.21.0-alpha.6"
+  "@nocobase/database": "0.21.0-alpha.7",
+  "@nocobase/server": "0.21.0-alpha.7",
+  "@nocobase/actions": "0.21.0-alpha.7",
+  "@nocobase/data-source-manager": "0.21.0-alpha.7",
+  "@nocobase/plugin-workflow-test": "0.21.0-alpha.7",
+  "@nocobase/test": "0.21.0-alpha.7",
+  "@nocobase/utils": "0.21.0-alpha.7"
 };

package/dist/server/ActionTrigger.js

@@ -57,7 +57,8 @@ class ActionTrigger_default extends import_plugin_workflow.Trigger {
       params: { triggerWorkflows = "", values }
     } = context.action;
     const dataSourceHeader = context.get("x-data-source") || "main";
-    const fullCollectionName = (0, import_data_source_manager.joinCollectionName)(dataSourceHeader, resourceName);
+    const collection = context.app.dataSourceManager.dataSources.get(dataSourceHeader).collectionManager.getCollection(resourceName);
+    const fullCollectionName = (0, import_data_source_manager.joinCollectionName)(dataSourceHeader, collection.name);
     const { currentUser, currentRole } = context.state;
     const { model: UserModel } = this.workflow.db.getCollection("users");
     const userInfo = {
@@ -98,8 +99,8 @@ class ActionTrigger_default extends import_plugin_workflow.Trigger {
     const syncGroup = [];
     const asyncGroup = [];
     for (const workflow of triggeringLocalWorkflows.concat(...globalWorkflows.values())) {
-      const { collection, appends = [] } = workflow.config;
-      const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(collection);
+      const { appends = [] } = workflow.config;
+      const [dataSourceName, collectionName] = (0, import_data_source_manager.parseCollectionName)(workflow.config.collection);
       const dataPath = triggersKeysMap.get(workflow.key);
       const event = [workflow];
       if (context.action.resourceName !== "workflows") {

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：操作后事件",
   "description": "Triggered after the completion of a request initiated through an action button or API, such as after adding, updating, deleting data, or \"submit to workflow\". Suitable for data processing, sending notifications, etc., after actions are completed.",
   "description.zh-CN": "通过操作按钮或 API 发起请求并在执行完成后触发，比如新增、更新、删除数据或者“提交至工作流”之后。适用于在操作完成后进行数据处理、发送通知等。",
-  "version": "0.21.0-alpha.6",
+  "version": "0.21.0-alpha.7",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/plugins/workflow-action-trigger",
@@ -21,7 +21,7 @@
     "@nocobase/server": "0.x",
     "@nocobase/test": "0.x"
   },
-  "gitHead": "25eaaf1bdf44d2b457a3a3742532db9d2008216b",
+  "gitHead": "b1be3993f8aa81173d01bc390aa8e4c5adcc0e2d",
   "keywords": [
     "Workflow"
   ]

package/src/server/ActionTrigger.ts

@@ -54,7 +54,10 @@ export default class extends Trigger {
       params: { triggerWorkflows = '', values },
     } = context.action;
     const dataSourceHeader = context.get('x-data-source') || 'main';
-    const fullCollectionName = joinCollectionName(dataSourceHeader, resourceName);
+    const collection = context.app.dataSourceManager.dataSources
+      .get(dataSourceHeader)
+      .collectionManager.getCollection(resourceName);
+    const fullCollectionName = joinCollectionName(dataSourceHeader, collection.name);
     const { currentUser, currentRole } = context.state;
     const { model: UserModel } = this.workflow.db.getCollection('users');
     const userInfo = {
@@ -95,8 +98,8 @@ export default class extends Trigger {
     const syncGroup = [];
     const asyncGroup = [];
     for (const workflow of triggeringLocalWorkflows.concat(...globalWorkflows.values())) {
-      const { collection, appends = [] } = workflow.config;
-      const [dataSourceName, collectionName] = parseCollectionName(collection);
+      const { appends = [] } = workflow.config;
+      const [dataSourceName, collectionName] = parseCollectionName(workflow.config.collection);
       const dataPath = triggersKeysMap.get(workflow.key);
       const event = [workflow];
       if (context.action.resourceName !== 'workflows') {

package/src/server/__tests__/trigger.test.ts

@@ -10,7 +10,7 @@ describe('workflow > action-trigger', () => {
   let db: Database;
   let agent;
   let PostRepo;
-  let CommentRepo;
+  let CategoryRepo;
   let WorkflowModel;
   let UserRepo;
   let users;
@@ -25,7 +25,7 @@ describe('workflow > action-trigger', () => {
     db = app.db;
     WorkflowModel = db.getCollection('workflows').model;
     PostRepo = db.getCollection('posts').repository;
-    CommentRepo = db.getCollection('comments').repository;
+    CategoryRepo = db.getCollection('categories').repository;
     UserRepo = db.getCollection('users').repository;
 
     users = await UserRepo.create({
@@ -461,6 +461,33 @@ describe('workflow > action-trigger', () => {
     });
   });
 
+  describe('associations actions', () => {
+    it('trigger on associated data', async () => {
+      const workflow = await WorkflowModel.create({
+        enabled: true,
+        type: 'action',
+        config: {
+          collection: 'posts',
+        },
+      });
+
+      const c1 = await CategoryRepo.create({ values: { title: 'c1' } });
+
+      const res1 = await userAgents[0].resource('categories.posts', c1.id).create({
+        values: { title: 'p1' },
+        triggerWorkflows: `${workflow.key}`,
+      });
+      expect(res1.status).toBe(200);
+
+      await sleep(500);
+
+      const e1s = await workflow.getExecutions();
+      expect(e1s.length).toBe(1);
+      expect(e1s[0].status).toBe(EXECUTION_STATUS.RESOLVED);
+      expect(e1s[0].context.data).toMatchObject({ title: 'p1', categoryId: c1.id });
+    });
+  });
+
   describe('workflow key', () => {
     it('revision', async () => {
       const w1 = await WorkflowModel.create({