@pxp-nd/flow 1.0.23 → 1.0.24

package/README.md

@@ -1 +1 @@
-# flow-nd
+# flow-nd

package/dist/controllers/Node.js

@@ -32,6 +32,7 @@ const core_1 = require("@pxp-nd/core");
 const lodash_1 = __importDefault(require("lodash"));
 const FieldMap_1 = __importDefault(require("../entity/FieldMap"));
 const OriginName_1 = __importDefault(require("../entity/OriginName"));
+const axios_1 = __importDefault(require("axios"));
 let Node = class Node extends core_1.Controller {
     async getNodeData(node, dataId, manager) {
         const { action: { originName, originKey } } = node;
@@ -82,19 +83,20 @@ let Node = class Node extends core_1.Controller {
     async getParameterizedNode(params, manager) {
         lodash_1.default.templateSettings.interpolate = /{{([\s\S]+?)}}/g;
         const { nodeId, flowId, substitutionsSchemaJson } = params;
-        /*const tNodeOrigin =  __(NodeModel.find({
-          relations: ['action'],
-          where: {
-            flowId: flowId,
-            action: {
-              originName: Not(IsNull())
+        const tNodeOrigin = await core_1.__(Node_1.default.findOne({
+            relations: ['action'],
+            where: {
+                flowId: flowId,
+                isInit: 'Y',
+                action: {
+                    originName: typeorm_1.Not(typeorm_1.IsNull())
+                }
             }
-          }
-        }));*/
+        }));
         const tNodeData = core_1.__(Node_1.default.findOne(nodeId));
         const tFieldMapData = core_1.__(manager.createQueryBuilder(FieldMap_1.default, 'fm')
             .innerJoin(OriginName_1.default, 'on', 'on.originNameId = fm.originNameId')
-            .where("on.name = :n ", { n: 'v_member' })
+            .where("on.name = :n ", { n: tNodeOrigin.action.originName })
             .getMany());
         //const nodeOrigin = await tNodeOrigin; todo
         const nodeData = await tNodeData;
@@ -126,15 +128,50 @@ let Node = class Node extends core_1.Controller {
                 metadata: found
             };
         };
-        Object.entries(mergeValues).forEach(([nameKey, value]) => {
+        // this logic is for autocomplete for moment
+        const findFieldInConfigForComponent = async (json, value) => {
+            console.log('json', json);
+            if (json.formComponent && json.formComponent.type === 'AutoComplete') {
+                console.log('json.formComponent', json.formComponent.store);
+                const url = json.formComponent.store.axios.url;
+                const method = json.formComponent.store.axios.method;
+                const data = json.formComponent.store.axios.data;
+                const idDD = json.formComponent.store.idDD;
+                const descDD = json.formComponent.store.descDD;
+                const config = {
+                    method: method,
+                    url: url,
+                    headers: {
+                        'Authorization': '' + process.env.TOKEN_PXP_ND + '',
+                        'Content-Type': 'application/json'
+                    },
+                    data: {
+                        ...data,
+                        [idDD]: value
+                    }
+                };
+                console.log('config', config);
+                // @ts-ignore
+                const resControllerAxios = await core_1.__(axios_1.default(config));
+                console.log('resControllerAxios', resControllerAxios.data.data);
+                console.log('resControllerAxios', resControllerAxios.data.data[descDD]);
+                const desc = resControllerAxios.data.data[descDD];
+                return desc;
+            }
+            return undefined;
+        };
+        for (const [nameKey, value] of Object.entries(mergeValues)) {
             if (schemaJsonObject[nameKey]) {
+                const descValue = await core_1.__(findFieldInConfigForComponent(schemaJsonObject[nameKey], value));
+                console.log('descValue', descValue);
                 schemaJsonObject[nameKey] = {
                     ...schemaJsonObject[nameKey],
                     initialValue: value,
+                    ...(descValue && { descValue: descValue }),
                     ...(verifyIfValueFromFieldMap(value) && { fromFieldMap: true, ...findFieldMapAndMetaData(value) }),
                 };
             }
-        });
+        }
         return {
             actionConfigJsonObject,
             configJsonTemplateObject,

package/dist/subscribers/Event.js

@@ -46,8 +46,7 @@ let Event = class Event {
             const executeView = `select * from ${originName} where ${originKey} = ${newEvent.dataId}`;
             const resExecuteView = await typeorm_1.getManager().query(executeView);
             const flow = await core_1.__(Flow_1.default.findOne({ where: { flowId: n.flowId } }));
-            const boolConditions = await core_1.__(this.checkConditions(resExecuteView[0], n.flowId, newEvent.actionId));
-            if (flow.vendorId == resExecuteView[0].vendor_id && boolConditions) {
+            if (flow.vendorId == resExecuteView[0].vendor_id && this.checkConditions(resExecuteView[0], n.flowId, newEvent.actionId)) {
                 //now check all conditions
                 let flowInstance = new FlowInstance_1.default();
                 flowInstance.flowId = n.flowId;

package/package.json

@@ -1,45 +1,45 @@
-{
-  "name": "@pxp-nd/flow",
-  "version": "1.0.23",
-  "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",
-  "devDependencies": {
-    "@types/lodash": "^4.14.172",
-    "@types/node": "^16.4.13",
-    "rimraf": "^3.0.2",
-    "tsc-watch": "^4.2.9",
-    "typescript": "^4.2.4"
-  },
-  "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"
-  }
-}
+{
+  "name": "@pxp-nd/flow",
+  "version": "1.0.24",
+  "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",
+  "devDependencies": {
+    "@types/lodash": "^4.14.172",
+    "@types/node": "^16.4.13",
+    "rimraf": "^3.0.2",
+    "tsc-watch": "^4.2.9",
+    "typescript": "^4.2.4"
+  },
+  "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"
+  }
+}

package/tsconfig.json

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