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

package/dist/server/actions.js

@@ -41,7 +41,62 @@ __export(actions_exports, {
 });
 module.exports = __toCommonJS(actions_exports);
 var import_actions = __toESM(require("@nocobase/actions"));
+var import_database = require("@nocobase/database");
 var import_plugin_workflow = __toESM(require("@nocobase/plugin-workflow"));
+function getSubmittedRatio(tasks) {
+  if (!tasks.length) {
+    return 0;
+  }
+  const submitted = tasks.reduce((count, item) => item.status !== import_plugin_workflow.JOB_STATUS.PENDING ? count + 1 : count, 0);
+  return submitted / tasks.length;
+}
+function getSingleModeStatus(distribution) {
+  var _a;
+  return ((_a = distribution.find((item) => item.status !== import_plugin_workflow.JOB_STATUS.PENDING && item.count > 0)) == null ? void 0 : _a.status) ?? null;
+}
+function getAllModeStatus(distribution, assignees) {
+  const resolved = distribution.find((item) => item.status === import_plugin_workflow.JOB_STATUS.RESOLVED);
+  if ((resolved == null ? void 0 : resolved.count) === assignees.length) {
+    return import_plugin_workflow.JOB_STATUS.RESOLVED;
+  }
+  const rejected = distribution.find((item) => item.status < import_plugin_workflow.JOB_STATUS.PENDING);
+  return (rejected == null ? void 0 : rejected.count) ? rejected.status : null;
+}
+function getAnyModeStatus(distribution, assignees) {
+  const resolved = distribution.find((item) => item.status === import_plugin_workflow.JOB_STATUS.RESOLVED);
+  if (resolved == null ? void 0 : resolved.count) {
+    return import_plugin_workflow.JOB_STATUS.RESOLVED;
+  }
+  const rejectedCount = distribution.reduce(
+    (count, item) => item.status < import_plugin_workflow.JOB_STATUS.PENDING ? count + item.count : count,
+    0
+  );
+  return rejectedCount === assignees.length ? import_plugin_workflow.JOB_STATUS.REJECTED : null;
+}
+async function updateJobByManualTasks(job, node, database, latestTask, transaction) {
+  const mode = node.config.mode ?? 0;
+  const tasks = await database.getModel("workflowManualTasks").findAll({
+    where: {
+      jobId: job.id
+    },
+    transaction
+  });
+  const assignees = [];
+  const distributionMap = /* @__PURE__ */ new Map();
+  for (const task of tasks) {
+    distributionMap.set(task.status, (distributionMap.get(task.status) ?? 0) + 1);
+    assignees.push(task.userId);
+  }
+  const distribution = Array.from(distributionMap.entries()).map(([status2, count]) => ({ status: status2, count }));
+  const status = mode === 1 ? getAllModeStatus(distribution, assignees) : mode === -1 ? getAnyModeStatus(distribution, assignees) : getSingleModeStatus(distribution);
+  await job.update(
+    {
+      status: status ?? import_plugin_workflow.JOB_STATUS.PENDING,
+      result: mode ? getSubmittedRatio(tasks) : latestTask.result ?? job.result
+    },
+    { transaction }
+  );
+}
 async function submit(context, next) {
   var _a, _b, _c;
   const repository = import_actions.utils.getRepositoryFromParams(context);
@@ -78,48 +133,99 @@ async function submit(context, next) {
     return context.throw(400);
   }
   task.execution.workflow = task.workflow;
-  const processor = plugin.createProcessor(task.execution);
-  await processor.prepare();
-  const assignees = processor.getParsedValue(task.node.config.assignees ?? [], task.nodeId).flat().filter(Boolean);
-  if (!assignees.includes(currentUser.id) || task.userId !== currentUser.id) {
-    return context.throw(403);
-  }
-  const presetValues = processor.getParsedValue(actionItem.values ?? {}, task.nodeId, {
-    additionalScope: {
-      // @deprecated
-      currentUser,
-      // @deprecated
-      currentRecord: values.result[formKey],
-      // @deprecated
-      currentTime: /* @__PURE__ */ new Date(),
-      $user: currentUser,
-      $nForm: values.result[formKey],
-      $nDate: {
-        now: /* @__PURE__ */ new Date()
+  const formConfig = forms[formKey];
+  const handler = instruction.formTypes.get(formConfig.type);
+  const usesMainDataSource = (formConfig.dataSource ?? "main") === "main";
+  const transactionOptions = context.db.sequelize.getDialect() === "sqlite" ? { type: import_database.Transaction.TYPES.IMMEDIATE } : {};
+  const validateTask = () => {
+    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) {
+      return context.throw(400);
+    }
+  };
+  const getPresetValues = (processor) => {
+    const assignees = processor.getParsedValue(task.node.config.assignees ?? [], task.nodeId).flat().filter(Boolean);
+    if (!assignees.includes(currentUser.id) || task.userId !== currentUser.id) {
+      return context.throw(403);
+    }
+    return processor.getParsedValue(actionItem.values ?? {}, task.nodeId, {
+      additionalScope: {
+        // @deprecated
+        currentUser,
+        // @deprecated
+        currentRecord: values.result[formKey],
+        // @deprecated
+        currentTime: /* @__PURE__ */ new Date(),
+        $user: currentUser,
+        $nForm: values.result[formKey],
+        $nDate: {
+          now: /* @__PURE__ */ new Date()
+        }
       }
+    });
+  };
+  const setTaskResult = (presetValues) => {
+    task.set({
+      status: actionItem.status,
+      result: actionItem.status ? { [formKey]: { ...values.result[formKey], ...presetValues }, _: actionKey } : { ...task.result ?? {}, ...values.result }
+    });
+    task.changed("result", true);
+  };
+  const handleFormSubmission = async (transaction) => {
+    const processor = plugin.createProcessor(task.execution, { transaction });
+    await processor.prepare();
+    const presetValues = getPresetValues(processor);
+    setTaskResult(presetValues);
+    if (handler && task.status) {
+      const { actions: actions2, ...formOptions } = formConfig;
+      const parsedFormConfig = {
+        ...processor.getParsedValue(formOptions, task.nodeId),
+        actions: actions2
+      };
+      await handler.call(instruction, task, parsedFormConfig, transaction);
     }
-  });
-  task.set({
-    status: actionItem.status,
-    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);
+    return presetValues;
+  };
+  let shouldResume = false;
+  try {
+    const lock = await context.app.lockManager.tryAcquire((0, import_plugin_workflow.getJobLockKey)(task.job.id));
+    await lock.runExclusive(async () => {
+      let presetValues = {};
+      if (!usesMainDataSource) {
+        await Promise.all([task.reload(), task.job.reload(), task.execution.reload()]);
+        validateTask();
+        presetValues = await handleFormSubmission();
+      }
+      await context.db.sequelize.transaction(transactionOptions, async (transaction) => {
+        await Promise.all([
+          task.reload({ transaction }),
+          task.job.reload({ transaction }),
+          task.execution.reload({ transaction })
+        ]);
+        validateTask();
+        if (usesMainDataSource) {
+          await handleFormSubmission(transaction);
+        } else {
+          setTaskResult(presetValues);
+        }
+        await task.save({ transaction });
+        await updateJobByManualTasks(task.job, task.node, context.db, task, transaction);
+        shouldResume = task.job.status !== import_plugin_workflow.JOB_STATUS.PENDING;
+      });
+    }, 6e4);
+  } catch (error) {
+    if ((0, import_plugin_workflow.isLockAcquireError)(error)) {
+      return context.throw(409);
+    }
+    throw error;
   }
-  await task.save();
-  await processor.exit();
   context.body = task;
   context.status = 202;
   await next();
-  if (task.execution.status !== import_plugin_workflow.EXECUTION_STATUS.STARTED) {
+  if (!shouldResume) {
     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`);
-  plugin.resume(task.job);
+  plugin.getLogger(task.execution.workflowId).info(`manual node (${task.nodeId}) action trigger execution (${task.execution.id}) to resume`);
+  plugin.resume(task.job).catch(() => void 0);
 }
 async function listMine(context, next) {
   context.action.mergeParams({

package/dist/server/forms/create.d.ts

@@ -6,9 +6,9 @@
  * 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 { Processor } from '@nocobase/plugin-workflow';
+import type { Transaction } from '@nocobase/database';
 import ManualInstruction from '../ManualInstruction';
 export default function (this: ManualInstruction, instance: any, { dataSource, collection }: {
     dataSource?: string;
     collection: any;
-}, processor: Processor): Promise<void>;
+}, transaction?: Transaction): Promise<void>;

package/dist/server/forms/create.js

@@ -29,7 +29,7 @@ __export(create_exports, {
   default: () => create_default
 });
 module.exports = __toCommonJS(create_exports);
-async function create_default(instance, { dataSource = "main", collection }, processor) {
+async function create_default(instance, { dataSource = "main", collection }, transaction) {
   const repo = this.workflow.app.dataSourceManager.dataSources.get(dataSource).collectionManager.getRepository(collection);
   if (!repo) {
     throw new Error(`collection ${collection} for create data on manual node not found`);
@@ -43,8 +43,8 @@ async function create_default(instance, { dataSource = "main", collection }, pro
       updatedBy: instance.userId
     },
     context: {
-      executionId: processor.execution.id
+      executionId: instance.executionId
     },
-    transaction: processor.transaction
+    transaction
   });
 }

package/dist/server/forms/index.d.ts

@@ -6,9 +6,9 @@
  * 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 { Processor } from '@nocobase/plugin-workflow';
+import type { Transaction } from '@nocobase/database';
 import ManualInstruction from '../ManualInstruction';
-export type FormHandler = (this: ManualInstruction, instance: any, formConfig: any, processor: Processor) => Promise<void>;
+export type FormHandler = (this: ManualInstruction, instance: any, formConfig: any, transaction?: Transaction) => Promise<void>;
 export default function ({ formTypes }: {
     formTypes: any;
 }): void;

package/dist/server/forms/update.d.ts

@@ -6,10 +6,10 @@
  * 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 { Processor } from '@nocobase/plugin-workflow';
+import type { Transaction } from '@nocobase/database';
 import ManualInstruction from '../ManualInstruction';
 export default function (this: ManualInstruction, instance: any, { dataSource, collection, filter }: {
     dataSource?: string;
     collection: any;
     filter?: {};
-}, processor: Processor): Promise<void>;
+}, transaction?: Transaction): Promise<void>;

package/dist/server/forms/update.js

@@ -29,7 +29,7 @@ __export(update_exports, {
   default: () => update_default
 });
 module.exports = __toCommonJS(update_exports);
-async function update_default(instance, { dataSource = "main", collection, filter = {} }, processor) {
+async function update_default(instance, { dataSource = "main", collection, filter = {} }, transaction) {
   const repo = this.workflow.app.dataSourceManager.dataSources.get(dataSource).collectionManager.getRepository(collection);
   if (!repo) {
     throw new Error(`collection ${collection} for update data on manual node not found`);
@@ -37,14 +37,14 @@ async function update_default(instance, { dataSource = "main", collection, filte
   const { _, ...form } = instance.result;
   const [values] = Object.values(form);
   await repo.update({
-    filter: processor.getParsedValue(filter, instance.nodeId),
+    filter,
     values: {
       ...values ?? {},
       updatedBy: instance.userId
     },
     context: {
-      executionId: processor.execution.id
+      executionId: instance.executionId
     },
-    transaction: processor.transaction
+    transaction
   });
 }

package/dist/server/migrations/20260723120000-rebuild-workflow-task-stats.d.ts

@@ -0,0 +1,13 @@
+/**
+ * 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 { Migration } from '@nocobase/server';
+export default class extends Migration {
+    on: string;
+    up(): Promise<void>;
+}

package/dist/server/migrations/20260723120000-rebuild-workflow-task-stats.js

@@ -0,0 +1,51 @@
+/**
+ * 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 rebuild_workflow_task_stats_exports = {};
+__export(rebuild_workflow_task_stats_exports, {
+  default: () => rebuild_workflow_task_stats_default
+});
+module.exports = __toCommonJS(rebuild_workflow_task_stats_exports);
+var import_plugin_workflow = __toESM(require("@nocobase/plugin-workflow"));
+var import_server = require("@nocobase/server");
+var import_constants = require("../../common/constants");
+class rebuild_workflow_task_stats_default extends import_server.Migration {
+  on = "afterLoad";
+  async up() {
+    const workflowPlugin = this.pm.get(import_plugin_workflow.default);
+    await workflowPlugin.repairTaskStats({ types: [import_constants.TASK_TYPE_MANUAL], silent: true });
+  }
+}

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.2.0-beta.9",
+  "version": "3.0.0-alpha.1",
   "license": "Apache-2.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-manual",
@@ -26,7 +26,9 @@
   },
   "peerDependencies": {
     "@nocobase/client": "2.x",
+    "@nocobase/client-v2": "2.x",
     "@nocobase/database": "2.x",
+    "@nocobase/flow-engine": "2.x",
     "@nocobase/plugin-data-source-main": "2.x",
     "@nocobase/plugin-mobile": "2.x",
     "@nocobase/plugin-users": "2.x",
@@ -35,7 +37,7 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "60e3d7abbaa0c7cead76f71a4f3d5eedb6b8acdb",
+  "gitHead": "22d8be8ece179cfa5c8a4ebb2c896c92bd418e03",
   "keywords": [
     "Workflow"
   ]