@pxp-nd/flow 1.0.66 → 1.0.68

package/dist/controllers/Flow.d.ts

@@ -22,7 +22,7 @@ import { Controller } from '@pxp-nd/core';
 declare class Flow extends Controller {
     get(params: Record<string, any>): Promise<unknown>;
     copyNodeConnections(nodeId: number, newNodeId: number, newFlowId: number, manager: EntityManager): Promise<void>;
-    copyNode(node: Record<any, any>, newFlowId: number, manager: EntityManager): Promise<{
+    copyNode(node: Record<any, any>, newFlowId: number, manager: EntityManager, isFirst?: boolean): Promise<{
         nodeId: any;
     }>;
     createFlowFromFlow(params: Record<string, any>, manager: EntityManager): Promise<unknown>;

package/dist/controllers/Flow.js

@@ -62,7 +62,7 @@ let Flow = class Flow extends core_1.Controller {
         return restNodes;
     }
     async copyNodeConnections(nodeId, newNodeId, newFlowId, manager) {
-        const connections = await (0, core_1.__)(NodeConnection_1.default.find({ nodeIdMaster: nodeId }));
+        const connections = await (0, core_1.__)(NodeConnection_1.default.find({ nodeIdMaster: nodeId, isActive: true }));
         for (let connection of connections) {
             const newNodeConnection = new NodeConnection_1.default();
             const { nodeConnectionId, nodeIdMaster, nodeIdChild, createdAt, modifiedAt, ...nodeConnectionToCopy } = connection;
@@ -73,12 +73,19 @@ let Flow = class Flow extends core_1.Controller {
             const insertNewNodeConnection = await (0, core_1.__)(manager.save(NodeConnection_1.default, newNodeConnection));
         }
     }
-    async copyNode(node, newFlowId, manager) {
+    async copyNode(node, newFlowId, manager, isFirst = false) {
         // insert new node
         const newNode = new Node_1.default();
         const { nodeId, flowId, createdAt, modifiedAt, actionConfigJson, ...nodeToCopy } = node;
         Object.assign(newNode, { ...nodeToCopy, flowId: newFlowId });
         const insertNewNode = await (0, core_1.__)(manager.save(Node_1.default, newNode));
+        if (isFirst) {
+            const duplicatedConnection = manager.create(NodeConnection_1.default, {
+                nodeConnectionId: undefined,
+                nodeIdMaster: undefined,
+                nodeIdChild: insertNewNode.nodeId,
+            });
+        }
         // insert connection
         await this.copyNodeConnections(node.nodeId, insertNewNode.nodeId, newFlowId, manager);
         return { nodeId: insertNewNode.nodeId };
@@ -160,7 +167,8 @@ let Flow = class Flow extends core_1.Controller {
                 ...flowData,
                 flowId: undefined,
                 nodes: [],
-                createdAt: undefined,
+                createdAt: new Date(),
+                modifiedAt: new Date(),
                 status: 'off'
             };
             let flowDataClone;
@@ -171,29 +179,8 @@ let Flow = class Flow extends core_1.Controller {
             else {
                 flowDataClone = await manager.save(Flow_1.default, { ...flowToClone, name: `${flowData.name} Copy` });
             }
-            const nodesToDuplicate = await manager.find(Node_1.default, { flowId: flowData === null || flowData === void 0 ? void 0 : flowData.flowId, isActive: true });
-            if (nodesToDuplicate) {
-                const originalNodeIds = nodesToDuplicate.map((node) => node.nodeId);
-                const duplicatedNodes = nodesToDuplicate.map((node) => {
-                    const duplicatedNode = manager.create(Node_1.default, { ...node, nodeId: undefined });
-                    duplicatedNode.flowId = flowDataClone.flowId;
-                    return duplicatedNode;
-                });
-                const savedNodes = await manager.save(duplicatedNodes);
-                const newNodeIds = savedNodes.map((node) => node.nodeId);
-                const connectionsToDuplicate = await manager.find(NodeConnection_1.default, {
-                    where: { nodeIdChild: (0, typeorm_1.In)(originalNodeIds), isActive: true }
-                });
-                const duplicatedConnections = newNodeIds.map((nodeId, index) => {
-                    const duplicatedConnection = manager.create(NodeConnection_1.default, {
-                        nodeConnectionId: undefined,
-                        nodeIdMaster: index === 0 ? null : newNodeIds[index - 1],
-                        nodeIdChild: nodeId,
-                    });
-                    return duplicatedConnection;
-                });
-                await manager.save(duplicatedConnections);
-            }
+            const dataNode = await Node_1.default.findOne({ where: { flowId: params.flowId, isInit: 'Y', isActive: true }, order: { nodeId: "ASC" } });
+            dataNode && await this.copyNode(dataNode, flowDataClone.flowId, manager, true);
             return { success: true, flowId: flowDataClone.flowId };
         }
         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pxp-nd/flow",
-  "version": "1.0.66",
+  "version": "1.0.68",
   "description": "Workflow module for pxp-nd framework",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",