@nocobase/plugin-workflow-manual 2.1.0-beta.9 → 2.2.0-beta.1

package/dist/server/Plugin.js

@@ -45,6 +45,51 @@ var jobActions = __toESM(require("./actions"));
 var import_ManualInstruction = __toESM(require("./ManualInstruction"));
 var import_constants = require("../common/constants");
 class Plugin_default extends import_server.Plugin {
+  async updateManualTaskStats(userIds, transaction) {
+    if (!userIds.length) {
+      return;
+    }
+    const workflowPlugin = this.app.pm.get(import_plugin_workflow.default);
+    const WorkflowManualTaskModel = this.db.getModel("workflowManualTasks");
+    const uniqueUserIds = Array.from(new Set(userIds.filter(Boolean)));
+    const userStatsMap = new Map(uniqueUserIds.map((userId) => [userId, { pending: 0, all: 0 }]));
+    const pendingCounts = await WorkflowManualTaskModel.count({
+      where: {
+        status: import_constants.TASK_STATUS.PENDING,
+        userId: uniqueUserIds
+      },
+      include: [
+        {
+          association: "execution",
+          attributes: [],
+          where: {
+            status: import_plugin_workflow.EXECUTION_STATUS.STARTED
+          },
+          required: true
+        }
+      ],
+      col: "id",
+      group: ["userId"],
+      transaction
+    });
+    const allCounts = await WorkflowManualTaskModel.count({
+      where: {
+        userId: uniqueUserIds
+      },
+      col: "id",
+      group: ["userId"],
+      transaction
+    });
+    for (const row of pendingCounts) {
+      userStatsMap.set(row.userId, { ...userStatsMap.get(row.userId), pending: Number(row.count) || 0 });
+    }
+    for (const row of allCounts) {
+      userStatsMap.set(row.userId, { ...userStatsMap.get(row.userId), all: Number(row.count) || 0 });
+    }
+    for (const [userId, stats] of userStatsMap.entries()) {
+      await workflowPlugin.updateTasksStats(userId, import_constants.TASK_TYPE_MANUAL, stats, { transaction });
+    }
+  }
   onTaskSave = async (task, { transaction }) => {
     const workflowPlugin = this.app.pm.get(import_plugin_workflow.default);
     const ModelClass = task.constructor;
@@ -104,54 +149,22 @@ class Plugin_default extends import_server.Plugin {
       },
       transaction
     });
-    const userStatsMap = /* @__PURE__ */ new Map();
-    const userId = [];
-    for (const item of manualTasks) {
-      userId.push(item.userId);
-      userStatsMap.set(item.userId, { pending: 0, all: 0 });
-    }
-    const pendingCounts = await WorkflowManualTaskModel.count({
-      where: {
-        status: import_constants.TASK_STATUS.PENDING,
-        userId
-      },
-      include: [
+    const userIds = manualTasks.map((item) => item.userId).filter(Boolean);
+    if (execution.status === import_plugin_workflow.EXECUTION_STATUS.ABORTED) {
+      await WorkflowManualTaskModel.update(
+        {
+          status: import_constants.TASK_STATUS.ABORTED
+        },
         {
-          association: "execution",
-          attributes: [],
           where: {
-            status: import_plugin_workflow.EXECUTION_STATUS.STARTED
+            id: manualTasks.map((item) => item.id),
+            status: import_constants.TASK_STATUS.PENDING
           },
-          required: true
+          transaction
         }
-      ],
-      col: "id",
-      group: ["userId"],
-      transaction
-    });
-    const allCounts = await WorkflowManualTaskModel.count({
-      where: {
-        userId
-      },
-      col: "id",
-      group: ["userId"],
-      transaction
-    });
-    for (const row of pendingCounts) {
-      if (!userStatsMap.get(row.userId)) {
-        userStatsMap.set(row.userId, { pending: 0, all: 0 });
-      }
-      userStatsMap.set(row.userId, { ...userStatsMap.get(row.userId), pending: row.count });
-    }
-    for (const row of allCounts) {
-      if (!userStatsMap.get(row.userId)) {
-        userStatsMap.set(row.userId, { pending: 0, all: 0 });
-      }
-      userStatsMap.set(row.userId, { ...userStatsMap.get(row.userId), all: row.count });
-    }
-    for (const [userId2, stats] of userStatsMap.entries()) {
-      await workflowPlugin.updateTasksStats(userId2, import_constants.TASK_TYPE_MANUAL, stats, { transaction });
+      );
     }
+    await this.updateManualTaskStats(userIds, transaction);
   };
   onWorkflowStatusChange = async (workflow, { transaction }) => {
     const workflowPlugin = this.app.pm.get(import_plugin_workflow.default);
@@ -242,13 +255,13 @@ class Plugin_default extends import_server.Plugin {
       if (!userStatsMap.get(row.userId)) {
         userStatsMap.set(row.userId, { pending: 0, all: 0 });
       }
-      userStatsMap.set(row.userId, { ...userStatsMap.get(row.userId), pending: row.count });
+      userStatsMap.set(row.userId, { ...userStatsMap.get(row.userId), pending: Number(row.count) || 0 });
     }
     for (const row of allCounts) {
       if (!userStatsMap.get(row.userId)) {
         userStatsMap.set(row.userId, { pending: 0, all: 0 });
       }
-      userStatsMap.set(row.userId, { ...userStatsMap.get(row.userId), all: row.count });
+      userStatsMap.set(row.userId, { ...userStatsMap.get(row.userId), all: Number(row.count) || 0 });
     }
     for (const [userId, stats] of userStatsMap.entries()) {
       await workflowPlugin.updateTasksStats(userId, import_constants.TASK_TYPE_MANUAL, stats, { transaction });

package/dist/server/actions.js

@@ -50,7 +50,7 @@ async function submit(context, next) {
   if (!currentUser) {
     return context.throw(401);
   }
-  const plugin = context.app.getPlugin(import_plugin_workflow.default);
+  const plugin = context.app.pm.get(import_plugin_workflow.default);
   const instruction = plugin.instructions.get("manual");
   const task = await repository.findOne({
     filterByTk,
@@ -66,6 +66,12 @@ async function submit(context, next) {
   const { forms = {} } = task.node.config;
   const [formKey] = Object.keys(values.result ?? {}).filter((key) => key !== "_");
   const actionKey = (_a = values.result) == null ? void 0 : _a._;
+  if (!task.execution) {
+    return context.throw(400);
+  }
+  if (task.execution.status === import_plugin_workflow.EXECUTION_STATUS.STARTED && plugin.timeoutManager.isExpired(task.execution) && await plugin.timeoutManager.abort(task.execution)) {
+    return context.throw(400, context.t("Execution timed out", { ns: "workflow" }));
+  }
   const actionItem = (_c = (_b = forms[formKey]) == null ? void 0 : _b.actions) == null ? void 0 : _c.find((item) => item.key === actionKey);
   if (task.status !== import_plugin_workflow.JOB_STATUS.PENDING || task.job.status !== import_plugin_workflow.JOB_STATUS.PENDING || task.execution.status !== import_plugin_workflow.EXECUTION_STATUS.STARTED || // !task.workflow.enabled ||
   !actionKey || (actionItem == null ? void 0 : actionItem.status) == null) {
@@ -95,8 +101,9 @@ async function submit(context, next) {
   });
   task.set({
     status: actionItem.status,
-    result: actionItem.status ? { [formKey]: Object.assign(values.result[formKey], presetValues), _: actionKey } : Object.assign(task.result ?? {}, values.result)
+    result: actionItem.status ? { [formKey]: { ...values.result[formKey], ...presetValues }, _: actionKey } : { ...task.result ?? {}, ...values.result }
   });
+  task.changed("result", true);
   const handler = instruction.formTypes.get(forms[formKey].type);
   if (handler && task.status) {
     await handler.call(instruction, task, forms[formKey], processor);
@@ -106,6 +113,9 @@ async function submit(context, next) {
   context.body = task;
   context.status = 202;
   await next();
+  if (task.execution.status !== import_plugin_workflow.EXECUTION_STATUS.STARTED) {
+    return;
+  }
   task.job.execution = task.execution;
   task.job.latestTask = task;
   processor.logger.info(`manual node (${task.nodeId}) action trigger execution (${task.execution.id}) to resume`);

package/dist/server/collections/workflowManualTasks.js

@@ -33,6 +33,9 @@ var import_database = require("@nocobase/database");
 var import_constants = require("../../common/constants");
 var workflowManualTasks_default = (0, import_database.defineCollection)({
   name: "workflowManualTasks",
+  dataCategory: "business",
+  filterTargetKey: "id",
+  simplePaginate: true,
   dumpRules: {
     group: "log"
   },

package/package.json

@@ -6,7 +6,7 @@
   "description": "Could be used for workflows which some of decisions are made by users.",
   "description.ru-RU": "Может использоваться в рабочих процессах, где какие-то решения принимаются пользователями.",
   "description.zh-CN": "用于人工控制部分决策的流程。",
-  "version": "2.1.0-beta.9",
+  "version": "2.2.0-beta.1",
   "license": "Apache-2.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-manual",
@@ -18,7 +18,8 @@
     "@formily/core": "2.x",
     "@formily/react": "2.x",
     "antd": "5.x",
-    "lodash": "4.17.21",
+    "joi": "^17.13.3",
+    "lodash": "4.x",
     "react": "18.x",
     "react-i18next": "^11.15.1",
     "react-router-dom": "^6.11.2"
@@ -27,13 +28,14 @@
     "@nocobase/client": "2.x",
     "@nocobase/database": "2.x",
     "@nocobase/plugin-data-source-main": "2.x",
+    "@nocobase/plugin-mobile": "2.x",
     "@nocobase/plugin-users": "2.x",
     "@nocobase/plugin-workflow": ">=0.17.0-alpha.3",
     "@nocobase/server": "2.x",
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "c3a2875e4cbbb43b1f2361e6f9f5f84a7d3f3c3c",
+  "gitHead": "f82fa9d0c3aa8e00e53dd94e404a312483b4866b",
   "keywords": [
     "Workflow"
   ]