@nocobase/plugin-workflow 2.2.0-beta.15 → 2.2.0-beta.16

package/dist/server/actions/workflows.js

@@ -106,6 +106,7 @@ async function update(context, next) {
   return import_actions.default.update(context, next);
 }
 async function destroy(context, next) {
+  const plugin = context.app.pm.get(import_Plugin.default);
   const repository = import_actions.utils.getRepositoryFromParams(context);
   const { filterByTk, filter } = context.action.params;
   await context.db.sequelize.transaction(async (transaction) => {
@@ -116,6 +117,15 @@ async function destroy(context, next) {
       transaction
     });
     const ids = new Set(items.map((item) => item.id));
+    const affectedKeys = Array.from(new Set(items.map((item) => item.get("key"))));
+    const affectedTaskStats = affectedKeys.length ? await context.db.getRepository("userWorkflowTaskStats").find({
+      filter: {
+        workflowKey: affectedKeys
+      },
+      fields: ["userId"],
+      transaction
+    }) : [];
+    const affectedUserIds = Array.from(new Set(affectedTaskStats.map((item) => item.get("userId"))));
     const keysSet = new Set(items.filter((item) => item.current).map((item) => item.key));
     const revisions = await repository.find({
       filter: {
@@ -138,6 +148,13 @@ async function destroy(context, next) {
       },
       transaction
     });
+    if (affectedKeys.length) {
+      await plugin.repairTaskStats({
+        workflowKeys: affectedKeys,
+        ...affectedUserIds.length ? { userIds: affectedUserIds } : {},
+        transaction
+      });
+    }
     context.body = deleted;
   });
   next();

package/dist/server/collections/userWorkflowTaskStats.d.ts

@@ -0,0 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { CollectionOptions } from '@nocobase/database';
+declare const _default: CollectionOptions;
+export default _default;

package/dist/server/collections/userWorkflowTaskStats.js

@@ -0,0 +1,43 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * 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)
+    __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 userWorkflowTaskStats_exports = {};
+__export(userWorkflowTaskStats_exports, {
+  default: () => userWorkflowTaskStats_default
+});
+module.exports = __toCommonJS(userWorkflowTaskStats_exports);
+var import_userWorkflowTaskStats = __toESM(require("../../common/collections/userWorkflowTaskStats"));
+var userWorkflowTaskStats_default = import_userWorkflowTaskStats.default;

package/dist/server/index.d.ts

@@ -17,4 +17,5 @@ export type { EventOptions } from './Dispatcher';
 export { default as Processor } from './Processor';
 export type { BackgroundAbortHandle, ProcessorOptions, ScopeTransaction } from './Processor';
 export { default } from './Plugin';
+export type { RepairTaskStatsOptions, TaskStatsProvider, TaskStatsRow } from './Plugin';
 export * from './types';

package/dist/server/types/Execution.d.ts

@@ -12,11 +12,13 @@ import WorkflowModel from './Workflow';
 export default class ExecutionModel extends Model {
     static readonly database: Database;
     id: number;
+    workflowId: number;
     title: string;
     context: any;
     status: number;
     reason?: string | null;
     dispatched: boolean;
+    manually?: boolean | null;
     parentExecutionId?: number | null;
     stack?: Array<number | string>;
     startedAt?: Date | null;

package/dist/server/types/Job.d.ts

@@ -8,8 +8,11 @@
  */
 import { BelongsToGetAssociationMixin, Model } from '@nocobase/database';
 import FlowNodeModel from './FlowNode';
+import ExecutionModel from './Execution';
 export default class JobModel extends Model {
     id: number;
+    executionId: number;
+    workflowId?: number;
     status: number;
     result?: any;
     meta?: any;
@@ -20,4 +23,6 @@ export default class JobModel extends Model {
     nodeId: number;
     node?: FlowNodeModel;
     getNode: BelongsToGetAssociationMixin<FlowNodeModel>;
+    execution?: ExecutionModel;
+    getExecution: BelongsToGetAssociationMixin<ExecutionModel>;
 }

package/dist/server/utils.d.ts

@@ -16,6 +16,7 @@ type AbortOptions = Transactionable & {
     reason?: (typeof EXECUTION_REASON)[keyof typeof EXECUTION_REASON];
 };
 export declare function getExecutionLockKey(executionId: number | string): string;
+export declare function getJobLockKey(jobId: number | string): string;
 export declare function isLockAcquireError(error: unknown): boolean;
 export declare function validateCollectionField(collection: string, dataSourceManager: DataSourceManager): Record<string, string> | null;
 export declare function getExecutionStatusName(status: number | null | undefined): string;

package/dist/server/utils.js

@@ -29,6 +29,7 @@ __export(utils_exports, {
   abortExecution: () => abortExecution,
   getExecutionLockKey: () => getExecutionLockKey,
   getExecutionStatusName: () => getExecutionStatusName,
+  getJobLockKey: () => getJobLockKey,
   getWorkflowExecutionLogMeta: () => getWorkflowExecutionLogMeta,
   isLockAcquireError: () => isLockAcquireError,
   toJSON: () => toJSON,
@@ -41,6 +42,9 @@ var import_constants = require("./constants");
 function getExecutionLockKey(executionId) {
   return `workflow:execution:${executionId}`;
 }
+function getJobLockKey(jobId) {
+  return `workflow:job:${jobId}`;
+}
 function isLockAcquireError(error) {
   return error instanceof Error && error.constructor.name === "LockAcquireError";
 }
@@ -197,6 +201,7 @@ function toJSON(data) {
   abortExecution,
   getExecutionLockKey,
   getExecutionStatusName,
+  getJobLockKey,
   getWorkflowExecutionLogMeta,
   isLockAcquireError,
   toJSON,

package/dist/swagger/index.d.ts

@@ -15,7 +15,8 @@
  *   flow_nodes        — Update / delete / move / duplicate / test nodes
  *   executions        — Execution record queries, cancellation and deletion
  *   jobs              — Node job queries and resuming paused executions
- *   userWorkflowTasks — Current-user's pending workflow tasks
+ *   userWorkflowTasks — Current-user's pending workflow tasks grouped by type
+ *   userWorkflowTaskStats — Current-user's pending workflow tasks grouped by workflow
  *
  * API conventions:
  *   Base URL  : /api
@@ -1176,6 +1177,72 @@ declare const _default: {
                 };
             };
         };
+        '/userWorkflowTaskStats:listMine': {
+            get: {
+                tags: string[];
+                summary: string;
+                description: string;
+                parameters: ({
+                    name: string;
+                    in: string;
+                    schema: {
+                        type: string;
+                        default?: undefined;
+                        maximum?: undefined;
+                    };
+                } | {
+                    name: string;
+                    in: string;
+                    schema: {
+                        type: string;
+                        default: number;
+                        maximum?: undefined;
+                    };
+                } | {
+                    name: string;
+                    in: string;
+                    schema: {
+                        type: string;
+                        default: number;
+                        maximum: number;
+                    };
+                })[];
+                responses: {
+                    200: {
+                        description: string;
+                        content: {
+                            'application/json': {
+                                schema: {
+                                    type: string;
+                                    items: {
+                                        type: string;
+                                        properties: {
+                                            workflowKey: {
+                                                type: string;
+                                            };
+                                            title: {
+                                                type: string;
+                                            };
+                                            stats: {
+                                                type: string;
+                                                properties: {
+                                                    pending: {
+                                                        type: string;
+                                                    };
+                                                    all: {
+                                                        type: string;
+                                                    };
+                                                };
+                                            };
+                                        };
+                                    };
+                                };
+                            };
+                        };
+                    };
+                };
+            };
+        };
     };
     components: {
         schemas: {

package/dist/swagger/index.js

@@ -40,7 +40,8 @@ var swagger_default = {
     { name: "flow_nodes", description: "Flow node management: update, delete, move, duplicate, test" },
     { name: "executions", description: "Execution record management: list, get, cancel, delete" },
     { name: "jobs", description: "Node job management: list, get, resume" },
-    { name: "userWorkflowTasks", description: "Current-user workflow task queries" }
+    { name: "userWorkflowTasks", description: "Current-user workflow task queries" },
+    { name: "userWorkflowTaskStats", description: "Current-user workflow task stats grouped by workflow" }
   ],
   paths: {
     // ─────────────────────────────────────────────────────────────────────────
@@ -1220,6 +1221,65 @@ var swagger_default = {
           }
         }
       }
+    },
+    "/userWorkflowTaskStats:listMine": {
+      get: {
+        tags: ["userWorkflowTaskStats"],
+        summary: "List my workflow task stats by workflow",
+        description: [
+          "Get current-user task statistics grouped by `workflowKey`, with the title of the current workflow version.",
+          "",
+          "Pass `type` to limit the result to one task type. Without it, the response sums all task types."
+        ].join("\n"),
+        parameters: [
+          {
+            name: "type",
+            in: "query",
+            schema: { type: "string" }
+          },
+          {
+            name: "search",
+            in: "query",
+            schema: { type: "string" }
+          },
+          {
+            name: "page",
+            in: "query",
+            schema: { type: "integer", default: 1 }
+          },
+          {
+            name: "pageSize",
+            in: "query",
+            schema: { type: "integer", default: 200, maximum: 200 }
+          }
+        ],
+        responses: {
+          200: {
+            description: "OK",
+            content: {
+              "application/json": {
+                schema: {
+                  type: "array",
+                  items: {
+                    type: "object",
+                    properties: {
+                      workflowKey: { type: "string" },
+                      title: { type: "string" },
+                      stats: {
+                        type: "object",
+                        properties: {
+                          pending: { type: "integer" },
+                          all: { type: "integer" }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
     }
   },
   // ───────────────────────────────────────────────────────────────────────────

package/package.json

@@ -6,7 +6,7 @@
   "description": "A powerful BPM tool that provides foundational support for business automation, with the capability to extend unlimited triggers and nodes.",
   "description.zh-CN": "一个强大的 BPM 工具，为业务自动化提供基础支持，并且可任意扩展更多的触发器和节点。",
   "description.ru-RU": "Мощный инструмент BPM, обеспечивающий базовую поддержку автоматизации бизнес-процессов с возможностью неограниченного расширения триггеров и узлов.",
-  "version": "2.2.0-beta.15",
+  "version": "2.2.0-beta.16",
   "license": "Apache-2.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow",
@@ -51,7 +51,7 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "4c471f6b7d26adc412b2cc1d91264572296ca873",
+  "gitHead": "49d9bd2e21122eab9435f128375828b8c5bb4c07",
   "keywords": [
     "Workflow"
   ]

package/dist/server/migrations/20260713000000-remove-workflow-validation.js

@@ -1,56 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var remove_workflow_validation_exports = {};
-__export(remove_workflow_validation_exports, {
-  default: () => remove_workflow_validation_default
-});
-module.exports = __toCommonJS(remove_workflow_validation_exports);
-var import_server = require("@nocobase/server");
-class remove_workflow_validation_default extends import_server.Migration {
-  on = "afterSync";
-  async up() {
-    const { db } = this.context;
-    const workflows = db.getCollection("workflows");
-    const tableInfo = workflows.getTableNameWithSchema();
-    await db.sequelize.transaction(async (transaction) => {
-      const tableExists = await this.queryInterface.tableExists(tableInfo, { transaction });
-      if (!tableExists) {
-        return;
-      }
-      const describeTable = this.queryInterface.describeTable.bind(this.queryInterface);
-      const columns = await describeTable(tableInfo, { transaction });
-      if (!columns.validation) {
-        return;
-      }
-      await this.queryInterface.removeColumn(tableInfo, "validation", { transaction });
-      if (db.sequelize.getDialect() === "sqlite") {
-        const syncOptions = { hooks: false, transaction };
-        await workflows.model.sync(syncOptions);
-      }
-    });
-  }
-}