@nocobase/plugin-workflow-action-trigger 2.1.0-beta.11 → 2.1.0-beta.12

package/dist/externalVersion.js

@@ -9,19 +9,19 @@
 
 module.exports = {
   "@formily/react": "2.3.7",
-  "@nocobase/client": "2.1.0-beta.11",
-  "@nocobase/plugin-workflow": "2.1.0-beta.11",
+  "@nocobase/client": "2.1.0-beta.12",
+  "@nocobase/plugin-workflow": "2.1.0-beta.12",
   "react": "18.2.0",
-  "@nocobase/flow-engine": "2.1.0-beta.11",
+  "@nocobase/flow-engine": "2.1.0-beta.12",
   "react-i18next": "11.18.6",
   "lodash": "4.17.21",
   "sequelize": "6.35.2",
-  "@nocobase/database": "2.1.0-beta.11",
-  "@nocobase/server": "2.1.0-beta.11",
-  "@nocobase/actions": "2.1.0-beta.11",
-  "@nocobase/plugin-error-handler": "2.1.0-beta.11",
-  "@nocobase/data-source-manager": "2.1.0-beta.11",
-  "@nocobase/plugin-workflow-test": "2.1.0-beta.11",
-  "@nocobase/test": "2.1.0-beta.11",
-  "@nocobase/utils": "2.1.0-beta.11"
+  "@nocobase/database": "2.1.0-beta.12",
+  "@nocobase/server": "2.1.0-beta.12",
+  "@nocobase/actions": "2.1.0-beta.12",
+  "@nocobase/plugin-error-handler": "2.1.0-beta.12",
+  "@nocobase/data-source-manager": "2.1.0-beta.12",
+  "@nocobase/plugin-workflow-test": "2.1.0-beta.12",
+  "@nocobase/test": "2.1.0-beta.12",
+  "@nocobase/utils": "2.1.0-beta.12"
 };

package/dist/server/ActionTrigger.js

@@ -203,28 +203,66 @@ class ActionTrigger_default extends import_plugin_workflow.Trigger {
         (workflow.sync ? syncGroup : asyncGroup).push([workflow, { data, ...userInfo }]);
       }
     }
-    for (const event of syncGroup) {
-      const processor = await this.workflow.trigger(event[0], event[1], { httpContext: context });
+    for (const [index, event] of syncGroup.entries()) {
+      const workflow = event[0];
+      const remainingSyncWorkflows = syncGroup.length - index - 1;
+      const syncLogMeta = {
+        workflowId: workflow.id,
+        workflowKey: workflow.key,
+        workflowTitle: workflow.title,
+        resourceName,
+        actionName,
+        currentSyncOrder: index + 1,
+        totalSyncWorkflows: syncGroup.length,
+        remainingSyncWorkflows,
+        pendingAsyncWorkflows: asyncGroup.length
+      };
+      context.logger.debug("[Workflow post-action]: executing sync workflow", syncLogMeta);
+      const processor = await this.workflow.trigger(workflow, event[1], { httpContext: context });
       if (!processor) {
-        return context.throw(500);
+        context.logger.error(
+          "[Workflow post-action]: sync workflow trigger failed before execution created",
+          syncLogMeta
+        );
+        return context.throw(500, "Workflow on your action failed, please contact the administrator");
       }
       const { lastSavedJob, nodesMap } = processor;
       const lastNode = nodesMap.get(lastSavedJob == null ? void 0 : lastSavedJob.nodeId);
       if (processor.execution.status === import_plugin_workflow.EXECUTION_STATUS.RESOLVED) {
         if ((lastNode == null ? void 0 : lastNode.type) === "end") {
+          context.logger.debug("[Workflow post-action]: sync workflow ended request chain on end node", {
+            ...syncLogMeta,
+            ...(0, import_plugin_workflow.getWorkflowExecutionLogMeta)(workflow, processor)
+          });
           return;
         }
+        context.logger.debug("[Workflow post-action]: sync workflow finished successfully", {
+          ...syncLogMeta,
+          ...(0, import_plugin_workflow.getWorkflowExecutionLogMeta)(workflow, processor)
+        });
         continue;
       }
       if (processor.execution.status < import_plugin_workflow.EXECUTION_STATUS.STARTED) {
         if ((lastNode == null ? void 0 : lastNode.type) !== "end") {
+          context.logger.error("[Workflow post-action]: sync workflow failed", {
+            ...syncLogMeta,
+            ...(0, import_plugin_workflow.getWorkflowExecutionLogMeta)(workflow, processor)
+          });
           return context.throw(500, "Workflow on your action failed, please contact the administrator");
         }
+        context.logger.warn("[Workflow post-action]: sync workflow intercepted request on end node", {
+          ...syncLogMeta,
+          ...(0, import_plugin_workflow.getWorkflowExecutionLogMeta)(workflow, processor)
+        });
         const err = new RequestOnActionTriggerError("Request failed");
         err.status = 400;
         err.messages = context.state.messages;
         return context.throw(err.status, err);
       }
+      context.logger.error("[Workflow post-action]: sync workflow is still pending after trigger", {
+        ...syncLogMeta,
+        ...(0, import_plugin_workflow.getWorkflowExecutionLogMeta)(workflow, processor)
+      });
       return context.throw(500, "Workflow on your action hangs, please contact the administrator");
     }
     for (const event of asyncGroup) {

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.1.0-beta.11",
+  "version": "2.1.0-beta.12",
   "license": "Apache-2.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": "b02e78b928f476d848b88bc545d3acddca00fe3c",
+  "gitHead": "25cee9643f42f850afc4adc33c55a56850ac730d",
   "keywords": [
     "Workflow"
   ]