@pxp-nd/flow 1.0.45 → 1.0.47

package/dist/controllers/Flow.js

@@ -182,45 +182,57 @@ let Flow = class Flow extends core_1.Controller {
         }
     }
     async saveFlow(params, manager) {
-        console.log(params);
         let nodeRefIds = params.board.columns['2-column-nodes-configured'].taskIds;
-        console.log("nodesRef:", nodeRefIds);
         let nodes = params.board.tasks ? params.board.tasks : [];
-        console.log("nod:", nodes);
         let masterId = null;
         let id = null;
+        let newId = null;
         let flowId = null;
         let taskIds = [];
         if (nodeRefIds.length === 0) {
-            flowId = params.board.columns['2-column-nodes-configured'].flowId;
+            let nodeDelIdd = parseInt(params.board.deleteId.split("-")[1]);
+            const lastNoded = await Node_1.default.findOne({
+                where: {
+                    nodeId: nodeDelIdd
+                }
+            });
+            flowId = lastNoded.flowId;
         }
         else {
+            flowId = params.board.flowId;
             for (const nodeId of nodeRefIds) {
-                // console.log ('node:',nodes[`${nodeId}`]);
                 if (nodeId != 'new') {
-                    id = parseInt(nodeId.split("-")[1]);
+                    id = parseInt(nodeId.split("node-")[1]);
+                    if (!id) {
+                        const lastNode = await Node_1.default.findOne({
+                            where: {
+                                flowId: flowId,
+                            },
+                            order: {
+                                nodeId: 'DESC', // Ordena por ID en orden descendente para obtener el último registro
+                            },
+                        });
+                        id = lastNode.nodeId;
+                    }
                     taskIds.push(id);
                     const connectionsToDel = await manager.find(NodeConnection_1.default, {
                         where: { nodeIdChild: id }
                     });
                     if (connectionsToDel) {
-                        //console.log("hay para eliminar---->", connectionsToDel);
                         const originalNodeCIds = connectionsToDel.map((node) => node.nodeConnectionId);
-                        //console.log("eliminando: ", originalNodeCIds);
                         let flowNodeC = await (0, typeorm_1.getManager)().query(`DELETE
                                                        from twf_node_connection
                                                        WHERE node_connection_id = ${originalNodeCIds}`);
                     }
                 }
+                else {
+                    taskIds.push('new');
+                }
                 //}
             }
         }
-        //if (nodes[`${nodeId}`]) {
-        //flowId = nodes[`${nodeId}`].flowId;
         if (params.board.origin == 'deleteTask') {
-            console.log("aqui elimina", params.board.deleteID);
             let nodeDelId = parseInt(params.board.deleteId.split("-")[1]);
-            console.log(nodeDelId);
             if (nodeDelId) {
                 //If there are some nodes in node_connections after delete all records sent, to inactive node
                 let connectNoDel = await (0, typeorm_1.getManager)().query(`SELECT n.node_id
@@ -242,13 +254,10 @@ let Flow = class Flow extends core_1.Controller {
                 }
             }
         }
-        console.log("aqui tiene q entrar a volver a insertar");
-        //armamos las relaciones
         if (nodeRefIds.length === 0) {
         }
         else {
-            for (const nodeId of nodeRefIds) {
-                // if (nodes[`${nodeId}`]) {
+            for (const nodeId of taskIds) {
                 if (nodeId === 'new') {
                     //get information about Action
                     const newAction = await Action_1.default.findOne({ code: nodes[`${nodeId}`].action.code });
@@ -260,9 +269,10 @@ let Flow = class Flow extends core_1.Controller {
                     });
                     const saveNode = await manager.save(newNode);
                     id = saveNode.nodeId;
+                    newId = saveNode.nodeId;
                 }
                 else {
-                    id = parseInt(nodeId.split("-")[1]);
+                    id = nodeId;
                 }
                 //save in node and node_connection
                 const newConnection = manager.create(NodeConnection_1.default, {
@@ -276,8 +286,7 @@ let Flow = class Flow extends core_1.Controller {
             }
             //}
         }
-        console.log("fin de funcion");
-        return { success: true };
+        return { success: true, nodeId: newId };
     }
     async getFlowRender(params) {
         let actions = await (0, typeorm_1.getManager)()
@@ -318,6 +327,7 @@ let Flow = class Flow extends core_1.Controller {
             item.actionId = `action-${item.actionId}`;
         });
         sortedNodes.forEach((item) => {
+            item.node = { nodeId: item.nodeId };
             item.nodeId = `node-${item.nodeId}`;
         });
         const actionIds = actions.map((item) => item.actionId);

package/package.json

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