@nocobase/plugin-workflow-action-trigger 1.6.0-beta.8 → 1.6.0-beta.9

package/dist/externalVersion.js

@@ -9,17 +9,17 @@
 
 module.exports = {
   "@formily/react": "2.3.0",
-  "@nocobase/client": "1.6.0-beta.8",
-  "@nocobase/plugin-workflow": "1.6.0-beta.8",
+  "@nocobase/client": "1.6.0-beta.9",
+  "@nocobase/plugin-workflow": "1.6.0-beta.9",
   "react": "18.2.0",
   "react-i18next": "11.18.6",
   "lodash": "4.17.21",
   "sequelize": "6.35.2",
-  "@nocobase/database": "1.6.0-beta.8",
-  "@nocobase/server": "1.6.0-beta.8",
-  "@nocobase/actions": "1.6.0-beta.8",
-  "@nocobase/data-source-manager": "1.6.0-beta.8",
-  "@nocobase/plugin-workflow-test": "1.6.0-beta.8",
-  "@nocobase/test": "1.6.0-beta.8",
-  "@nocobase/utils": "1.6.0-beta.8"
+  "@nocobase/database": "1.6.0-beta.9",
+  "@nocobase/server": "1.6.0-beta.9",
+  "@nocobase/actions": "1.6.0-beta.9",
+  "@nocobase/data-source-manager": "1.6.0-beta.9",
+  "@nocobase/plugin-workflow-test": "1.6.0-beta.9",
+  "@nocobase/test": "1.6.0-beta.9",
+  "@nocobase/utils": "1.6.0-beta.9"
 };

package/dist/server/ActionTrigger.d.ts

@@ -6,18 +6,12 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import { DefaultContext } from '@nocobase/server';
-import { Context as ActionContext, Next } from '@nocobase/actions';
+import { Collection } from '@nocobase/database';
 import WorkflowPlugin, { EventOptions, Trigger, WorkflowModel } from '@nocobase/plugin-workflow';
-interface Context extends ActionContext, DefaultContext {
-}
 export default class extends Trigger {
     static TYPE: string;
     constructor(workflow: WorkflowPlugin);
-    /**
-     * @deprecated
-     */
-    workflowTriggerAction(context: Context, next: Next): Promise<void>;
+    getTargetCollection(collection: Collection, association: string): Collection<any, any>;
     private collectionTriggerAction;
     execute(workflow: WorkflowModel, values: any, options: EventOptions): Promise<void | import("@nocobase/plugin-workflow").Processor>;
     validateContext(values: any): {
@@ -28,4 +22,3 @@ export default class extends Trigger {
         data?: undefined;
     };
 }
-export {};

package/dist/server/ActionTrigger.js

@@ -39,11 +39,8 @@ class ActionTrigger_default extends import_plugin_workflow.Trigger {
     super(workflow);
     const self = this;
     async function triggerWorkflowActionMiddleware(context, next) {
-      const { resourceName, actionName } = context.action;
-      if (resourceName === "workflows" && actionName === "trigger") {
-        return self.workflowTriggerAction(context, next);
-      }
       await next();
+      const { actionName } = context.action;
       if (!["create", "update"].includes(actionName)) {
         return;
       }
@@ -51,17 +48,15 @@ class ActionTrigger_default extends import_plugin_workflow.Trigger {
     }
     workflow.app.dataSourceManager.use(triggerWorkflowActionMiddleware);
   }
-  /**
-   * @deprecated
-   */
-  async workflowTriggerAction(context, next) {
-    const { triggerWorkflows } = context.action.params;
-    if (!triggerWorkflows) {
-      return context.throw(400);
+  getTargetCollection(collection, association) {
+    if (!association) {
+      return collection;
+    }
+    let targetCollection = collection;
+    for (const key of association.split(".")) {
+      targetCollection = collection.db.getCollection(targetCollection.getField(key).target);
     }
-    context.status = 202;
-    await next();
-    return this.collectionTriggerAction(context);
+    return targetCollection;
   }
   async collectionTriggerAction(context) {
     const {
@@ -74,7 +69,6 @@ class ActionTrigger_default extends import_plugin_workflow.Trigger {
     if (!collection) {
       return;
     }
-    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 = {
@@ -90,9 +84,8 @@ class ActionTrigger_default extends import_plugin_workflow.Trigger {
     const localWorkflows = /* @__PURE__ */ new Map();
     workflows.forEach((item) => {
       var _a;
-      if (resourceName === "workflows" && actionName === "trigger") {
-        localWorkflows.set(item.key, item);
-      } else if (item.config.collection === fullCollectionName) {
+      const targetCollection = this.getTargetCollection(collection, triggersKeysMap.get(item.key));
+      if (item.config.collection === (0, import_data_source_manager.joinCollectionName)(dataSourceHeader, targetCollection.name)) {
         if (item.config.global) {
           if ((_a = item.config.actions) == null ? void 0 : _a.includes(actionName)) {
             globalWorkflows.set(item.key, item);

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": "1.6.0-beta.8",
+  "version": "1.6.0-beta.9",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/plugins/workflow-action-trigger",
@@ -21,7 +21,7 @@
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x"
   },
-  "gitHead": "2257b50e1cf0b2a2873673a630e5ecc80ec2e01a",
+  "gitHead": "eb1ff948fcf7a51175626a1a56a8b8d9b90be006",
   "keywords": [
     "Workflow"
   ]