@pxp-nd/flow 1.1.17 → 1.1.18

package/dist/controllers/Flow.d.ts

@@ -25,8 +25,8 @@ import { EntityManager } from 'typeorm';
 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, isCopy?: boolean): Promise<void>;
-    copyNode(node: Record<any, any>, newFlowId: number, manager: EntityManager, isFirst?: boolean, isCopy?: boolean): Promise<{
+    copyNodeConnections(nodeId: number, newNodeId: number, newFlowId: number, manager: EntityManager): Promise<void>;
+    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

@@ -66,6 +66,7 @@ const Action_1 = __importDefault(require("../entity/Action"));
 const NodeConnection_1 = __importDefault(require("../entity/NodeConnection"));
 const Flow_1 = __importDefault(require("../entity/Flow"));
 const FlowInstance_1 = __importDefault(require("../entity/FlowInstance"));
+const NodeInstance_1 = __importDefault(require("../entity/NodeInstance"));
 const Node_2 = __importDefault(require("./Node"));
 const axios_1 = __importDefault(require("axios"));
 //import {configFacebookStrategy} from "./passport-facebook";
@@ -93,55 +94,22 @@ let Flow = class Flow extends core_1.Controller {
         }
         return restNodes;
     }
-    async copyNodeConnections(nodeId, newNodeId, newFlowId, manager, isCopy = false) {
+    async copyNodeConnections(nodeId, newNodeId, newFlowId, manager) {
         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;
             // get node from nodeIdChild
             const dataNodeChild = await Node_1.default.findOne({ nodeId: connection.nodeIdChild });
-            const { nodeId: newNodeIdChild } = await this.copyNode(dataNodeChild, newFlowId, manager, false, isCopy);
+            const { nodeId: newNodeIdChild } = await this.copyNode(dataNodeChild, newFlowId, manager);
             Object.assign(newNodeConnection, { ...nodeConnectionToCopy, nodeIdMaster: newNodeId, nodeIdChild: newNodeIdChild });
             const insertNewNodeConnection = await (0, core_1.__)(manager.save(NodeConnection_1.default, newNodeConnection));
         }
     }
-    async copyNode(node, newFlowId, manager, isFirst = false, isCopy = false) {
-        var _a, _b, _c, _d;
+    async copyNode(node, newFlowId, manager, isFirst = false) {
         // insert new node
         const newNode = new Node_1.default();
         const { nodeId, flowId, createdAt, modifiedAt, ...nodeToCopy } = node;
-        if (isCopy && ((_b = (_a = nodeToCopy === null || nodeToCopy === void 0 ? void 0 : nodeToCopy.action) === null || _a === void 0 ? void 0 : _a.actionType) === null || _b === void 0 ? void 0 : _b.onDuplicate) === 'duplicateChainedFlow') {
-            if ((_c = nodeToCopy === null || nodeToCopy === void 0 ? void 0 : nodeToCopy.action) === null || _c === void 0 ? void 0 : _c.configJsonTemplate) {
-                try {
-                    const parsedConfig = JSON.parse(nodeToCopy.action.configJsonTemplate);
-                    if (parsedConfig.addController && parsedConfig.template) {
-                        const params = {
-                            template: parsedConfig.template,
-                            flowId: newFlowId,
-                        };
-                        const config = {
-                            method: "post",
-                            url: `http://localhost:${process.env.PORT}/api/${parsedConfig.addController}`,
-                            headers: {
-                                Authorization: "" + process.env.TOKEN_PXP_ND + "",
-                                "Content-Type": "application/json",
-                            },
-                            data: params,
-                        };
-                        const resControllerAxios = await (0, axios_1.default)(config);
-                        const chainedFlowId = (_d = resControllerAxios.data) === null || _d === void 0 ? void 0 : _d.flowId;
-                        const parsedValues = {
-                            flowId: chainedFlowId
-                        };
-                        const newConfigJson = JSON.stringify(parsedValues);
-                        nodeToCopy.actionConfigJson = newConfigJson;
-                    }
-                }
-                catch (error) {
-                    console.error("Not valid json", error);
-                }
-            }
-        }
         Object.assign(newNode, { ...nodeToCopy, flowId: newFlowId });
         const insertNewNode = await (0, core_1.__)(manager.save(Node_1.default, newNode));
         if (isFirst) {
@@ -153,7 +121,7 @@ let Flow = class Flow extends core_1.Controller {
             await manager.save(duplicatedConnection);
         }
         // insert connection
-        await this.copyNodeConnections(node.nodeId, insertNewNode.nodeId, newFlowId, manager, isCopy);
+        await this.copyNodeConnections(node.nodeId, insertNewNode.nodeId, newFlowId, manager);
         return { nodeId: insertNewNode.nodeId };
     }
     async createFlowFromFlow(params, manager) {
@@ -250,16 +218,15 @@ let Flow = class Flow extends core_1.Controller {
                 status: 'off'
             };
             let flowDataClone;
-            let isCopy = false;
-            //if we have a name as parameter the origin is a template
-            if (params.name) {
-                flowDataClone = await (0, typeorm_1.getManager)().save(Flow_1.default, { ...flowToClone, name: `${params.name}`, vendorId: params.vendorId, type: 'custom' });
+            //if we have a vendoId as parameter the origin is a template
+            if (params.vendorId) {
+                flowDataClone = await manager.save(Flow_1.default, { ...flowToClone, name: `${params.name}`, vendorId: params.vendorId, type: 'custom' });
             }
             else {
-                flowDataClone = await (0, typeorm_1.getManager)().save(Flow_1.default, { ...flowToClone, name: `${flowData.name} Copy` });
+                flowDataClone = await manager.save(Flow_1.default, { ...flowToClone, name: `${flowData.name} Copy` });
             }
             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, isCopy);
+            dataNode && await this.copyNode(dataNode, flowDataClone.flowId, manager, true);
             return { success: true, flowId: flowDataClone.flowId };
         }
         else {
@@ -267,7 +234,7 @@ let Flow = class Flow extends core_1.Controller {
         }
     }
     async saveFlow(params, manager) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         let nodeRefIds = params.board.columns['2-column-nodes-configured'].taskIds;
         let nodes = params.board.tasks ? params.board.tasks : [];
         let masterId = null;
@@ -322,7 +289,7 @@ let Flow = class Flow extends core_1.Controller {
                         });
                         if (connectionsToDel) {
                             const originalNodeCIds = connectionsToDel.map((node) => node.nodeConnectionId);
-                            let flowNodeC = await manager.query(`DELETE
+                            let flowNodeC = await (0, typeorm_1.getManager)().query(`DELETE
                                                        from twf_node_connection
                                                        WHERE node_connection_id = ${originalNodeCIds}`);
                         }
@@ -382,14 +349,7 @@ let Flow = class Flow extends core_1.Controller {
                                 }
                             }
                             catch (error) {
-                                if (axios_1.default.isAxiosError(error) && error.response) {
-                                    const message = ((_c = (_b = error.response.data) === null || _b === void 0 ? void 0 : _b.error) === null || _c === void 0 ? void 0 : _c.message) || 'Unknown error';
-                                    throw new core_1.PxpError(400, message);
-                                }
-                                else {
-                                    console.error("Not valid json", error);
-                                    throw new core_1.PxpError(500, 'Unexpected error while processing the request');
-                                }
+                                console.error("Not valid json", error);
                             }
                         }
                     }
@@ -437,7 +397,7 @@ let Flow = class Flow extends core_1.Controller {
                                             data: params,
                                         };
                                         const resControllerAxios = await (0, axios_1.default)(config);
-                                        const chainedFlowId = (_d = resControllerAxios.data) === null || _d === void 0 ? void 0 : _d.flowId;
+                                        const chainedFlowId = (_b = resControllerAxios.data) === null || _b === void 0 ? void 0 : _b.flowId;
                                         const parsedValues = {
                                             flowId: chainedFlowId
                                         };
@@ -746,25 +706,21 @@ let Flow = class Flow extends core_1.Controller {
                     validFlowInstances.push(flowInstance.flowInstanceId);
                 }
                 else {
-                    /*Commented because scheduled nodes shouldn't be affected by stopping
                     let flowInstanceId = flowInstance.flowInstanceId;
-                    const totalNI = await NodeInstanceModel.find({ flowInstanceId, isActive: true});
-                    const nodeInstances = await getManager().transaction(async (transactionalEntityManager) => {
-                       const queryBuilder: SelectQueryBuilder<NodeInstanceModel> = transactionalEntityManager.createQueryBuilder(NodeInstanceModel, 'node_instance');
-                       queryBuilder
-                         .where('node_instance.flowInstanceId = :flowInstanceId', { flowInstanceId })
-                         .andWhere('((node_instance.status IS NULL AND (node_instance.schedule = :schedule OR node_instance.schedule IS NULL)) OR (node_instance.status = :status AND node_instance.schedule != :schedule AND node_instance.schedule IS NOT NULL))', {
-                           status: 'executed',
-                           schedule: '0000-00-00 00:00:00',
-                         });
- 
-                       return queryBuilder.getMany();
-                     });
- 
- 
-                   if (totalNI.length > nodeInstances.length ) {
-                     validFlowInstances.push(flowInstanceId);
-                   }*/
+                    const totalNI = await NodeInstance_1.default.find({ flowInstanceId, isActive: true });
+                    const nodeInstances = await (0, typeorm_1.getManager)().transaction(async (transactionalEntityManager) => {
+                        const queryBuilder = transactionalEntityManager.createQueryBuilder(NodeInstance_1.default, 'node_instance');
+                        queryBuilder
+                            .where('node_instance.flowInstanceId = :flowInstanceId', { flowInstanceId })
+                            .andWhere('((node_instance.status IS NULL AND node_instance.schedule = :schedule) OR (node_instance.status = :status AND node_instance.schedule != :schedule))', {
+                            status: 'executed',
+                            schedule: '0000-00-00 00:00:00',
+                        });
+                        return queryBuilder.getMany();
+                    });
+                    if (totalNI.length > nodeInstances.length) {
+                        validFlowInstances.push(flowInstanceId);
+                    }
                 }
             }
             if (validFlowInstances.length > 0) {

package/dist/controllers/FlowInstance.d.ts

@@ -18,6 +18,5 @@ declare class FlowInstance extends Controller {
     processPending(params: Record<string, any>, manager: EntityManager): Promise<unknown>;
     eventProcesss(manager: EntityManager): Promise<void>;
     checkConditions(viewData: Record<string, any>, flowId: number, actionId: number): Promise<boolean>;
-    insert(params: Record<string, any>, manager: EntityManager): Promise<unknown>;
 }
 export default FlowInstance;

package/dist/controllers/FlowInstance.js

@@ -135,18 +135,6 @@ class FlowInstance extends core_1.Controller {
         }
         return res;
     }
-    async insert(params, manager) {
-        const { flowId, dataId, status, actionId, originName = '', originKey = '' } = params;
-        let flowInstance = new FlowInstance_1.default();
-        flowInstance.flowId = flowId;
-        flowInstance.dataId = dataId;
-        flowInstance.originName = originName;
-        flowInstance.originKey = originKey;
-        flowInstance.actionId = actionId;
-        flowInstance.status = status;
-        flowInstance = await manager.save(FlowInstance_1.default, flowInstance);
-        return flowInstance;
-    }
 }
 __decorate([
     (0, core_1.Post)(),
@@ -157,13 +145,4 @@ __decorate([
     __metadata("design:paramtypes", [Object, typeorm_1.EntityManager]),
     __metadata("design:returntype", Promise)
 ], FlowInstance.prototype, "processPending", null);
-__decorate([
-    (0, core_1.Post)(),
-    (0, core_1.DbSettings)('Orm'),
-    (0, core_1.ReadOnly)(false),
-    (0, core_1.Log)(true),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, typeorm_1.EntityManager]),
-    __metadata("design:returntype", Promise)
-], FlowInstance.prototype, "insert", null);
 exports.default = FlowInstance;

package/dist/controllers/NodeInstance.js

@@ -46,10 +46,12 @@ let NodeInstance = class NodeInstance extends core_1.Controller {
         lodash_1.default.templateSettings.interpolate = /{{([\s\S]+?)}}/g;
         //todo after this we need to get the json variables and execute the view and conditions configured in the database
         const { node, flowInstance, eventNode } = params;
+        console.log("RecursiveInstance flow-nd---> node:", node);
         try {
             const executeView = `select * from ${flowInstance.originName} where ${flowInstance.originKey} = ${flowInstance.dataId}`;
             const resExecuteView = await (0, core_1.__)((0, typeorm_1.getManager)().query(executeView));
             const resultFromOrigin = resExecuteView[0];
+            console.log("resultFromOrigin:", resultFromOrigin);
             let mergeJson = {};
             const { actionConfigJson, action: { configJsonTemplate, actionType: { schemaJson }, }, } = node;
             if (configJsonTemplate !== "" || actionConfigJson !== "") {
@@ -62,6 +64,7 @@ let NodeInstance = class NodeInstance extends core_1.Controller {
                     ...(actionConfigJsonObject || {}),
                     __resultFromOrigin: resultFromOrigin,
                 };
+                console.log("mergeJson::", mergeJson);
             }
             let nodeInstance = new NodeInstance_1.default();
             nodeInstance.flowInstanceId = flowInstance.flowInstanceId;

package/dist/entity/ActionType.d.ts

@@ -24,7 +24,6 @@ export default class ActionType extends PxpEntity {
     controller: string;
     extraSchemaJson: string;
     actionsJson: string;
-    onDuplicate: string;
     validationController: string;
     actions: Action[];
 }

package/dist/entity/ActionType.js

@@ -73,10 +73,6 @@ __decorate([
     (0, typeorm_1.Column)({ name: 'actions_json', type: 'text' }),
     __metadata("design:type", String)
 ], ActionType.prototype, "actionsJson", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ name: 'on_duplicate', type: 'varchar' }),
-    __metadata("design:type", String)
-], ActionType.prototype, "onDuplicate", void 0);
 __decorate([
     (0, typeorm_1.Column)({ name: 'validation_controller', type: 'text' }),
     __metadata("design:type", String)

package/package.json

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