@pxp-nd/flow 1.0.89 → 1.0.91

package/dist/controllers/Flow.js

@@ -65,6 +65,7 @@ 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"));
 //import {configFacebookStrategy} from "./passport-facebook";
 let Flow = class Flow extends core_1.Controller {
     async get(params) {
@@ -378,20 +379,17 @@ let Flow = class Flow extends core_1.Controller {
             .where(`n.isActive = 1 and n.flowId = :flowId`, { flowId: params.flowId })
             .getOne();
         let cond = " and 0=0";
-        console.log("totalNodes::::", totalNodes);
         if (!totalNodes) {
             cond = " and at.name= 'EVENT' ";
         }
         else {
             const oName = (_a = totalNodes === null || totalNodes === void 0 ? void 0 : totalNodes.action) === null || _a === void 0 ? void 0 : _a.originName;
             if (flow.templateType == 'funnel') {
-                console.log("es funnel???");
-                cond = `and at.name = 'PAGE' `;
+                cond = `and (at.name ='PAGE') and (a.originName is null or a.originName = '${oName}')`;
             }
             else {
                 cond = `and (at.name != 'EVENT' and at.name!='PAGE') and (a.originName is null or a.originName = '${oName}')`;
             }
-            console.log("cond:", cond);
         }
         let actions = await (0, typeorm_1.getManager)()
             .createQueryBuilder(Action_1.default, "a")
@@ -604,6 +602,12 @@ let Flow = class Flow extends core_1.Controller {
                 const valueNode = !node.actionConfigJson ? {} : JSON.parse(node.actionConfigJson);
                 const valueAction = !node.action.configJsonTemplate ? {} : JSON.parse(node.action.configJsonTemplate);
                 const values = _.merge({}, valueAction, valueNode);
+                //valid controllerValidation
+                const { action: { actionType } } = node;
+                const { validationController } = actionType;
+                const nodeController = new Node_2.default('flow-nd');
+                await nodeController.executeValidationController({ validationController, actionConfigJson: values, showException: true });
+                //end valid controller
                 const missingRequired = [];
                 required.forEach((property) => {
                     if (!values.hasOwnProperty(property)) {

package/dist/controllers/Node.d.ts

@@ -9,15 +9,26 @@
  * 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
+ * 19-Jan-2025    8201489097    Favio Figueroa          Add Controller Validation
  * ******************************************************************************
  */
 import { EntityManager } from 'typeorm';
 import { Controller } from '@pxp-nd/core';
+interface InterfaceParamsExecuteValidationController {
+    validationController: string;
+    actionConfigJson: Record<any, any>;
+    showException?: boolean;
+}
+interface InterfaceResExecuteValidationController {
+    validated: boolean;
+    msg: string;
+}
 declare class Node extends Controller {
     getNodeData(node: any, dataId: any, manager: EntityManager): Promise<string>;
     add(params: Record<string, any>, manager: EntityManager): Promise<unknown>;
     AddActionConfigJson(params: Record<string, any>, manager: EntityManager): Promise<unknown>;
     getParameterizedNode(params: Record<string, any>, manager: EntityManager): Promise<unknown>;
     executeActionJson(params: Record<string, any>, manager: EntityManager): Promise<unknown>;
+    executeValidationController(params: InterfaceParamsExecuteValidationController): Promise<InterfaceResExecuteValidationController>;
 }
 export default Node;

package/dist/controllers/Node.js

@@ -10,6 +10,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
+ * 19-Jan-2025    8201489097    Favio Figueroa          Add Controller Validation
  * ******************************************************************************
  */
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -73,6 +74,7 @@ let Node = class Node extends core_1.Controller {
         return nodeData;
     }
     async AddActionConfigJson(params, manager) {
+        let validated = { validated: true, msg: "SUCCESS" };
         let { nodeId: removed, __metadata: removed2, ...actionConfigJson } = params;
         Object.entries(params.__metadata).forEach(([nameKey, values]) => {
             actionConfigJson[nameKey] = `{{ ${values.name} }}`;
@@ -90,6 +92,9 @@ let Node = class Node extends core_1.Controller {
                 }
             }
         }
+        const { action: { actionType } } = dataNode;
+        const { validationController } = actionType;
+        await this.executeValidationController({ validationController, actionConfigJson, showException: true });
         if (allowChange) {
             const upd = await (0, core_1.__)(manager.update(Node_1.default, params.nodeId, {
                 actionConfigJson: JSON.stringify(actionConfigJson),
@@ -265,6 +270,28 @@ let Node = class Node extends core_1.Controller {
             ...resExecuteView[0]
         };
     }
+    async executeValidationController(params) {
+        const { validationController, actionConfigJson, showException = false } = params;
+        let validated = { validated: true, msg: "NOTHING TO VALIDATE" };
+        if (validationController) {
+            const config = {
+                method: "post",
+                url: `http://localhost:${process.env.PORT}/api/${validationController}`,
+                headers: {
+                    Authorization: "" + process.env.TOKEN_PXP_ND + "",
+                    "Content-Type": "application/json",
+                },
+                data: actionConfigJson,
+            };
+            // @ts-ignore
+            const resValidationControllerAxios = await (0, core_1.__)((0, axios_1.default)(config));
+            validated = resValidationControllerAxios.data || { validated: false, msg: "ERROR" };
+            if (!validated.validated && showException) {
+                throw new core_1.PxpError(400, validated.msg);
+            }
+        }
+        return validated;
+    }
 };
 __decorate([
     (0, core_1.Post)(),

package/dist/entity/ActionType.d.ts

@@ -1,3 +1,15 @@
+/**
+ * ******************************************************************************
+ * NAME: Node.ts
+ * DEVELOPER: Favio Figueroa
+ * DESCRIPTION: Flow Controller
+ * REVISIONS:
+ * Date             Change ID     Author Description
+ *  -------------- ----------- -------------- ------------------------------------
+ * 08-Jul-2021                  Favio Figueroa          Created
+ * 19-Jan-2025    8201489097    Favio Figueroa          Added validation_controller
+ * ******************************************************************************
+ */
 import Action from './Action';
 import { PxpEntity } from '@pxp-nd/common';
 export default class ActionType extends PxpEntity {
@@ -12,5 +24,6 @@ export default class ActionType extends PxpEntity {
     controller: string;
     extraSchemaJson: string;
     actionsJson: string;
+    validationController: string;
     actions: Action[];
 }

package/dist/entity/ActionType.js

@@ -1,4 +1,16 @@
 "use strict";
+/**
+ * ******************************************************************************
+ * NAME: Node.ts
+ * DEVELOPER: Favio Figueroa
+ * DESCRIPTION: Flow Controller
+ * REVISIONS:
+ * Date             Change ID     Author Description
+ *  -------------- ----------- -------------- ------------------------------------
+ * 08-Jul-2021                  Favio Figueroa          Created
+ * 19-Jan-2025    8201489097    Favio Figueroa          Added validation_controller
+ * ******************************************************************************
+ */
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -61,6 +73,10 @@ __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: 'validation_controller', type: 'text' }),
+    __metadata("design:type", String)
+], ActionType.prototype, "validationController", void 0);
 __decorate([
     (0, typeorm_1.OneToMany)(() => Action_1.default, (action) => action.actionType),
     __metadata("design:type", Array)

package/package.json

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

package/.yalc/@pxp-nd/flow/README.md

@@ -1 +0,0 @@
-# flow-nd

package/.yalc/@pxp-nd/flow/package.json

@@ -1,39 +0,0 @@
-{
-  "name": "@pxp-nd/flow",
-  "version": "1.0.83",
-  "description": "Workflow module for pxp-nd framework",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "prepublish": "tsc",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "rimraf ./dist && tsc",
-    "dev:publish": "yalc publish",
-    "prod:publish": "npm publish",
-    "dev": "tsc-watch --target es2017 --outDir ./dist --onSuccess \"node .\"",
-    "start": "npm run build && node dist/index.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/kplian/flow-nd.git"
-  },
-  "keywords": [
-    "flow",
-    "pxp",
-    "pxp-nd"
-  ],
-  "author": "Kplian",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/kplian/flow-nd/issues"
-  },
-  "homepage": "https://github.com/kplian/flow-nd#readme",
-  "dependencies": {
-    "@pxp-nd/common": "^1.1.4",
-    "@pxp-nd/core": "^1.1.13",
-    "axios": "^0.21.1",
-    "lodash": "^4.17.21",
-    "typeorm": "^0.2.36"
-  },
-  "yalcSig": "cde9f14a08a99b57ae1fa35548ae318d"
-}

package/.yalc/@pxp-nd/flow/tsconfig.json

@@ -1,29 +0,0 @@
-{
-    "compilerOptions": {
-      "target": "es2019",
-      "module": "commonjs",
-      "allowJs": false,
-      "outDir": "dist",
-      "rootDir": "src",
-      "strict": false,
-      "noImplicitAny": true,
-      "esModuleInterop": true,
-      "resolveJsonModule": true,
-      "skipLibCheck": true,
-      "forceConsistentCasingInFileNames": true,
-      "emitDecoratorMetadata": true,
-      "experimentalDecorators": true,
-      "moduleResolution": "node",
-      "declaration": true,
-      "isolatedModules": true,
-      "strictPropertyInitialization": false,
-    },
-    "include": [
-      "custom.d.ts",
-      "src/**/*.ts"
-    ],
-    "exclude": [
-      "node_modules",
-      "dist"
-    ]
-  }

package/.yalc/@pxp-nd/flow/yalc.sig

@@ -1 +0,0 @@
-cde9f14a08a99b57ae1fa35548ae318d

package/yalc.lock

@@ -1,9 +0,0 @@
-{
-  "version": "v1",
-  "packages": {
-    "@pxp-nd/flow": {
-      "signature": "cde9f14a08a99b57ae1fa35548ae318d",
-      "file": true
-    }
-  }
-}