@nocobase/plugin-workflow 2.1.0-alpha.1 → 2.1.0-alpha.10

package/dist/server/actions/nodes.js

@@ -39,6 +39,8 @@ __export(nodes_exports, {
   create: () => create,
   destroy: () => destroy,
   destroyBranch: () => destroyBranch,
+  duplicate: () => duplicate,
+  move: () => move,
   test: () => test,
   update: () => update
 });
@@ -49,10 +51,10 @@ var import__ = __toESM(require(".."));
 async function create(context, next) {
   const { db } = context;
   const repository = import_actions.utils.getRepositoryFromParams(context);
-  const { whitelist, blacklist, updateAssociationValues, values, associatedIndex: workflowId } = context.action.params;
+  const { whitelist, blacklist, updateAssociationValues, values } = context.action.params;
   const workflowPlugin = context.app.pm.get(import__.default);
   context.body = await db.sequelize.transaction(async (transaction) => {
-    const workflow = workflowPlugin.enabledCache.get(Number.parseInt(workflowId, 10)) || await repository.getSourceModel(transaction);
+    const workflow = workflowPlugin.enabledCache.get(Number.parseInt(context.action.sourceId, 10)) || await repository.getSourceModel(transaction);
     if (!workflow.versionStats) {
       workflow.versionStats = await workflow.getVersionStats({ transaction });
     }
@@ -133,6 +135,117 @@ async function create(context, next) {
   });
   await next();
 }
+async function duplicate(context, next) {
+  const { db } = context;
+  const repository = import_actions.utils.getRepositoryFromParams(context);
+  const { whitelist, blacklist, filterByTk, values = {} } = context.action.params;
+  const workflowPlugin = context.app.pm.get(import__.default);
+  context.body = await db.sequelize.transaction(async (transaction) => {
+    const origin = filterByTk ? await repository.findOne({ filterByTk, transaction }) : null;
+    if (!origin) {
+      return context.throw(404, "Node not found");
+    }
+    const workflow = workflowPlugin.enabledCache.get(origin.workflowId) || await db.getRepository("workflows").findOne({
+      filterByTk: origin.workflowId,
+      transaction
+    });
+    if (!workflow) {
+      return context.throw(400, "Workflow not found");
+    }
+    if (!workflow.versionStats) {
+      workflow.versionStats = await workflow.getVersionStats({ transaction });
+    }
+    if (workflow.versionStats.executed > 0) {
+      context.throw(400, "Node could not be created in executed workflow");
+    }
+    const NODES_LIMIT = process.env.WORKFLOW_NODES_LIMIT ? parseInt(process.env.WORKFLOW_NODES_LIMIT, 10) : null;
+    if (NODES_LIMIT) {
+      const nodesCount = await workflow.countNodes({ transaction });
+      if (nodesCount >= NODES_LIMIT) {
+        context.throw(400, `The number of nodes in a workflow cannot exceed ${NODES_LIMIT}`);
+      }
+    }
+    let nextConfig = values.config;
+    if (!nextConfig) {
+      const instruction = workflowPlugin.instructions.get(origin.type);
+      if (instruction && typeof instruction.duplicateConfig === "function") {
+        nextConfig = await instruction.duplicateConfig(origin, { origin: origin ?? void 0, transaction });
+      }
+    }
+    const instance = await repository.create({
+      values: {
+        config: nextConfig ?? origin.config,
+        upstreamId: values.upstreamId,
+        branchIndex: values.branchIndex,
+        type: origin.type,
+        title: origin.title,
+        workflowId: origin.workflowId
+      },
+      whitelist,
+      blacklist,
+      context,
+      transaction
+    });
+    if (!instance.upstreamId) {
+      const previousHead = await repository.findOne({
+        filter: {
+          id: {
+            $ne: instance.id
+          },
+          workflowId: origin.workflowId,
+          upstreamId: null
+        },
+        transaction
+      });
+      if (previousHead) {
+        await previousHead.setUpstream(instance, { transaction });
+        await instance.setDownstream(previousHead, { transaction });
+        instance.set("downstream", previousHead);
+      }
+      return instance;
+    }
+    const upstream = await instance.getUpstream({ transaction });
+    if (instance.branchIndex == null) {
+      const downstream = await upstream.getDownstream({ transaction });
+      if (downstream) {
+        await downstream.setUpstream(instance, { transaction });
+        await instance.setDownstream(downstream, { transaction });
+        instance.set("downstream", downstream);
+      }
+      await upstream.update(
+        {
+          downstreamId: instance.id
+        },
+        { transaction }
+      );
+      upstream.set("downstream", instance);
+    } else {
+      const [downstream] = await upstream.getBranches({
+        where: {
+          id: {
+            [import_database.Op.ne]: instance.id
+          },
+          branchIndex: instance.branchIndex
+        },
+        transaction
+      });
+      if (downstream) {
+        await downstream.update(
+          {
+            upstreamId: instance.id,
+            branchIndex: null
+          },
+          { transaction }
+        );
+        await instance.setDownstream(downstream, { transaction });
+        instance.set("downstream", downstream);
+      }
+    }
+    instance.set("upstream", upstream);
+    return instance;
+  });
+  await next();
+}
 function searchBranchNodes(nodes, from) {
   const branchHeads = nodes.filter((item) => item.upstreamId === from.id && item.branchIndex != null);
   return branchHeads.reduce(
@@ -336,6 +449,170 @@ async function destroyBranch(context, next) {
   context.body = deletedBranchHead;
   await next();
 }
+async function move(context, next) {
+  const { db } = context;
+  const repository = import_actions.utils.getRepositoryFromParams(context);
+  const { filterByTk, values = {} } = context.action.params;
+  const rawUpstreamId = values.upstreamId;
+  const rawBranchIndex = values.branchIndex;
+  const upstreamId = rawUpstreamId == null || rawUpstreamId === "" ? null : rawUpstreamId;
+  let branchIndex = rawBranchIndex == null || rawBranchIndex === "" ? null : Number.parseInt(rawBranchIndex, 10);
+  if (rawBranchIndex != null && rawBranchIndex !== "" && Number.isNaN(branchIndex)) {
+    context.throw(400, "branchIndex must be a number");
+  }
+  if (upstreamId == null) {
+    branchIndex = null;
+  }
+  const fields = ["id", "key", "upstreamId", "downstreamId", "branchIndex", "workflowId"];
+  context.body = await db.sequelize.transaction(async (transaction) => {
+    const instance = await repository.findOne({
+      filterByTk,
+      fields,
+      appends: ["upstream", "downstream", "workflow.versionStats"],
+      transaction
+    });
+    if (!instance) {
+      context.throw(404, "Node not found");
+    }
+    if (instance.workflow.versionStats.executed > 0) {
+      context.throw(400, "Nodes in executed workflow could not be moved");
+    }
+    if (upstreamId != null && String(upstreamId) === String(instance.id)) {
+      context.throw(400, "Invalid upstream node");
+    }
+    const sameUpstream = (instance.upstreamId ?? null) == (upstreamId ?? null);
+    const sameBranchIndex = (instance.branchIndex ?? null) == (branchIndex ?? null);
+    if (sameUpstream && sameBranchIndex) {
+      context.throw(400, "Node does not need to be moved");
+    }
+    const { upstream: oldUpstream, downstream: oldDownstream } = instance.get();
+    if (oldUpstream && oldUpstream.downstreamId === instance.id) {
+      await oldUpstream.update(
+        {
+          downstreamId: oldDownstream ? oldDownstream.id : null
+        },
+        { transaction }
+      );
+    }
+    if (oldDownstream && oldDownstream.upstreamId === instance.id) {
+      await oldDownstream.update(
+        {
+          upstreamId: oldUpstream ? oldUpstream.id : null,
+          branchIndex: instance.branchIndex ?? null
+        },
+        { transaction }
+      );
+    }
+    let targetUpstream = null;
+    if (upstreamId != null) {
+      targetUpstream = await repository.findOne({
+        filterByTk: upstreamId,
+        fields,
+        transaction
+      });
+      if (!targetUpstream) {
+        context.throw(404, "Upstream node not found");
+      }
+      if (targetUpstream.workflowId !== instance.workflowId) {
+        context.throw(400, "Upstream node is not in the same workflow");
+      }
+    }
+    let newDownstream = null;
+    if (!targetUpstream) {
+      const previousHead = await repository.findOne({
+        filter: {
+          workflowId: instance.workflowId,
+          upstreamId: null,
+          id: {
+            [import_database.Op.ne]: instance.id
+          }
+        },
+        fields,
+        transaction
+      });
+      if (previousHead) {
+        await previousHead.update(
+          {
+            upstreamId: instance.id,
+            branchIndex: null
+          },
+          { transaction }
+        );
+        newDownstream = previousHead;
+      }
+      await instance.update(
+        {
+          upstreamId: null,
+          branchIndex: null,
+          downstreamId: newDownstream ? newDownstream.id : null
+        },
+        { transaction }
+      );
+      return instance;
+    }
+    if (branchIndex == null) {
+      if (targetUpstream.downstreamId) {
+        newDownstream = await repository.findOne({
+          filterByTk: targetUpstream.downstreamId,
+          fields,
+          transaction
+        });
+      }
+      if (newDownstream) {
+        await newDownstream.update(
+          {
+            upstreamId: instance.id,
+            branchIndex: null
+          },
+          { transaction }
+        );
+      }
+      await targetUpstream.update(
+        {
+          downstreamId: instance.id
+        },
+        { transaction }
+      );
+      await instance.update(
+        {
+          upstreamId: targetUpstream.id,
+          branchIndex: null,
+          downstreamId: newDownstream ? newDownstream.id : null
+        },
+        { transaction }
+      );
+      return instance;
+    }
+    const branchHead = await repository.findOne({
+      filter: {
+        upstreamId: targetUpstream.id,
+        branchIndex
+      },
+      fields,
+      transaction
+    });
+    if (branchHead) {
+      await branchHead.update(
+        {
+          upstreamId: instance.id,
+          branchIndex: null
+        },
+        { transaction }
+      );
+      newDownstream = branchHead;
+    }
+    await instance.update(
+      {
+        upstreamId: targetUpstream.id,
+        branchIndex,
+        downstreamId: newDownstream ? newDownstream.id : null
+      },
+      { transaction }
+    );
+    return instance;
+  });
+  await next();
+}
 async function update(context, next) {
   const { db } = context;
   const repository = import_actions.utils.getRepositoryFromParams(context);
@@ -385,6 +662,8 @@ async function test(context, next) {
   create,
   destroy,
   destroyBranch,
+  duplicate,
+  move,
   test,
   update
 });

package/dist/server/instructions/ConditionInstruction.js

@@ -81,7 +81,10 @@ class ConditionInstruction extends import__.Instruction {
     if (branchJob.status === import_constants.JOB_STATUS.RESOLVED) {
       return job;
     }
-    return processor.exit(branchJob.status);
+    if (branchJob.status === import_constants.JOB_STATUS.PENDING) {
+      return processor.exit(branchJob.status);
+    }
+    return branchJob;
   }
   async test({ engine, calculation, expression = "" }) {
     const evaluator = import_evaluators.evaluators.get(engine);

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

@@ -0,0 +1,21 @@
+/**
+ * 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 { Instruction } from '.';
+import Processor from '../Processor';
+import { FlowNodeModel } from '../types';
+export default class ExecutionResultInstruction extends Instruction {
+    run(node: FlowNodeModel, prevJob: any, processor: Processor): Promise<{
+        result: any;
+        status: -1;
+    } | {
+        result: any;
+        status: 1;
+    }>;
+    resume(node: FlowNodeModel, job: any, processor: Processor): Promise<any>;
+}

package/dist/server/instructions/OutputInstruction.js

@@ -0,0 +1,54 @@
+/**
+ * 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 OutputInstruction_exports = {};
+__export(OutputInstruction_exports, {
+  default: () => ExecutionResultInstruction
+});
+module.exports = __toCommonJS(OutputInstruction_exports);
+var import__ = require(".");
+var import_constants = require("../constants");
+class ExecutionResultInstruction extends import__.Instruction {
+  async run(node, prevJob, processor) {
+    const { value } = node.config;
+    const output = processor.getParsedValue(value, node.id);
+    try {
+      await processor.execution.update({ output }, { hooks: false, transaction: processor.mainTransaction });
+    } catch (e) {
+      return {
+        result: e.message,
+        status: import_constants.JOB_STATUS.FAILED
+      };
+    }
+    return {
+      result: output,
+      status: import_constants.JOB_STATUS.RESOLVED
+    };
+  }
+  async resume(node, job, processor) {
+    return job;
+  }
+}

package/dist/server/repositories/WorkflowRepository.js

@@ -97,7 +97,8 @@ class WorkflowRepository extends import_database.Repository {
           { transaction }
         );
         if (typeof instruction.duplicateConfig === "function") {
-          await instruction.duplicateConfig(newNode, { origin: node, transaction });
+          const newConfig = await instruction.duplicateConfig(newNode, { origin: node, transaction });
+          await newNode.update({ config: newConfig }, { transaction });
         }
         oldToNew.set(node.id, newNode);
         newToOld.set(newNode.id, node);