@pxp-nd/flow 1.0.87 → 1.0.88
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -0,0 +1 @@
|
|
|
1
|
+
# flow-nd
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "@pxp-nd/flow",
|
|
3
|
+
"version": "1.0.83",
|
|
4
|
+
"description": "Workflow module for pxp-nd framework",
|
|
5
|
+
"main": "dist/index.js",
|
|
6
|
+
"types": "dist/index.d.ts",
|
|
7
|
+
"prepublish": "tsc",
|
|
8
|
+
"scripts": {
|
|
9
|
+
"test": "echo \"Error: no test specified\" && exit 1",
|
|
10
|
+
"build": "rimraf ./dist && tsc",
|
|
11
|
+
"dev:publish": "yalc publish",
|
|
12
|
+
"prod:publish": "npm publish",
|
|
13
|
+
"dev": "tsc-watch --target es2017 --outDir ./dist --onSuccess \"node .\"",
|
|
14
|
+
"start": "npm run build && node dist/index.js"
|
|
15
|
+
},
|
|
16
|
+
"repository": {
|
|
17
|
+
"type": "git",
|
|
18
|
+
"url": "git+https://github.com/kplian/flow-nd.git"
|
|
19
|
+
},
|
|
20
|
+
"keywords": [
|
|
21
|
+
"flow",
|
|
22
|
+
"pxp",
|
|
23
|
+
"pxp-nd"
|
|
24
|
+
],
|
|
25
|
+
"author": "Kplian",
|
|
26
|
+
"license": "ISC",
|
|
27
|
+
"bugs": {
|
|
28
|
+
"url": "https://github.com/kplian/flow-nd/issues"
|
|
29
|
+
},
|
|
30
|
+
"homepage": "https://github.com/kplian/flow-nd#readme",
|
|
31
|
+
"dependencies": {
|
|
32
|
+
"@pxp-nd/common": "^1.1.4",
|
|
33
|
+
"@pxp-nd/core": "^1.1.13",
|
|
34
|
+
"axios": "^0.21.1",
|
|
35
|
+
"lodash": "^4.17.21",
|
|
36
|
+
"typeorm": "^0.2.36"
|
|
37
|
+
},
|
|
38
|
+
"yalcSig": "cde9f14a08a99b57ae1fa35548ae318d"
|
|
39
|
+
}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
{
|
|
2
|
+
"compilerOptions": {
|
|
3
|
+
"target": "es2019",
|
|
4
|
+
"module": "commonjs",
|
|
5
|
+
"allowJs": false,
|
|
6
|
+
"outDir": "dist",
|
|
7
|
+
"rootDir": "src",
|
|
8
|
+
"strict": false,
|
|
9
|
+
"noImplicitAny": true,
|
|
10
|
+
"esModuleInterop": true,
|
|
11
|
+
"resolveJsonModule": true,
|
|
12
|
+
"skipLibCheck": true,
|
|
13
|
+
"forceConsistentCasingInFileNames": true,
|
|
14
|
+
"emitDecoratorMetadata": true,
|
|
15
|
+
"experimentalDecorators": true,
|
|
16
|
+
"moduleResolution": "node",
|
|
17
|
+
"declaration": true,
|
|
18
|
+
"isolatedModules": true,
|
|
19
|
+
"strictPropertyInitialization": false,
|
|
20
|
+
},
|
|
21
|
+
"include": [
|
|
22
|
+
"custom.d.ts",
|
|
23
|
+
"src/**/*.ts"
|
|
24
|
+
],
|
|
25
|
+
"exclude": [
|
|
26
|
+
"node_modules",
|
|
27
|
+
"dist"
|
|
28
|
+
]
|
|
29
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
cde9f14a08a99b57ae1fa35548ae318d
|
package/dist/controllers/Flow.js
CHANGED
|
@@ -378,13 +378,20 @@ let Flow = class Flow extends core_1.Controller {
|
|
|
378
378
|
.where(`n.isActive = 1 and n.flowId = :flowId`, { flowId: params.flowId })
|
|
379
379
|
.getOne();
|
|
380
380
|
let cond = " and 0=0";
|
|
381
|
+
console.log("totalNodes::::", totalNodes);
|
|
381
382
|
if (!totalNodes) {
|
|
382
383
|
cond = " and at.name= 'EVENT' ";
|
|
383
384
|
}
|
|
384
385
|
else {
|
|
385
386
|
const oName = (_a = totalNodes === null || totalNodes === void 0 ? void 0 : totalNodes.action) === null || _a === void 0 ? void 0 : _a.originName;
|
|
386
|
-
|
|
387
|
-
|
|
387
|
+
if (flow.templateType == 'funnel') {
|
|
388
|
+
console.log("es funnel???");
|
|
389
|
+
cond = `and at.name = 'PAGE' `;
|
|
390
|
+
}
|
|
391
|
+
else {
|
|
392
|
+
cond = `and (at.name != 'EVENT' and at.name!='PAGE') and (a.originName is null or a.originName = '${oName}')`;
|
|
393
|
+
}
|
|
394
|
+
console.log("cond:", cond);
|
|
388
395
|
}
|
|
389
396
|
let actions = await (0, typeorm_1.getManager)()
|
|
390
397
|
.createQueryBuilder(Action_1.default, "a")
|
|
@@ -692,7 +699,6 @@ let Flow = class Flow extends core_1.Controller {
|
|
|
692
699
|
}
|
|
693
700
|
}
|
|
694
701
|
const applyDynamicFilters = (queryBuilder, filters, logicOperator) => {
|
|
695
|
-
console.log('applyDynamicFilters', queryBuilder);
|
|
696
702
|
filters.forEach((filter, index) => {
|
|
697
703
|
const { field, operator, value } = filter;
|
|
698
704
|
const queryField = `f.${field}`;
|
package/package.json
CHANGED