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

package/dist/externalVersion.js

@@ -10,20 +10,20 @@
 module.exports = {
   "react": "18.2.0",
   "@formily/react": "2.3.7",
-  "@nocobase/client": "2.1.0-beta.11",
-  "@nocobase/plugin-workflow": "2.1.0-beta.11",
-  "@nocobase/flow-engine": "2.1.0-beta.11",
+  "@nocobase/client": "2.1.0-beta.13",
+  "@nocobase/plugin-workflow": "2.1.0-beta.13",
+  "@nocobase/flow-engine": "2.1.0-beta.13",
   "@emotion/css": "11.13.0",
   "antd": "5.24.2",
   "react-router-dom": "6.30.1",
-  "@nocobase/utils": "2.1.0-beta.11",
+  "@nocobase/utils": "2.1.0-beta.13",
   "react-i18next": "11.18.6",
   "@formily/antd-v5": "1.2.3",
-  "@nocobase/plugin-error-handler": "2.1.0-beta.11",
-  "@nocobase/data-source-manager": "2.1.0-beta.11",
-  "@nocobase/server": "2.1.0-beta.11",
+  "@nocobase/plugin-error-handler": "2.1.0-beta.13",
+  "@nocobase/data-source-manager": "2.1.0-beta.13",
+  "@nocobase/server": "2.1.0-beta.13",
   "lodash": "4.17.21",
-  "@nocobase/actions": "2.1.0-beta.11",
-  "@nocobase/plugin-workflow-test": "2.1.0-beta.11",
-  "@nocobase/test": "2.1.0-beta.11"
+  "@nocobase/actions": "2.1.0-beta.13",
+  "@nocobase/plugin-workflow-test": "2.1.0-beta.13",
+  "@nocobase/test": "2.1.0-beta.13"
 };

package/dist/server/CustomActionTrigger.js

@@ -195,28 +195,66 @@ class CustomActionTrigger extends import_plugin_workflow.Trigger {
       context.logger.warn("No workflow triggered");
       return context.throw(500, "No action done, please contact the administrator");
     }
-    for (const event of syncGroup) {
-      const processor = await this.workflow.trigger(event[0], event[1], { httpContext: context });
+    const { resourceName, actionName } = context.action;
+    for (const [index, event] of syncGroup.entries()) {
+      const workflow = event[0];
+      const syncLogMeta = {
+        workflowId: workflow.id,
+        workflowKey: workflow.key,
+        workflowTitle: workflow.title,
+        resourceName,
+        actionName,
+        currentSyncOrder: index + 1,
+        totalSyncWorkflows: syncGroup.length,
+        remainingSyncWorkflows: syncGroup.length - index - 1,
+        pendingAsyncWorkflows: asyncGroup.length
+      };
+      context.logger.debug("[Workflow custom-action]: executing sync workflow", syncLogMeta);
+      const processor = await this.workflow.trigger(workflow, event[1], { httpContext: context });
       if (!processor) {
+        context.logger.error(
+          "[Workflow custom-action]: sync workflow trigger failed before execution created",
+          syncLogMeta
+        );
         return context.throw(500);
       }
       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 custom-action]: sync workflow ended request chain on end node", {
+            ...syncLogMeta,
+            ...(0, import_plugin_workflow.getWorkflowExecutionLogMeta)(workflow, processor)
+          });
           return;
         }
+        context.logger.debug("[Workflow custom-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 custom-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 custom-action]: sync workflow intercepted request on end node", {
+          ...syncLogMeta,
+          ...(0, import_plugin_workflow.getWorkflowExecutionLogMeta)(workflow, processor)
+        });
         const err = new CustomActionInterceptionError("Request is intercepted by workflow");
         err.status = 400;
         err.messages = context.state.messages;
         return context.throw(err.status, err);
       }
+      context.logger.error("[Workflow custom-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");
     }
     await next();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-workflow-custom-action-trigger",
-  "version": "2.1.0-beta.11",
+  "version": "2.1.0-beta.13",
   "displayName": "Workflow: Custom action event",
   "displayName.zh-CN": "工作流：自定义操作事件",
   "description": "Triggers after click a custom action button.",
@@ -27,6 +27,6 @@
     ],
     "editionLevel": 0
   },
-  "gitHead": "b02e78b928f476d848b88bc545d3acddca00fe3c",
+  "gitHead": "691716e5f4e5f8bd3859d65bc8a29b4e3c32209b",
   "license": "Apache-2.0"
 }