@nocobase/plugin-workflow-action-trigger 2.0.0-alpha.51 → 2.0.0-alpha.52

package/dist/externalVersion.js

@@ -9,18 +9,18 @@
 
 module.exports = {
   "@formily/react": "2.3.7",
-  "@nocobase/client": "2.0.0-alpha.51",
-  "@nocobase/plugin-workflow": "2.0.0-alpha.51",
+  "@nocobase/client": "2.0.0-alpha.52",
+  "@nocobase/plugin-workflow": "2.0.0-alpha.52",
   "react": "18.2.0",
   "react-i18next": "11.18.6",
   "lodash": "4.17.21",
   "sequelize": "6.35.2",
-  "@nocobase/database": "2.0.0-alpha.51",
-  "@nocobase/server": "2.0.0-alpha.51",
-  "@nocobase/actions": "2.0.0-alpha.51",
-  "@nocobase/plugin-error-handler": "2.0.0-alpha.51",
-  "@nocobase/data-source-manager": "2.0.0-alpha.51",
-  "@nocobase/plugin-workflow-test": "2.0.0-alpha.51",
-  "@nocobase/test": "2.0.0-alpha.51",
-  "@nocobase/utils": "2.0.0-alpha.51"
+  "@nocobase/database": "2.0.0-alpha.52",
+  "@nocobase/server": "2.0.0-alpha.52",
+  "@nocobase/actions": "2.0.0-alpha.52",
+  "@nocobase/plugin-error-handler": "2.0.0-alpha.52",
+  "@nocobase/data-source-manager": "2.0.0-alpha.52",
+  "@nocobase/plugin-workflow-test": "2.0.0-alpha.52",
+  "@nocobase/test": "2.0.0-alpha.52",
+  "@nocobase/utils": "2.0.0-alpha.52"
 };

package/dist/server/ActionTrigger.js

@@ -57,15 +57,14 @@ class ActionTrigger_default extends import_plugin_workflow.Trigger {
   constructor(workflow) {
     super(workflow);
     const self = this;
-    async function triggerWorkflowActionMiddleware(context, next) {
+    workflow.app.dataSourceManager.use(async function triggerWorkflowActionMiddleware(context, next) {
       await next();
       const { actionName } = context.action;
       if (!["create", "update"].includes(actionName)) {
         return;
       }
       return self.collectionTriggerAction(context);
-    }
-    workflow.app.dataSourceManager.use(triggerWorkflowActionMiddleware);
+    });
     workflow.app.pm.get(import_plugin_error_handler.default).errorHandler.register(
       (err) => err instanceof RequestOnActionTriggerError || err.name === "RequestOnActionTriggerError",
       async (err, ctx) => {
@@ -175,9 +174,13 @@ class ActionTrigger_default extends import_plugin_workflow.Trigger {
             if (collectionName !== model.collection.name) {
               continue;
             }
+            const filterByTk = model.collection.isMultiFilterTargetKey() ? (0, import_lodash.pick)(
+              payload.get(),
+              model.collection.filterTargetKey.sort((a, b) => a.localeCompare(b))
+            ) : payload.get(model.collection.filterTargetKey);
             if (appends.length) {
               payload = await model.collection.repository.findOne({
-                filterByTk: payload.get(model.collection.filterTargetKey),
+                filterByTk,
                 appends
               });
             }
@@ -185,6 +188,9 @@ class ActionTrigger_default extends import_plugin_workflow.Trigger {
           (workflow.sync ? syncGroup : asyncGroup).push([workflow, { data: (0, import_plugin_workflow.toJSON)(payload), ...userInfo }]);
         }
       } else {
+        context.logger.warn(
+          "[Workflow post-action]: post-action to trigger on workflow resource is deprecated, and will be removed in 2.0"
+        );
         const { filterTargetKey, repository } = context.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(collectionName);
         let data = dataPath ? (0, import_lodash.get)(values, dataPath) : values;
         const pk = (0, import_lodash.get)(data, filterTargetKey);

package/package.json

@@ -6,7 +6,7 @@
   "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.ru-RU": "Срабатывает после завершения запроса, инициированного кнопкой действия или API, например после добавления, обновления, удаления данных или «отправки в рабочий процесс». Подходит для обработки данных, отправки уведомлений и т.д. после выполнения действий.",
   "description.zh-CN": "通过操作按钮或 API 发起请求并在执行完成后触发，比如新增、更新、删除数据或者“提交至工作流”之后。适用于在操作完成后进行数据处理、发送通知等。",
-  "version": "2.0.0-alpha.51",
+  "version": "2.0.0-alpha.52",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/plugins/workflow-action-trigger",
@@ -24,7 +24,7 @@
     "@nocobase/server": "2.x",
     "@nocobase/test": "2.x"
   },
-  "gitHead": "a1e34dd97f370d54f3d80a6b83ab7ddb9c72dc18",
+  "gitHead": "b32992d8baeb4ca6616d839ca2f9c023d49476a9",
   "keywords": [
     "Workflow"
   ]