@nocobase/plugin-workflow 0.14.0-alpha.7 → 0.14.0-alpha.8

package/dist/server/migrations/20230221162902-jsonb-to-json.js

@@ -48,22 +48,6 @@ class jsonb_to_json_default extends import_server.Migration {
         },
         { transaction }
       );
-      await queryInterface.changeColumn(
-        db.getCollection("executions").model.getTableName(),
-        "context",
-        {
-          type: import_database.DataTypes.JSON
-        },
-        { transaction }
-      );
-      await queryInterface.changeColumn(
-        db.getCollection("jobs").model.getTableName(),
-        "result",
-        {
-          type: import_database.DataTypes.JSON
-        },
-        { transaction }
-      );
     });
   }
 }

package/dist/server/migrations/20230809113132-workflow-options.js

@@ -23,18 +23,21 @@ module.exports = __toCommonJS(workflow_options_exports);
 var import_server = require("@nocobase/server");
 class workflow_options_default extends import_server.Migration {
   async up() {
-    const match = await this.app.version.satisfies("<0.11.0-alpha.2");
+    const match = await this.app.version.satisfies("<0.14.0-alpha.8");
     if (!match) {
       return;
     }
     const { db } = this.context;
-    const WorkflowRepo = db.getRepository("flow_nodes");
+    const WorkflowRepo = db.getRepository("workflows");
     await db.sequelize.transaction(async (transaction) => {
       const workflows = await WorkflowRepo.find({
         transaction
       });
       await workflows.reduce(
         (promise, workflow) => promise.then(() => {
+          if (!workflow.useTransaction) {
+            return;
+          }
           workflow.set("options", {
             useTransaction: workflow.get("useTransaction")
           });

package/dist/server/migrations/20231024172342-add-node-key.d.ts

@@ -0,0 +1,4 @@
+import { Migration } from '@nocobase/server';
+export default class extends Migration {
+    up(): Promise<void>;
+}

package/dist/server/migrations/20231024172342-add-node-key.js

@@ -0,0 +1,80 @@
+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 add_node_key_exports = {};
+__export(add_node_key_exports, {
+  default: () => add_node_key_default
+});
+module.exports = __toCommonJS(add_node_key_exports);
+var import_sequelize = require("sequelize");
+var import_server = require("@nocobase/server");
+var import_utils = require("@nocobase/utils");
+function migrateNodeConfig(config = {}, nodesMap) {
+  Object.keys(config).forEach((key) => {
+    const valueType = typeof config[key];
+    if (valueType === "string") {
+      config[key] = config[key].replace(/{{\s*\$jobsMapByNodeId\.(\d+)(\.[^}]+)?\s*}}/g, (matched, id, path) => {
+        return `{{$jobsMapByNodeKey.${nodesMap[id].key}${path || ""}}}`;
+      }).replace(/{{\s*\$scopes\.(\d+)(\.[^}]+)?\s*}}/g, (matched, id, path) => {
+        return `{{$scopes.${nodesMap[id].key}${path || ""}}}`;
+      });
+    } else if (valueType === "object" && config[key]) {
+      migrateNodeConfig(config[key], nodesMap);
+    }
+  });
+  return config;
+}
+class add_node_key_default extends import_server.Migration {
+  async up() {
+    const match = await this.app.version.satisfies("<0.14.0-alpha.8");
+    if (!match) {
+      return;
+    }
+    const { db } = this.context;
+    const NodeCollection = db.getCollection("flow_nodes");
+    const NodeRepo = NodeCollection.repository;
+    const tableName = NodeCollection.getTableNameWithSchema();
+    await db.sequelize.transaction(async (transaction) => {
+      if (!await NodeCollection.getField("key").existsInDb()) {
+        await this.queryInterface.addColumn(tableName, "key", import_sequelize.DataTypes.STRING, {
+          transaction
+        });
+      }
+      const nodes = await NodeRepo.find({
+        transaction
+      });
+      const nodesMap = nodes.reduce((map, node) => {
+        map[node.id] = node;
+        if (!node.get("key")) {
+          node.set("key", (0, import_utils.uid)());
+        }
+        return map;
+      }, {});
+      await nodes.reduce(
+        (promise, node) => promise.then(() => {
+          node.set("config", migrateNodeConfig(node.config, nodesMap));
+          node.changed("config", true);
+          return node.save({
+            silent: true,
+            transaction
+          });
+        }),
+        Promise.resolve()
+      );
+    });
+  }
+}

package/dist/server/triggers/form.d.ts

@@ -3,9 +3,9 @@ import Plugin from '..';
 import { WorkflowModel } from '../types';
 export default class FormTrigger extends Trigger {
     constructor(plugin: Plugin);
-    triggerAction: (context: any, next: any) => Promise<any>;
-    middleware: (context: any, next: any) => Promise<void>;
-    trigger(context: any): Promise<void>;
+    triggerAction(context: any, next: any): Promise<any>;
+    middleware: (context: any, next: any) => Promise<any>;
+    private trigger;
     on(workflow: WorkflowModel): void;
     off(workflow: WorkflowModel): void;
 }

package/dist/server/triggers/form.js

@@ -28,11 +28,8 @@ class FormTrigger extends import__.Trigger {
   constructor(plugin) {
     super(plugin);
     plugin.app.resourcer.use(this.middleware);
-    plugin.app.actions({
-      ["workflows:trigger"]: this.triggerAction
-    });
   }
-  triggerAction = async (context, next) => {
+  async triggerAction(context, next) {
     const { triggerWorkflows } = context.action.params;
     if (!triggerWorkflows) {
       return context.throw(400);
@@ -40,20 +37,27 @@ class FormTrigger extends import__.Trigger {
     context.status = 202;
     await next();
     this.trigger(context);
-  };
+  }
   middleware = async (context, next) => {
+    const {
+      resourceName,
+      actionName,
+      params: { triggerWorkflows }
+    } = context.action;
+    if (resourceName === "workflows" && actionName === "trigger") {
+      return this.triggerAction(context, next);
+    }
     await next();
-    const { resourceName, actionName } = context.action;
-    if (resourceName === "workflows" && actionName === "trigger" || !["create", "update"].includes(actionName)) {
+    if (!triggerWorkflows) {
+      return;
+    }
+    if (!["create", "update"].includes(actionName)) {
       return;
     }
     this.trigger(context);
   };
   async trigger(context) {
-    const { triggerWorkflows, values } = context.action.params;
-    if (!triggerWorkflows) {
-      return;
-    }
+    const { triggerWorkflows = "", values } = context.action.params;
     const { currentUser } = context.state;
     const triggers = triggerWorkflows.split(",").map((trigger) => trigger.split("!"));
     const workflowRepo = this.plugin.db.getRepository("workflows");

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

@@ -1,3 +1,4 @@
+import { Transactionable } from '@nocobase/database';
 import Plugin from '..';
 import type { WorkflowModel } from '../types';
 export declare abstract class Trigger {
@@ -5,6 +6,7 @@ export declare abstract class Trigger {
     constructor(plugin: Plugin);
     abstract on(workflow: WorkflowModel): void;
     abstract off(workflow: WorkflowModel): void;
+    duplicateConfig?(workflow: WorkflowModel, options: Transactionable): object | Promise<object>;
 }
 export default function <T extends Trigger>(plugin: any, more?: {
     [key: string]: {

package/dist/server/triggers/index.js

@@ -31,8 +31,8 @@ __export(triggers_exports, {
   default: () => triggers_default
 });
 module.exports = __toCommonJS(triggers_exports);
-var import_utils = require("@nocobase/utils");
 var import_path = __toESM(require("path"));
+var import_utils = require("@nocobase/utils");
 class Trigger {
   constructor(plugin) {
     this.plugin = plugin;

package/dist/server/triggers/schedule.js

@@ -362,7 +362,7 @@ class ScheduleTrigger extends import__.Trigger {
     });
   }
   init() {
-    if (this.plugin.app.name !== "main") {
+    if (this.plugin.app.getPlugin("multi-app-share-collection").enabled && this.plugin.app.name !== "main") {
       return;
     }
     if (this.timer) {

package/dist/server/utils.js

@@ -20,16 +20,17 @@ __export(utils_exports, {
   toJSON: () => toJSON
 });
 module.exports = __toCommonJS(utils_exports);
+var import_database = require("@nocobase/database");
 function toJSON(data) {
-  if (typeof data !== "object" || !data) {
-    return data;
-  }
   if (Array.isArray(data)) {
     return data.map(toJSON);
   }
+  if (!(data instanceof import_database.Model) || !data) {
+    return data;
+  }
   const result = data.get();
   Object.keys(data.constructor.associations).forEach((key) => {
-    if (result[key] != null) {
+    if (result[key] != null && typeof result[key] === "object") {
       result[key] = toJSON(result[key]);
     }
   });

package/package.json

@@ -4,12 +4,11 @@
   "displayName.zh-CN": "工作流",
   "description": "A powerful workflow plugin designed to support business process management and automation.",
   "description.zh-CN": "工作流插件，为业务流程管理和自动化提供支持。",
-  "version": "0.14.0-alpha.7",
+  "version": "0.14.0-alpha.8",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
     "@ant-design/icons": "5.x",
-    "@emotion/css": "^11.7.1",
     "@formily/antd-v5": "1.x",
     "@formily/core": "2.x",
     "@formily/react": "2.x",
@@ -42,5 +41,5 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "dc958417d27ed0753439bcef192be91a03dfc30f"
+  "gitHead": "59c82fef6e34707802b5841f5ec4d9b3b6b68abb"
 }