@tachybase/module-workflow 1.5.1 → 1.6.0

package/dist/server/actions/workflows.helpers.js

@@ -0,0 +1,167 @@
+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)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  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 workflows_helpers_exports = {};
+__export(workflows_helpers_exports, {
+  getCategoriesForWorkflow: () => getCategoriesForWorkflow,
+  getEventSourceNameForWorkflow: () => getEventSourceNameForWorkflow,
+  getLatestExecutedTimeForWorkflow: () => getLatestExecutedTimeForWorkflow,
+  getWorkflowData: () => getWorkflowData,
+  setCategories: () => setCategories,
+  setEventSourceName: () => setEventSourceName,
+  setLatestExecutedTime: () => setLatestExecutedTime
+});
+module.exports = __toCommonJS(workflows_helpers_exports);
+var import_dayjs = __toESM(require("dayjs"));
+function getWorkflowData(workflow) {
+  return workflow && typeof workflow.toJSON === "function" ? workflow.toJSON() : workflow;
+}
+async function getLatestExecutedTimeForWorkflow(context, workflowId, workflowKey) {
+  if (!workflowId && !workflowKey) {
+    return null;
+  }
+  try {
+    const ExecutionRepo = context.db.getRepository("executions");
+    const filter = {};
+    if (workflowId) {
+      filter.workflowId = workflowId;
+    } else if (workflowKey) {
+      filter.key = workflowKey;
+    }
+    const latestExecution = await ExecutionRepo.findOne({
+      filter,
+      fields: ["id", "key", "createdAt", "workflowId"],
+      sort: ["-createdAt"],
+      context
+    });
+    return (latestExecution == null ? void 0 : latestExecution.createdAt) ? (0, import_dayjs.default)(latestExecution.createdAt).utc().toISOString() : null;
+  } catch (error) {
+    context.log.error("Failed to fetch latest executed time:", error);
+    return null;
+  }
+}
+function setLatestExecutedTime(row, executedTime) {
+  row.latestExecutedTime = executedTime;
+  if (row && typeof row.setDataValue === "function") {
+    row.setDataValue("latestExecutedTime", executedTime);
+  }
+}
+async function getEventSourceNameForWorkflow(context, workflowKey) {
+  if (!workflowKey) {
+    return null;
+  }
+  try {
+    const WebhookRepo = context.db.getRepository("webhooks");
+    const eventSource = await WebhookRepo.findOne({
+      filter: { workflowKey },
+      fields: ["id", "name"],
+      context
+    });
+    return (eventSource == null ? void 0 : eventSource.name) || null;
+  } catch (error) {
+    context.log.error("Failed to fetch event source name:", error);
+    return null;
+  }
+}
+function setEventSourceName(row, eventSourceName) {
+  row.eventSourceName = eventSourceName;
+  if (row && typeof row.setDataValue === "function") {
+    row.setDataValue("eventSourceName", eventSourceName);
+  }
+}
+async function getCategoriesForWorkflow(context, workflow, workflowKey) {
+  var _a;
+  if (workflow) {
+    const workflowData = workflow && typeof workflow.toJSON === "function" ? workflow.toJSON() : workflow;
+    if ((workflowData == null ? void 0 : workflowData.category) && Array.isArray(workflowData.category)) {
+      return workflowData.category.map((cat) => {
+        const data = cat && typeof cat.toJSON === "function" ? cat.toJSON() : cat;
+        return {
+          id: data == null ? void 0 : data.id,
+          name: data == null ? void 0 : data.name,
+          color: data == null ? void 0 : data.color
+        };
+      });
+    }
+  }
+  const key = workflowKey || workflow && ((_a = getWorkflowData(workflow)) == null ? void 0 : _a.key);
+  if (!key) {
+    return null;
+  }
+  try {
+    const WorkflowCategoryRepo = context.db.getRepository("workflowCategory");
+    const CategoryRepo = context.db.getRepository("workflowCategories");
+    const workflowCategories = await WorkflowCategoryRepo.find({
+      filter: { workflowKey: key },
+      fields: ["categoryId"],
+      context
+    });
+    if (!workflowCategories || workflowCategories.length === 0) {
+      return [];
+    }
+    const categoryIds = workflowCategories.map((wc) => {
+      const data = wc && typeof wc.toJSON === "function" ? wc.toJSON() : wc;
+      return data == null ? void 0 : data.categoryId;
+    }).filter(Boolean);
+    if (categoryIds.length === 0) {
+      return [];
+    }
+    const categories = await CategoryRepo.find({
+      filter: { id: categoryIds },
+      fields: ["id", "name", "color"],
+      sort: ["sort"],
+      context
+    });
+    return categories.map((cat) => {
+      const data = cat && typeof cat.toJSON === "function" ? cat.toJSON() : cat;
+      return {
+        id: data == null ? void 0 : data.id,
+        name: data == null ? void 0 : data.name,
+        color: data == null ? void 0 : data.color
+      };
+    });
+  } catch (error) {
+    context.log.error("Failed to fetch categories:", error);
+    return null;
+  }
+}
+function setCategories(row, categories) {
+  row.category = categories || [];
+  if (row && typeof row.setDataValue === "function") {
+    row.setDataValue("category", categories || []);
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getCategoriesForWorkflow,
+  getEventSourceNameForWorkflow,
+  getLatestExecutedTimeForWorkflow,
+  getWorkflowData,
+  setCategories,
+  setEventSourceName,
+  setLatestExecutedTime
+});

package/dist/server/actions/workflows.js

@@ -29,6 +29,7 @@ var workflows_exports = {};
 __export(workflows_exports, {
   destroy: () => destroy,
   dump: () => dump,
+  listExtended: () => listExtended,
   load: () => load,
   moveWorkflow: () => moveWorkflow,
   retry: () => retry,
@@ -41,6 +42,28 @@ __export(workflows_exports, {
 module.exports = __toCommonJS(workflows_exports);
 var import_server = require("@tego/server");
 var import_Plugin = __toESM(require("../Plugin"));
+var import_utils = require("../utils");
+var import_workflows = require("./workflows.helpers");
+async function listExtended(context, next) {
+  var _a;
+  await import_server.actions.list(context, next);
+  if (((_a = context.body) == null ? void 0 : _a.rows) && Array.isArray(context.body.rows) && context.body.rows.length > 0) {
+    const workflows = context.body.rows;
+    for (let index = 0; index < workflows.length; index++) {
+      const workflow = workflows[index];
+      const row = context.body.rows[index];
+      if (!row) continue;
+      const workflowData = (0, import_workflows.getWorkflowData)(workflow);
+      const executedTime = await (0, import_workflows.getLatestExecutedTimeForWorkflow)(context, workflowData == null ? void 0 : workflowData.id, workflowData == null ? void 0 : workflowData.key);
+      (0, import_workflows.setLatestExecutedTime)(row, executedTime);
+      const eventSourceName = await (0, import_workflows.getEventSourceNameForWorkflow)(context, workflowData == null ? void 0 : workflowData.key);
+      (0, import_workflows.setEventSourceName)(row, eventSourceName);
+      const categories = await (0, import_workflows.getCategoriesForWorkflow)(context, workflow, workflowData == null ? void 0 : workflowData.key);
+      (0, import_workflows.setCategories)(row, categories);
+    }
+  }
+  return context;
+}
 async function update(context, next) {
   const repository = import_server.utils.getRepositoryFromParams(context);
   const { filterByTk, values } = context.action.params;
@@ -198,19 +221,30 @@ async function test(context, next) {
     appends: ["nodes"],
     context
   });
-  const result = await plugin.trigger(
+  if (!workflow) {
+    return context.throw(404, "Workflow not found");
+  }
+  const execution = await (0, import_utils.triggerWorkflowAndGetExecution)(
+    plugin,
     workflow,
     {
       data: values.data || {},
       user: ((_a = context == null ? void 0 : context.state) == null ? void 0 : _a.currentUser) || {}
     },
-    { httpContext: context }
+    { httpContext: context, transaction: context.transaction },
+    context.db
   );
-  context.app.logger.info(result);
+  if (!execution) {
+    context.state.messages.push({
+      message: context.t("Failed to create execution", { ns: "workflow" })
+    });
+    return context.throw(500, "Failed to create execution");
+  }
   context.state.messages.push({
     message: context.t("Test execution ended", { ns: "workflow" })
   });
-  context.body = result.execution;
+  context.body = execution;
+  await next();
 }
 async function revision(context, next) {
   const plugin = context.app.getPlugin(import_Plugin.default);
@@ -308,10 +342,24 @@ async function retry(context, next) {
     });
   }
   try {
-    const result = await plugin.trigger(workflow, execution.context, { httpContext: context });
-    context.app.logger.info(result);
+    const newExecution = await (0, import_utils.triggerWorkflowAndGetExecution)(
+      plugin,
+      workflow,
+      execution.context,
+      { httpContext: context, transaction: context.transaction },
+      context.db
+    );
+    if (!newExecution) {
+      context.state.messages.push({
+        message: context.t("Failed to create execution", { ns: "workflow" })
+      });
+      context.body = {
+        error: context.t("Failed to create execution", { ns: "workflow" })
+      };
+      return await next();
+    }
     context.state.messages.push({ message: context.t("Execute ended", { ns: "workflow" }) });
-    context.body = result.execution;
+    context.body = newExecution;
   } catch (error) {
     context.app.logger.error(`Failed to retry execution ${execution.id}: ${error.message}`);
     context.state.messages.push({
@@ -428,6 +476,7 @@ async function moveWorkflow(ctx, next) {
 0 && (module.exports = {
   destroy,
   dump,
+  listExtended,
   load,
   moveWorkflow,
   retry,

package/dist/server/utils.d.ts

@@ -1 +1,17 @@
+import { Database, Transactionable } from '@tego/server';
+import PluginWorkflowServer from './Plugin';
+import { WorkflowModel } from './types';
 export declare function toJSON(data: any): any;
+/**
+ * 触发工作流并获取新创建的执行记录
+ * @param plugin 工作流插件实例
+ * @param workflow 工作流模型
+ * @param context 触发上下文
+ * @param options 选项（包含 httpContext, transaction 等）
+ * @param db 数据库实例（用于查询执行记录）
+ * @returns 新创建的执行记录，如果创建失败则返回 null
+ */
+export declare function triggerWorkflowAndGetExecution(plugin: PluginWorkflowServer, workflow: WorkflowModel, context: object, options: {
+    httpContext?: any;
+    transaction?: any;
+} & Transactionable, db: Database): Promise<any | null>;

package/dist/server/utils.js

@@ -17,7 +17,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
-  toJSON: () => toJSON
+  toJSON: () => toJSON,
+  triggerWorkflowAndGetExecution: () => triggerWorkflowAndGetExecution
 });
 module.exports = __toCommonJS(utils_exports);
 var import_server = require("@tego/server");
@@ -36,7 +37,37 @@ function toJSON(data) {
   });
   return result;
 }
+async function triggerWorkflowAndGetExecution(plugin, workflow, context, options = {}, db) {
+  const beforeTriggerTime = /* @__PURE__ */ new Date();
+  const result = await plugin.trigger(workflow, context, options);
+  let execution;
+  if (result && typeof result === "object" && "execution" in result && result.execution) {
+    execution = result.execution;
+  } else if (!result && !plugin.isWorkflowSync(workflow)) {
+    const ExecutionRepo = db.getRepository("executions");
+    const maxRetries = 10;
+    const retryDelay = 200;
+    for (let i = 0; i < maxRetries; i++) {
+      await new Promise((resolve) => setTimeout(resolve, retryDelay));
+      execution = await ExecutionRepo.findOne({
+        filter: {
+          key: workflow.key,
+          createdAt: {
+            [import_server.Op.gte]: beforeTriggerTime
+          }
+        },
+        sort: ["-createdAt"],
+        transaction: options.transaction
+      });
+      if (execution) {
+        break;
+      }
+    }
+  }
+  return execution || null;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  toJSON
+  toJSON,
+  triggerWorkflowAndGetExecution
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tachybase/module-workflow",
   "displayName": "Workflow",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "A powerful BPM tool that provides foundational support for business automation, with the capability to extend unlimited triggers and nodes.",
   "keywords": [
     "Workflow"
@@ -41,12 +41,12 @@
     "react-js-cron": "^3.2.0",
     "react-router-dom": "6.28.1",
     "sequelize": "6.37.5",
-    "@tachybase/module-error-handler": "1.5.1",
-    "@tachybase/client": "1.5.1",
-    "@tachybase/module-collection": "1.5.1",
-    "@tachybase/module-ui-schema": "1.5.1",
-    "@tachybase/module-user": "1.5.1",
-    "@tachybase/plugin-workflow-test": "1.5.1"
+    "@tachybase/client": "1.6.0",
+    "@tachybase/module-error-handler": "1.6.0",
+    "@tachybase/module-collection": "1.6.0",
+    "@tachybase/module-ui-schema": "1.6.0",
+    "@tachybase/module-user": "1.6.0",
+    "@tachybase/plugin-workflow-test": "1.6.0"
   },
   "description.zh-CN": "一个强大的 BPM 工具，为业务自动化提供基础支持，并且可任意扩展更多的触发器和节点。",
   "displayName.zh-CN": "工作流",

package/dist/client/provider/EventSourceProvider.d.ts

@@ -1,7 +0,0 @@
-export declare const EventSourceContext: import("react").Context<{
-    eventSourceList: any[];
-}>;
-export declare const EventSourceProvider: (props: any) => import("react/jsx-runtime").JSX.Element;
-export declare const useEventSourceContext: () => {
-    eventSourceList: any[];
-};