@nocobase/plugin-workflow-manual 1.7.0-beta.2 → 1.7.0-beta.4

package/dist/externalVersion.js

@@ -8,7 +8,7 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.7.0-beta.2",
+  "@nocobase/client": "1.7.0-beta.4",
   "react": "18.2.0",
   "@formily/react": "2.3.0",
   "@formily/antd-v5": "1.1.9",
@@ -18,13 +18,14 @@ module.exports = {
   "dayjs": "1.11.10",
   "react-i18next": "11.18.6",
   "lodash": "4.17.21",
-  "@nocobase/plugin-workflow": "1.7.0-beta.2",
-  "@nocobase/utils": "1.7.0-beta.2",
-  "@nocobase/server": "1.7.0-beta.2",
-  "@nocobase/actions": "1.7.0-beta.2",
-  "@nocobase/resourcer": "1.7.0-beta.2",
-  "@nocobase/test": "1.7.0-beta.2",
-  "@nocobase/plugin-workflow-test": "1.7.0-beta.2",
+  "@nocobase/plugin-workflow": "1.7.0-beta.4",
+  "@nocobase/utils": "1.7.0-beta.4",
+  "@nocobase/server": "1.7.0-beta.4",
+  "@nocobase/actions": "1.7.0-beta.4",
+  "@nocobase/resourcer": "1.7.0-beta.4",
+  "@nocobase/test": "1.7.0-beta.4",
+  "@nocobase/plugin-workflow-test": "1.7.0-beta.4",
   "@formily/core": "2.3.0",
-  "@nocobase/database": "1.7.0-beta.2"
+  "@nocobase/database": "1.7.0-beta.4",
+  "sequelize": "6.35.2"
 };

package/dist/server/migrations/20250312100512-change-table-name.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,13 +25,23 @@ 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 change_table_name_exports = {};
 __export(change_table_name_exports, {
   default: () => change_table_name_default
 });
 module.exports = __toCommonJS(change_table_name_exports);
+var import_sequelize = require("sequelize");
 var import_server = require("@nocobase/server");
+var import_workflowManualTasks = __toESM(require("../collections/workflowManualTasks"));
 class change_table_name_default extends import_server.Migration {
   appVersion = "<1.7.0";
   on = "beforeLoad";
@@ -37,20 +49,26 @@ class change_table_name_default extends import_server.Migration {
     const { db } = this.context;
     const queryInterface = db.sequelize.getQueryInterface();
     const usersJobsCollection = db.collection({
-      name: "users_jobs",
-      fields: [{ name: "id", type: "bigInt" }]
+      ...import_workflowManualTasks.default,
+      name: "users_jobs"
     });
     const workflowManualTasksCollection = db.collection({
-      name: "workflowManualTasks",
-      fields: [{ name: "id", type: "bigInt" }]
+      ...import_workflowManualTasks.default
     });
     const oldTableName = usersJobsCollection.getTableNameWithSchema();
     const oldTableNameWithQuotes = usersJobsCollection.getRealTableName(true);
     const newTableName = workflowManualTasksCollection.getTableNameWithSchema();
     const newTableNameWithQuotes = workflowManualTasksCollection.getRealTableName(true);
-    await db.sequelize.transaction(async (transaction) => {
-      const exists = await queryInterface.tableExists(oldTableName, { transaction });
-      if (exists) {
+    const exists = await queryInterface.tableExists(oldTableName);
+    if (!exists) {
+      return;
+    }
+    const constraints = await queryInterface.showConstraint(oldTableName);
+    await db.sequelize.transaction(
+      {
+        isolationLevel: import_sequelize.Transaction.ISOLATION_LEVELS.SERIALIZABLE
+      },
+      async (transaction) => {
         const newExists = await queryInterface.tableExists(newTableName, { transaction });
         if (newExists) {
           await queryInterface.dropTable(newTableName, { transaction });
@@ -65,6 +83,18 @@ class change_table_name_default extends import_server.Migration {
         } else {
           await queryInterface.renameTable(oldTableName, newTableName, { transaction });
         }
+        if (this.db.isPostgresCompatibleDialect()) {
+          const primaryKeys = constraints.filter((item) => item.constraintType === "PRIMARY KEY");
+          if (primaryKeys.length) {
+            for (const primaryKey of primaryKeys) {
+              await queryInterface.removeConstraint(newTableName, primaryKey.constraintName, { transaction });
+            }
+          }
+        } else if (this.db.isMySQLCompatibleDialect()) {
+          await db.sequelize.query(`ALTER TABLE ${newTableNameWithQuotes} DROP PRIMARY KEY, ADD PRIMARY KEY (id)`, {
+            transaction
+          });
+        }
         const indexes = await queryInterface.showIndex(newTableName, { transaction });
         const oldIndexPrefix = `${db.options.tablePrefix || ""}users_jobs`;
         const newIndexPrefix = `${db.options.tablePrefix || ""}workflow_manual_tasks`;
@@ -87,7 +117,7 @@ class change_table_name_default extends import_server.Migration {
           }
         }
       }
-    });
+    );
     db.removeCollection("users_jobs");
     db.removeCollection("workflowManualTasks");
   }

package/dist/server/migrations/20250313133421-remove-m2m-fields.d.ts

@@ -0,0 +1,14 @@
+/**
+ * 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 {
+    appVersion: string;
+    on: string;
+    up(): Promise<void>;
+}

package/dist/server/migrations/20250313133421-remove-m2m-fields.js

@@ -0,0 +1,57 @@
+/**
+ * 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_m2m_fields_exports = {};
+__export(remove_m2m_fields_exports, {
+  default: () => remove_m2m_fields_default
+});
+module.exports = __toCommonJS(remove_m2m_fields_exports);
+var import_server = require("@nocobase/server");
+class remove_m2m_fields_default extends import_server.Migration {
+  appVersion = "<1.7.0";
+  on = "afterLoad";
+  async up() {
+    const { db } = this.context;
+    await db.sequelize.transaction(async (transaction) => {
+      const FieldRepo = db.getCollection("fields").repository;
+      await FieldRepo.destroy({
+        filter: {
+          collectionName: "users",
+          name: "jobs"
+        },
+        transaction
+      });
+      await FieldRepo.destroy({
+        filter: {
+          collectionName: "jobs",
+          name: "users"
+        },
+        transaction
+      });
+      db.removeCollection("fields");
+    });
+  }
+}

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：人工处理节点",
   "description": "Could be used for workflows which some of decisions are made by users.",
   "description.zh-CN": "用于人工控制部分决策的流程。",
-  "version": "1.7.0-beta.2",
+  "version": "1.7.0-beta.4",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-manual",
@@ -30,7 +30,7 @@
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "58b206bdfca521e79a69989ca55dd19075dca523",
+  "gitHead": "bf1fbeef48ab69fb3d417f4d75bf3f22031e29f8",
   "keywords": [
     "Workflow"
   ]