@pxp-nd/flow 1.0.75 → 1.0.77

package/dist/controllers/Flow.d.ts

@@ -16,6 +16,7 @@
  * 18-Aug-2023    SP25AUG23     Mercedes Zambrana      Add removeFlow
  * 01-Sep-2023    SP08SEP23     Rensi Arteaga          add base flow list
  * 16-Sep-2023    SP22SEP23     Mercedes Zambrana       Change GET to POST in insertEventFlow
+ * 28-Sep-2023    SP06OCT23     Mercedes Zambrana      Add Validation when change off status (validateFlow, deleteflow, saveFlow, saveflowName)
  * ******************************************************************************
  */
 import { EntityManager } from 'typeorm';
@@ -36,7 +37,7 @@ declare class Flow extends Controller {
     insertEventFlow(params: Record<string, any>, manager: EntityManager): Promise<unknown>;
     removeFlow(params: Record<string, any>, manager: EntityManager): Promise<unknown>;
     changeStatusFlow(params: Record<string, any>, manager: EntityManager): Promise<unknown>;
-    validateFlow(flowId: number, manager: EntityManager): Promise<unknown>;
+    validateFlow(flowId: number, manager: EntityManager, status: string): Promise<unknown>;
     basicFlowList(params: Record<string, any>): Promise<unknown>;
 }
 export default Flow;

package/dist/controllers/Flow.js

@@ -17,6 +17,7 @@
  * 18-Aug-2023    SP25AUG23     Mercedes Zambrana      Add removeFlow
  * 01-Sep-2023    SP08SEP23     Rensi Arteaga          add base flow list
  * 16-Sep-2023    SP22SEP23     Mercedes Zambrana       Change GET to POST in insertEventFlow
+ * 28-Sep-2023    SP06OCT23     Mercedes Zambrana      Add Validation when change off status (validateFlow, deleteflow, saveFlow, saveflowName)
  * ******************************************************************************
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
@@ -62,6 +63,9 @@ const Node_1 = __importDefault(require("../entity/Node"));
 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"));
+//import {configFacebookStrategy} from "./passport-facebook";
 let Flow = class Flow extends core_1.Controller {
     async get(params) {
         const nodes = await Node_1.default.find({ flowId: params.flowId });
@@ -137,6 +141,9 @@ let Flow = class Flow extends core_1.Controller {
     async deleteFlow(params, manager) {
         let dataFlow = await (0, core_1.__)(Flow_1.default.findOne(params.flowId));
         if (dataFlow) {
+            if (dataFlow.status == 'on') {
+                throw new core_1.PxpError(400, 'Your flow is on. It is not possible to delete it');
+            }
             dataFlow.isActive = 0;
             dataFlow.enabled = 'N';
             dataFlow.modifiedAt = new Date();
@@ -176,6 +183,9 @@ let Flow = class Flow extends core_1.Controller {
     async saveFlowName(params, manager) {
         let dataFlow = await (0, core_1.__)(Flow_1.default.findOne(params.flowId));
         if (dataFlow) {
+            if (dataFlow.status == 'on') {
+                throw new core_1.PxpError(400, 'Your flow is on. It is not possible to change the name');
+            }
             dataFlow.name = params.name;
             dataFlow.modifiedAt = new Date();
             dataFlow.modifiedBy = this.user.username;
@@ -220,6 +230,8 @@ let Flow = class Flow extends core_1.Controller {
         let id = null;
         let newId = null;
         let flowId = null;
+        let allowModify = false;
+        let dataFlow = null;
         let taskIds = [];
         if (nodeRefIds.length === 0) {
             let nodeDelIdd = parseInt(params.board.deleteId.split("-")[1]);
@@ -229,9 +241,12 @@ let Flow = class Flow extends core_1.Controller {
                 }
             });
             flowId = lastNoded.flowId;
+            dataFlow = await (0, core_1.__)(Flow_1.default.findOne(flowId));
+            if (dataFlow.status == 'off') {
+                allowModify = true;
+            }
         }
         else {
-            flowId = params.board.flowId;
             for (const nodeId of nodeRefIds) {
                 if (nodeId != 'new') {
                     id = parseInt(nodeId.split("node-")[1]);
@@ -247,14 +262,26 @@ let Flow = class Flow extends core_1.Controller {
                         id = lastNode.nodeId;
                     }
                     taskIds.push(id);
-                    const connectionsToDel = await manager.find(NodeConnection_1.default, {
-                        where: { nodeIdChild: id }
-                    });
-                    if (connectionsToDel) {
-                        const originalNodeCIds = connectionsToDel.map((node) => node.nodeConnectionId);
-                        let flowNodeC = await (0, typeorm_1.getManager)().query(`DELETE
+                    if (!flowId) {
+                        const DataFlowId = await Node_1.default.findOne({
+                            where: {
+                                nodeId: id,
+                            }
+                        });
+                        flowId = DataFlowId.flowId;
+                    }
+                    dataFlow = await (0, core_1.__)(Flow_1.default.findOne(flowId));
+                    if (dataFlow.status == 'off') {
+                        allowModify = true;
+                        const connectionsToDel = await manager.find(NodeConnection_1.default, {
+                            where: { nodeIdChild: id }
+                        });
+                        if (connectionsToDel) {
+                            const originalNodeCIds = connectionsToDel.map((node) => node.nodeConnectionId);
+                            let flowNodeC = await (0, typeorm_1.getManager)().query(`DELETE
                                                        from twf_node_connection
                                                        WHERE node_connection_id = ${originalNodeCIds}`);
+                        }
                     }
                 }
                 else {
@@ -265,58 +292,73 @@ let Flow = class Flow extends core_1.Controller {
         if (params.board.origin == 'deleteTask') {
             let nodeDelId = parseInt(params.board.deleteId.split("-")[1]);
             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
+                const flowIdDel = await Node_1.default.findOne({ nodeId: nodeDelId });
+                flowId = flowIdDel.flowId;
+                dataFlow = await (0, core_1.__)(Flow_1.default.findOne(flowId));
+                if (dataFlow.status == 'off') {
+                    allowModify = true;
+                    //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
                                                     from twf_node_connection nd
                                                            inner join twf_node n on n.node_id = nd.node_id_child
                                                     WHERE n.node_id = ${nodeDelId}`);
-                const currentNodesIds = connectNoDel.map((record) => record.node_id);
-                // Get nodes to remove
-                const nodesToRemove = currentNodesIds.filter((nodeId) => !taskIds.includes(nodeId.toString()));
-                // Inactive nodes
-                if (nodesToRemove.length > 0) {
-                    const delNodeConnect = await manager.delete(NodeConnection_1.default, { nodeIdChild: nodesToRemove[0] });
-                    if (delNodeConnect) {
-                        let dNode = `UPDATE twf_node
+                    const currentNodesIds = connectNoDel.map((record) => record.node_id);
+                    // Get nodes to remove
+                    const nodesToRemove = currentNodesIds.filter((nodeId) => !taskIds.includes(nodeId.toString()));
+                    // Inactive nodes
+                    if (nodesToRemove.length > 0) {
+                        const delNodeConnect = await manager.delete(NodeConnection_1.default, { nodeIdChild: nodesToRemove[0] });
+                        if (delNodeConnect) {
+                            let dNode = `UPDATE twf_node
                         SET is_active = 'N'
                         WHERE node_id = ${nodesToRemove[0]}`;
-                        await manager.query(dNode);
+                            await manager.query(dNode);
+                        }
                     }
                 }
+                else {
+                    throw new core_1.PxpError(400, 'AAA: Please turn off the flow before make a change');
+                }
             }
         }
         if (nodeRefIds.length === 0) {
         }
         else {
-            for (const nodeId of taskIds) {
-                if (nodeId === 'new') {
-                    //get information about Action
-                    const newAction = await Action_1.default.findOne({ code: nodes[`${nodeId}`].action.code });
-                    const newNode = manager.create(Node_1.default, {
-                        nodeId: undefined,
-                        flowId: nodes[`${nodeId}`].flowId,
-                        isInit: 'N',
-                        actionId: newAction.actionId
+            dataFlow = await (0, core_1.__)(Flow_1.default.findOne(flowId));
+            if (dataFlow.status == 'off') {
+                allowModify = true;
+                for (const nodeId of taskIds) {
+                    if (nodeId === 'new') {
+                        //get information about Action
+                        const newAction = await Action_1.default.findOne({ code: nodes[`${nodeId}`].action.code });
+                        const newNode = manager.create(Node_1.default, {
+                            nodeId: undefined,
+                            flowId: nodes[`${nodeId}`].flowId,
+                            isInit: 'N',
+                            actionId: newAction.actionId
+                        });
+                        const saveNode = await manager.save(newNode);
+                        id = saveNode.nodeId;
+                        newId = saveNode.nodeId;
+                    }
+                    else {
+                        id = nodeId;
+                    }
+                    //save in node and node_connection
+                    const newConnection = manager.create(NodeConnection_1.default, {
+                        nodeConnectionId: undefined,
+                        nodeIdMaster: masterId,
+                        nodeIdChild: id,
                     });
-                    const saveNode = await manager.save(newNode);
-                    id = saveNode.nodeId;
-                    newId = saveNode.nodeId;
-                }
-                else {
-                    id = nodeId;
+                    masterId = id;
+                    const savedNodes = await manager.save(newConnection);
                 }
-                //save in node and node_connection
-                const newConnection = manager.create(NodeConnection_1.default, {
-                    nodeConnectionId: undefined,
-                    nodeIdMaster: masterId,
-                    nodeIdChild: id,
-                });
-                masterId = id;
-                const savedNodes = await manager.save(newConnection);
+            }
+            else {
+                throw new core_1.PxpError(400, 'Please turn off the flow before make a change');
             }
         }
-        let dataFlow = await (0, core_1.__)(Flow_1.default.findOne(flowId));
-        if (dataFlow) {
+        if (dataFlow && allowModify) {
             dataFlow.modifiedAt = new Date();
             dataFlow.modifiedBy = this.user.username;
             await (0, core_1.__)(manager.save(dataFlow));
@@ -513,11 +555,12 @@ let Flow = class Flow extends core_1.Controller {
         let dataFlow = await (0, core_1.__)(Flow_1.default.findOne(params.flowId));
         if (dataFlow) {
             if (dataFlow.status === 'off') {
-                await this.validateFlow(params.flowId, manager);
+                await this.validateFlow(params.flowId, manager, 'on');
                 //change to active
                 dataFlow.status = 'on';
             }
             else {
+                await this.validateFlow(params.flowId, manager, 'off');
                 dataFlow.status = 'off';
             }
             dataFlow.modifiedAt = new Date();
@@ -529,45 +572,77 @@ let Flow = class Flow extends core_1.Controller {
             return { success: false };
         }
     }
-    async validateFlow(flowId, manager) {
-        const nodes = await Node_1.default.find({ flowId, isActive: true });
-        let res = '';
-        if (nodes.length < 2) {
-            throw new core_1.PxpError(400, 'Your flow must have at least 2 steps. Please finish configuring it before start');
-        }
-        for (const node of nodes) {
-            const configActionType = !node.action.actionType.schemaJson ? {} : JSON.parse(node.action.actionType.schemaJson);
-            const configAction = !node.action.schemaJson ? {} : JSON.parse(node.action.schemaJson);
-            const config = _.merge({}, configActionType, configAction);
-            const required = [];
-            for (const key in config) {
-                if (config.hasOwnProperty(key)) {
-                    const prop = config[key];
-                    if (prop && typeof prop === "object" &&
-                        ((prop.validate && prop.validate.shape.includes('required')) ||
-                            (prop.formComponent && prop.formComponent.validate && prop.formComponent.validate.shape.includes('required')))) {
-                        required.push(key);
+    async validateFlow(flowId, manager, status) {
+        if (status == 'on') {
+            const nodes = await Node_1.default.find({ flowId, isActive: true });
+            let res = '';
+            if (nodes.length < 2) {
+                throw new core_1.PxpError(400, 'Your flow must have at least 2 steps. Please finish configuring it before start');
+            }
+            for (const node of nodes) {
+                const configActionType = !node.action.actionType.schemaJson ? {} : JSON.parse(node.action.actionType.schemaJson);
+                const configAction = !node.action.schemaJson ? {} : JSON.parse(node.action.schemaJson);
+                const config = _.merge({}, configActionType, configAction);
+                const required = [];
+                for (const key in config) {
+                    if (config.hasOwnProperty(key)) {
+                        const prop = config[key];
+                        if (prop && typeof prop === "object" &&
+                            ((prop.validate && prop.validate.shape.includes('required')) ||
+                                (prop.formComponent && prop.formComponent.validate && prop.formComponent.validate.shape.includes('required')))) {
+                            required.push(key);
+                        }
                     }
                 }
-            }
-            const valueNode = !node.actionConfigJson ? {} : JSON.parse(node.actionConfigJson);
-            const valueAction = !node.action.configJsonTemplate ? {} : JSON.parse(node.action.configJsonTemplate);
-            const values = _.merge({}, valueAction, valueNode);
-            const missingRequired = [];
-            required.forEach((property) => {
-                if (!values.hasOwnProperty(property)) {
-                    missingRequired.push(property);
+                const valueNode = !node.actionConfigJson ? {} : JSON.parse(node.actionConfigJson);
+                const valueAction = !node.action.configJsonTemplate ? {} : JSON.parse(node.action.configJsonTemplate);
+                const values = _.merge({}, valueAction, valueNode);
+                const missingRequired = [];
+                required.forEach((property) => {
+                    if (!values.hasOwnProperty(property)) {
+                        missingRequired.push(property);
+                    }
+                });
+                if (missingRequired.length > 0) {
+                    res += `In node ${node.action.name} you have missing fields: ${missingRequired.join(', ')}, `;
                 }
-            });
-            if (missingRequired.length > 0) {
-                res += `In node ${node.action.name} you have missing fields: ${missingRequired.join(', ')}, `;
             }
+            if (res != '') {
+                res = res.slice(0, -2);
+                throw new core_1.PxpError(400, 'Please resolve these issues before starting the flow: ' + res);
+            }
+            return true;
         }
-        if (res != '') {
-            res = res.slice(0, -2);
-            throw new core_1.PxpError(400, 'Please resolve these issues before starting the flow: ' + res);
+        else {
+            const flowInstances = await FlowInstance_1.default.find({ flowId, isActive: true });
+            const validFlowInstances = [];
+            for (const flowInstance of flowInstances) {
+                if (flowInstance.status != 'processed') {
+                    validFlowInstances.push(flowInstance.flowInstanceId);
+                }
+                else {
+                    let flowInstanceId = flowInstance.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) {
+                throw new core_1.PxpError(400, 'Your flow have at least 1 instance active. Please finish it before change off');
+            }
+            return true;
         }
-        return true;
     }
     async basicFlowList(params) {
         const isActive = params._isActive;

package/dist/controllers/Node.d.ts

@@ -8,6 +8,7 @@
  *  -------------- ----------- -------------- ------------------------------------
  * 08-Jul-2021                  Favio Figueroa          Created
  * 04-Sep-2023    SP08SEP23     Rensi Arteaga           add modifiedAt for flows
+ * 29-Sep-2023    SP06OCT23     Mercedes Zambrana       Add validation when flow is on
  * ******************************************************************************
  */
 import { EntityManager } from 'typeorm';

package/dist/controllers/Node.js

@@ -9,6 +9,7 @@
  *  -------------- ----------- -------------- ------------------------------------
  * 08-Jul-2021                  Favio Figueroa          Created
  * 04-Sep-2023    SP08SEP23     Rensi Arteaga           add modifiedAt for flows
+ * 29-Sep-2023    SP06OCT23     Mercedes Zambrana       Add validation when flow is on
  * ******************************************************************************
  */
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -76,27 +77,36 @@ let Node = class Node extends core_1.Controller {
         Object.entries(params.__metadata).forEach(([nameKey, values]) => {
             actionConfigJson[nameKey] = `{{ ${values.name} }}`;
         });
-        const upd = await (0, core_1.__)(manager.update(Node_1.default, params.nodeId, {
-            actionConfigJson: JSON.stringify(actionConfigJson),
-        }));
+        let allowChange = false;
         let dataNode = await (0, core_1.__)(Node_1.default.findOne(params.nodeId));
         if (dataNode) {
             let dataFlow = await (0, core_1.__)(Flow_1.default.findOne(dataNode.flowId));
             if (dataFlow) {
-                dataFlow.modifiedAt = new Date();
-                dataFlow.modifiedBy = this.user.username;
-                await (0, core_1.__)(manager.save(dataFlow));
+                if (dataFlow.status != 'on') {
+                    allowChange = true;
+                    dataFlow.modifiedAt = new Date();
+                    dataFlow.modifiedBy = this.user.username;
+                    await (0, core_1.__)(manager.save(dataFlow));
+                }
             }
         }
-        return {
-            actionConfigJson,
-            success: true,
-            nodeId: params.nodeId,
-            upd
-        };
+        if (allowChange) {
+            const upd = await (0, core_1.__)(manager.update(Node_1.default, params.nodeId, {
+                actionConfigJson: JSON.stringify(actionConfigJson),
+            }));
+            return {
+                actionConfigJson,
+                success: true,
+                nodeId: params.nodeId,
+                upd,
+                msg: `Changes have been saved successfully.`
+            };
+        }
+        else {
+            throw new core_1.PxpError(400, 'Please turn off the flow before make a change');
+        }
     }
     async getParameterizedNode(params, manager) {
-        console.log('getParameterizedNode llega');
         lodash_1.default.templateSettings.interpolate = /{{([\s\S]+?)}}/g;
         const { nodeId, flowId, substitutionsSchemaJson = {} } = params;
         const tNodeData = (0, core_1.__)(Node_1.default.findOne(nodeId));
@@ -122,11 +132,6 @@ let Node = class Node extends core_1.Controller {
           tFieldMapData
         ]);*/
         const { actionConfigJson, action: { schemaJson, configJsonTemplate, actionType: { schemaJson: schemaJsonFromActionType } } } = nodeData;
-        console.log('nodeData actionConfigJson', actionConfigJson);
-        console.log('action schemaJson', schemaJson);
-        console.log('action configJsonTemplate', configJsonTemplate);
-        console.log('actionType schemaJsonFromActionType', schemaJsonFromActionType);
-        console.log('actionType fieldMapData', fieldMapData);
         const actionConfigJsonObject = actionConfigJson ? JSON.parse(actionConfigJson) : {};
         const configJsonTemplateObject = configJsonTemplate ? JSON.parse(configJsonTemplate) : {};
         let schemaJsonFromActionTypeObject = schemaJsonFromActionType ? JSON.parse(lodash_1.default.template(schemaJsonFromActionType)(substitutionsSchemaJson)) : {};
@@ -163,14 +168,14 @@ let Node = class Node extends core_1.Controller {
         // this logic is for autocomplete for moment
         const findFieldInConfigForComponent = async (json, value) => {
             if (json.formComponent && json.formComponent.type === 'AutoComplete') {
-                const url = json.formComponent.store.axios.url;
-                const method = json.formComponent.store.axios.method;
-                const data = json.formComponent.store.axios.data;
+                const url = json.formComponent.store.axios.config.url;
+                const method = json.formComponent.store.axios.config.method;
+                const data = json.formComponent.store.axios.config.data;
                 const idDD = json.formComponent.store.idDD;
                 const descDD = json.formComponent.store.descDD;
                 const config = {
                     method: method,
-                    url: url,
+                    url: `http://localhost:${process.env.PORT}${url}`,
                     headers: {
                         'Authorization': '' + process.env.TOKEN_PXP_ND + '',
                         'Content-Type': 'application/json'
@@ -205,7 +210,6 @@ let Node = class Node extends core_1.Controller {
             }
             return undefined;
         };
-        console.log('mergeValues', mergeValues);
         for (const [nameKey, value] of Object.entries(mergeValues)) {
             if (schemaJsonObject[nameKey]) {
                 const descValue = await (0, core_1.__)(findFieldInConfigForComponent(schemaJsonObject[nameKey], value));
@@ -217,7 +221,7 @@ let Node = class Node extends core_1.Controller {
                 };
             }
         }
-        console.log('111 schemaJsonObject', schemaJsonObject);
+        //console.log('111 schemaJsonObject',schemaJsonObject)
         /*Object.entries(schemaJsonObject)
             .filter(([, value]: [nameKey: string, value: any]) => value.initialValue === undefined && value.fromFieldMap === undefined && value.fieldMappingType)
             .forEach(([nameKey]) => {
@@ -227,7 +231,7 @@ let Node = class Node extends core_1.Controller {
                 ...(hasUniqueByTypeInMappingData && { fromFieldMap: true, ...hasUniqueByTypeInMappingData }),
               };
             })*/
-        console.log('222 schemaJsonObject', schemaJsonObject);
+        //    console.log('222 schemaJsonObject',schemaJsonObject)
         return {
             actionConfigJsonObject,
             configJsonTemplateObject,

package/package.json

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