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

package/dist/externalVersion.js

@@ -9,17 +9,18 @@
 
 module.exports = {
   "@formily/react": "2.3.0",
-  "@nocobase/client": "1.6.0-beta.9",
-  "@nocobase/plugin-workflow": "1.6.0-beta.9",
+  "@nocobase/client": "1.7.0-beta.1",
+  "@nocobase/plugin-workflow": "1.7.0-beta.1",
   "react": "18.2.0",
   "react-i18next": "11.18.6",
   "lodash": "4.17.21",
   "sequelize": "6.35.2",
-  "@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"
+  "@nocobase/database": "1.7.0-beta.1",
+  "@nocobase/server": "1.7.0-beta.1",
+  "@nocobase/actions": "1.7.0-beta.1",
+  "@nocobase/plugin-error-handler": "1.7.0-beta.1",
+  "@nocobase/data-source-manager": "1.7.0-beta.1",
+  "@nocobase/plugin-workflow-test": "1.7.0-beta.1",
+  "@nocobase/test": "1.7.0-beta.1",
+  "@nocobase/utils": "1.7.0-beta.1"
 };

package/dist/locale/it-IT.json

@@ -0,0 +1,9 @@
+{
+  "Form event": "Evento modulo",
+  "Event triggers when submitted a workflow bound form action.": "L'evento si attiva quando viene inviata un'azione di un modulo associato a un workflow.",
+  "Form data model": "Modello dati modulo",
+  "Use a collection to match form data.": "Utilizza una raccolta per abbinare i dati del modulo.",
+  "Associations to use": "Associazioni da utilizzare",
+  "User submitted form": "Modulo inviato dall'utente",
+  "Role of user submitted form": "Ruolo del modulo inviato dall'utente"
+}

package/dist/server/ActionTrigger.js

@@ -7,9 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -23,6 +25,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var ActionTrigger_exports = {};
 __export(ActionTrigger_exports, {
@@ -31,8 +41,17 @@ __export(ActionTrigger_exports, {
 module.exports = __toCommonJS(ActionTrigger_exports);
 var import_lodash = require("lodash");
 var import_database = require("@nocobase/database");
+var import_plugin_error_handler = __toESM(require("@nocobase/plugin-error-handler"));
 var import_plugin_workflow = require("@nocobase/plugin-workflow");
 var import_data_source_manager = require("@nocobase/data-source-manager");
+class RequestOnActionTriggerError extends Error {
+  status = 400;
+  messages = [];
+  constructor(message) {
+    super(message);
+    this.name = "RequestOnActionTriggerError";
+  }
+}
 class ActionTrigger_default extends import_plugin_workflow.Trigger {
   static TYPE = "action";
   constructor(workflow) {
@@ -47,6 +66,15 @@ class ActionTrigger_default extends import_plugin_workflow.Trigger {
       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) => {
+        ctx.body = {
+          errors: err.messages
+        };
+        ctx.status = err.status;
+      }
+    );
   }
   getTargetCollection(collection, association) {
     if (!association) {
@@ -165,7 +193,28 @@ class ActionTrigger_default extends import_plugin_workflow.Trigger {
       (workflow.sync ? syncGroup : asyncGroup).push(event);
     }
     for (const event of syncGroup) {
-      await this.workflow.trigger(event[0], event[1]);
+      const processor = await this.workflow.trigger(event[0], event[1], { httpContext: context });
+      if (!processor) {
+        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") {
+          return;
+        }
+        continue;
+      }
+      if (processor.execution.status < import_plugin_workflow.EXECUTION_STATUS.STARTED) {
+        if ((lastNode == null ? void 0 : lastNode.type) !== "end") {
+          return context.throw(500, "Workflow on your action failed, please contact the administrator");
+        }
+        const err = new RequestOnActionTriggerError("Request failed");
+        err.status = 400;
+        err.messages = context.state.messages;
+        return context.throw(err.status, err);
+      }
+      return context.throw(500, "Workflow on your action hangs, please contact the administrator");
     }
     for (const event of asyncGroup) {
       this.workflow.trigger(event[0], event[1]);

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.9",
+  "version": "1.7.0-beta.1",
   "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": "eb1ff948fcf7a51175626a1a56a8b8d9b90be006",
+  "gitHead": "374a1bc60b3d55fd8b532a57c8fe0423eed1d11e",
   "keywords": [
     "Workflow"
   ]