@nocobase/plugin-workflow 0.14.0-alpha.7 → 0.15.0-alpha.1

package/dist/server/actions/workflows.d.ts

@@ -3,3 +3,4 @@ export declare function update(context: Context, next: any): Promise<void>;
 export declare function destroy(context: Context, next: any): Promise<void>;
 export declare function revision(context: Context, next: any): Promise<void>;
 export declare function sync(context: Context, next: any): Promise<void>;
+export declare function trigger(context: Context, next: any): Promise<any>;

package/dist/server/actions/workflows.js

@@ -30,6 +30,7 @@ __export(workflows_exports, {
   destroy: () => destroy,
   revision: () => revision,
   sync: () => sync,
+  trigger: () => trigger,
   update: () => update
 });
 module.exports = __toCommonJS(workflows_exports);
@@ -78,48 +79,8 @@ async function destroy(context, next) {
   });
   next();
 }
-function typeOf(value) {
-  if (Array.isArray(value)) {
-    return "array";
-  } else if (value instanceof Date) {
-    return "date";
-  } else if (value === null) {
-    return "null";
-  }
-  return typeof value;
-}
-function migrateConfig(config, oldToNew) {
-  function migrate(value) {
-    var _a, _b;
-    switch (typeOf(value)) {
-      case "object":
-        if (value.type === "$jobsMapByNodeId") {
-          return {
-            ...value,
-            options: {
-              ...value.options,
-              nodeId: (_b = oldToNew.get((_a = value.options) == null ? void 0 : _a.nodeId)) == null ? void 0 : _b.id
-            }
-          };
-        }
-        return Object.keys(value).reduce((result, key) => ({ ...result, [key]: migrate(value[key]) }), {});
-      case "array":
-        return value.map((item) => migrate(item));
-      case "string":
-        return value.replace(/({{\$jobsMapByNodeId|{{\$scopes)\.([\w-]+)/g, (_, jobVar, oldNodeId) => {
-          const newNode = oldToNew.get(Number.parseInt(oldNodeId, 10));
-          if (!newNode) {
-            throw new Error("node configurated for result is not existed");
-          }
-          return `${jobVar}.${newNode.id}`;
-        });
-      default:
-        return value;
-    }
-  }
-  return migrate(config);
-}
 async function revision(context, next) {
+  const plugin = context.app.getPlugin("workflow");
   const { db } = context;
   const repository = import_actions.utils.getRepositoryFromParams(context);
   const { filterByTk, filter = {}, values = {} } = context.action.params;
@@ -131,6 +92,7 @@ async function revision(context, next) {
       context,
       transaction
     });
+    const trigger2 = plugin.triggers.get(origin.type);
     const revisionData = filter.key ? {
       key: filter.key,
       title: origin.title,
@@ -140,9 +102,9 @@ async function revision(context, next) {
       values: {
         title: `${origin.title} copy`,
         description: origin.description,
+        ...revisionData,
         type: origin.type,
-        config: origin.config,
-        ...revisionData
+        config: typeof trigger2.duplicateConfig === "function" ? await trigger2.duplicateConfig(origin, { transaction }) : origin.config
       },
       transaction
     });
@@ -153,10 +115,12 @@ async function revision(context, next) {
     const oldToNew = /* @__PURE__ */ new Map();
     const newToOld = /* @__PURE__ */ new Map();
     for await (const node of origin.nodes) {
+      const instruction = plugin.instructions.get(node.type);
       const newNode = await instance.createNode(
         {
           type: node.type,
-          config: node.config,
+          key: node.key,
+          config: typeof instruction.duplicateConfig === "function" ? await instruction.duplicateConfig(node, { transaction }) : node.config,
           title: node.title,
           branchIndex: node.branchIndex
         },
@@ -169,17 +133,10 @@ async function revision(context, next) {
       const oldNode = originalNodesMap.get(oldId);
       const newUpstream = oldNode.upstreamId ? oldToNew.get(oldNode.upstreamId) : null;
       const newDownstream = oldNode.downstreamId ? oldToNew.get(oldNode.downstreamId) : null;
-      let migratedConfig;
-      try {
-        migratedConfig = migrateConfig(oldNode.config, oldToNew);
-      } catch (err) {
-        return context.throw(400, err.message);
-      }
       await newNode.update(
         {
           upstreamId: (newUpstream == null ? void 0 : newUpstream.id) ?? null,
-          downstreamId: (newDownstream == null ? void 0 : newDownstream.id) ?? null,
-          config: migratedConfig
+          downstreamId: (newDownstream == null ? void 0 : newDownstream.id) ?? null
         },
         { transaction }
       );
@@ -203,10 +160,14 @@ async function sync(context, next) {
   context.status = 204;
   await next();
 }
+async function trigger(context, next) {
+  return next();
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   destroy,
   revision,
   sync,
+  trigger,
   update
 });

package/dist/server/collections/flow_nodes.js

@@ -25,6 +25,10 @@ var flow_nodes_default = {
   duplicator: "required",
   name: "flow_nodes",
   fields: [
+    {
+      type: "uid",
+      name: "key"
+    },
     {
       type: "string",
       name: "title"

package/dist/server/constants.d.ts

@@ -7,6 +7,7 @@ export declare const EXECUTION_STATUS: {
     ABORTED: number;
     CANCELED: number;
     REJECTED: number;
+    RETRY_NEEDED: number;
 };
 export declare const JOB_STATUS: {
     PENDING: number;
@@ -16,6 +17,7 @@ export declare const JOB_STATUS: {
     ABORTED: number;
     CANCELED: number;
     REJECTED: number;
+    RETRY_NEEDED: number;
 };
 export declare const BRANCH_INDEX: {
     DEFAULT: any;

package/dist/server/constants.js

@@ -30,7 +30,8 @@ const EXECUTION_STATUS = {
   ERROR: -2,
   ABORTED: -3,
   CANCELED: -4,
-  REJECTED: -5
+  REJECTED: -5,
+  RETRY_NEEDED: -6
 };
 const JOB_STATUS = {
   PENDING: 0,
@@ -39,7 +40,8 @@ const JOB_STATUS = {
   ERROR: -2,
   ABORTED: -3,
   CANCELED: -4,
-  REJECTED: -5
+  REJECTED: -5,
+  RETRY_NEEDED: -6
 };
 const BRANCH_INDEX = {
   DEFAULT: null,

package/dist/server/index.d.ts

@@ -1,3 +1,4 @@
+export * from './utils';
 export * from './constants';
 export type * from './instructions';
 export { Trigger } from './triggers';

package/dist/server/index.js

@@ -33,6 +33,7 @@ __export(server_exports, {
   default: () => import_Plugin.default
 });
 module.exports = __toCommonJS(server_exports);
+__reExport(server_exports, require("./utils"), module.exports);
 __reExport(server_exports, require("./constants"), module.exports);
 var import_triggers = require("./triggers");
 var import_Processor = __toESM(require("./Processor"));
@@ -42,6 +43,7 @@ __reExport(server_exports, require("./types"), module.exports);
 0 && (module.exports = {
   Processor,
   Trigger,
+  ...require("./utils"),
   ...require("./constants"),
   ...require("./types")
 });

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

@@ -1,3 +1,4 @@
+import { Transactionable } from '@nocobase/database';
 import Plugin from '..';
 import Processor from '../Processor';
 import type { FlowNodeModel } from '../types';
@@ -11,7 +12,8 @@ export type Runner = (node: FlowNodeModel, input: any, processor: Processor) =>
 export interface Instruction {
     run: Runner;
     resume?: Runner;
-    getScope?: (node: FlowNodeModel, job: any, processor: Processor) => any;
+    getScope?: (node: FlowNodeModel, data: any, processor: Processor) => any;
+    duplicateConfig?: (node: FlowNodeModel, options: Transactionable) => object | Promise<object>;
 }
 type InstructionConstructor<T> = {
     new (p: Plugin): T;

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) {
@@ -428,7 +428,7 @@ class ScheduleTrigger extends import__.Trigger {
     workflows.forEach(async (workflow) => {
       const should = await this.shouldCache(workflow, now);
       if (should) {
-        this.plugin.app.logger.info("caching scheduled workflow will run in next minute:", workflow.id);
+        this.plugin.getLogger(workflow.id).info("caching scheduled workflow will run in next minute");
       }
       this.setCache(workflow, !should);
     });

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.15.0-alpha.1",
   "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": "8bbeab858a818fbe0a1f954ecf1f61337d06c065"
 }