@pxp-nd/flow 1.0.86 → 1.0.88

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

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

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

@@ -0,0 +1,39 @@
+{
+  "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

@@ -0,0 +1,29 @@
+{
+    "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

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

package/dist/controllers/Flow.js

@@ -378,13 +378,20 @@ 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;
-            //
-            cond = `and at.name != 'EVENT' and (a.originName is null or a.originName = '${oName}')`;
+            if (flow.templateType == 'funnel') {
+                console.log("es funnel???");
+                cond = `and at.name = 'PAGE' `;
+            }
+            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")
@@ -691,52 +698,53 @@ let Flow = class Flow extends core_1.Controller {
                 queryBuilder.andWhere(`f.${params.genericFilterFields} LIKE :genericFilterValue`, { genericFilterValue: `%${params.genericFilterValue}%` });
             }
         }
+        const applyDynamicFilters = (queryBuilder, filters, logicOperator) => {
+            filters.forEach((filter, index) => {
+                const { field, operator, value } = filter;
+                const queryField = `f.${field}`;
+                const parameterName = `filterValue${index}`;
+                let condition;
+                switch (operator) {
+                    case 'contains':
+                        condition = `${queryField} LIKE :${parameterName}`;
+                        queryBuilder.setParameter(parameterName, `%${value}%`);
+                        break;
+                    case 'equals':
+                        condition = `${queryField} = :${parameterName}`;
+                        queryBuilder.setParameter(parameterName, value);
+                        break;
+                    case 'startsWith':
+                        condition = `${queryField} LIKE :${parameterName}`;
+                        queryBuilder.setParameter(parameterName, `${value}%`);
+                        break;
+                    case 'endsWith':
+                        condition = `${queryField} LIKE :${parameterName}`;
+                        queryBuilder.setParameter(parameterName, `%${value}`);
+                        break;
+                    case 'isEmpty':
+                        condition = `${queryField} IS NULL OR ${queryField} = ''`;
+                        break;
+                    case 'isNotEmpty':
+                        condition = `${queryField} IS NOT NULL AND ${queryField} <> ''`;
+                        break;
+                    case 'isAnyOf':
+                        condition = `${queryField} IN (:...${parameterName})`;
+                        queryBuilder.setParameter(parameterName, value.split(','));
+                        break;
+                    default:
+                        throw new Error(`Operator ${operator} is not supported.`);
+                }
+                if (index === 0) {
+                    queryBuilder.andWhere(condition);
+                }
+                else {
+                    queryBuilder[logicOperator === 'OR' ? 'orWhere' : 'andWhere'](condition);
+                }
+            });
+        };
         // Dynamic filters
-        filters.forEach((filter, index) => {
-            const { field, operator, value } = filter;
-            //if (allowedColumns.includes(field)) {
-            const queryField = `f.${field}`;
-            const parameterName = `filterValue${index}`;
-            let condition;
-            switch (operator) {
-                case 'contains':
-                    condition = `${queryField} LIKE :${parameterName}`;
-                    queryBuilder.setParameter(parameterName, `%${value}%`);
-                    break;
-                case 'equals':
-                    condition = `${queryField} = :${parameterName}`;
-                    queryBuilder.setParameter(parameterName, value);
-                    break;
-                case 'startsWith':
-                    condition = `${queryField} LIKE :${parameterName}`;
-                    queryBuilder.setParameter(parameterName, `${value}%`);
-                    break;
-                case 'endsWith':
-                    condition = `${queryField} LIKE :${parameterName}`;
-                    queryBuilder.setParameter(parameterName, `%${value}`);
-                    break;
-                case 'isEmpty':
-                    condition = `${queryField} IS NULL OR ${queryField} = ''`;
-                    break;
-                case 'isNotEmpty':
-                    condition = `${queryField} IS NOT NULL AND ${queryField} <> ''`;
-                    break;
-                case 'isAnyOf':
-                    condition = `${queryField} IN (:...${parameterName})`;
-                    queryBuilder.setParameter(parameterName, value.split(',')); // Asume que `value` es una cadena separada por comas.
-                    break;
-                // Puedes agregar más casos aquí si hay otros operadores.
-                default:
-                    throw new Error(`Operator ${operator} is not supported.`);
-            }
-            if (index === 0) {
-                queryBuilder.andWhere(condition);
-            }
-            else {
-                queryBuilder[logicOperator === 'OR' ? 'orWhere' : 'andWhere'](condition);
-            }
-            //}
-        });
+        // Aplicar filtros dinámicos
+        applyDynamicFilters(queryBuilder, filters, logicOperator);
         queryBuilder.groupBy([
             'f.flow_id',
             'f.vendor_id',
@@ -782,6 +790,8 @@ let Flow = class Flow extends core_1.Controller {
                 countQuery.andWhere(`f.${params.genericFilterFields} LIKE :genericFilterValue`, { genericFilterValue: `%${params.genericFilterValue}%` });
             }
         }
+        // Aplicar los mismos filtros dinámicos al query de conteo
+        applyDynamicFilters(countQuery, filters, logicOperator);
         const totalCount = await countQuery.getRawOne();
         const count = totalCount.count;
         return { data, count };

package/package.json

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

package/yalc.lock

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