@pxp-nd/flow 1.0.69 → 1.0.71

package/dist/controllers/Flow.d.ts

@@ -35,6 +35,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>;
     basicFlowList(params: Record<string, any>): Promise<unknown>;
 }
 export default Flow;

package/dist/controllers/Flow.js

@@ -18,12 +18,35 @@
  * 01-Sep-2023    SP08SEP23     Rensi Arteaga          add base flow list
  * ******************************************************************************
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 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);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
@@ -33,6 +56,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const typeorm_1 = require("typeorm");
 const core_1 = require("@pxp-nd/core");
+const _ = __importStar(require("lodash"));
 const Node_1 = __importDefault(require("../entity/Node"));
 const Action_1 = __importDefault(require("../entity/Action"));
 const NodeConnection_1 = __importDefault(require("../entity/NodeConnection"));
@@ -488,6 +512,7 @@ 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);
                 //change to active
                 dataFlow.status = 'on';
             }
@@ -503,10 +528,48 @@ 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 = '';
+        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);
+                }
+            });
+            if (missingRequired.length > 0) {
+                res += `In node ${node.action.name} ${node.nodeId} 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;
+    }
     async basicFlowList(params) {
         const isActive = params._isActive;
         const type = params._type;
         const vendorId = params._vendorId;
+        const allowedColumns = ['name', 'description'];
         const queryBuilder = await (0, typeorm_1.getManager)()
             .createQueryBuilder()
             .select([
@@ -540,8 +603,11 @@ let Flow = class Flow extends core_1.Controller {
         if (vendorId) {
             queryBuilder.andWhere('f.vendor_id = :vendorId', { vendorId });
         }
-        // Sorting and pagination
-        queryBuilder.orderBy(`f.${params.sort}`, params.dir).skip(params.start).take(params.limit);
+        if (allowedColumns.includes(params.genericFilterFields)) {
+            if (params.genericFilterFields && params.genericFilterValue) {
+                queryBuilder.andWhere(`f.${params.genericFilterFields} LIKE :genericFilterValue`, { genericFilterValue: `%${params.genericFilterValue}%` });
+            }
+        }
         queryBuilder.groupBy([
             'f.flow_id',
             'f.vendor_id',
@@ -560,6 +626,12 @@ let Flow = class Flow extends core_1.Controller {
             'f.icon',
             'f.status',
         ]);
+        // Sorting and pagination
+        //queryBuilder.orderBy(`f.${params.sort}`, params.dir).skip(params.start).take(params.limit);
+        // Sorting and pagination
+        queryBuilder.orderBy(`f.${params.sort}`, params.dir);
+        // Agrega manualmente la cláusula LIMIT y OFFSET
+        queryBuilder.limit(params.limit).offset(params.start);
         const data = await queryBuilder.getRawMany();
         // Construct the count query
         const countQuery = await (0, typeorm_1.getManager)()
@@ -576,9 +648,14 @@ let Flow = class Flow extends core_1.Controller {
         if (vendorId) {
             countQuery.andWhere('f.vendor_id = :vendorId', { vendorId });
         }
+        if (allowedColumns.includes(params.genericFilterFields)) {
+            if (params.genericFilterFields && params.genericFilterValue) {
+                countQuery.andWhere(`f.${params.genericFilterFields} LIKE :genericFilterValue`, { genericFilterValue: `%${params.genericFilterValue}%` });
+            }
+        }
         const totalCount = await countQuery.getRawOne();
-        const total = totalCount.count;
-        return { data, total };
+        const count = totalCount.count;
+        return { data, count };
     }
 };
 __decorate([

package/package.json

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