@pxp-nd/flow 1.0.20 → 1.0.24

package/dist/controllers/Node.js

@@ -29,8 +29,10 @@ const typeorm_1 = require("typeorm");
 const Node_1 = __importDefault(require("../entity/Node"));
 const NodeConnection_1 = __importDefault(require("../entity/NodeConnection"));
 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;
@@ -79,20 +81,22 @@ let Node = class Node extends core_1.Controller {
         };
     }
     async getParameterizedNode(params, manager) {
-        const { nodeId, flowId } = params;
-        /*const tNodeOrigin =  __(NodeModel.find({
-          relations: ['action'],
-          where: {
-            flowId: flowId,
-            action: {
-              originName: Not(IsNull())
+        lodash_1.default.templateSettings.interpolate = /{{([\s\S]+?)}}/g;
+        const { nodeId, flowId, substitutionsSchemaJson } = params;
+        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;
@@ -101,10 +105,12 @@ let Node = class Node extends core_1.Controller {
           tNodeData,
           tFieldMapData
         ]);*/
-        const { actionConfigJson, action: { configJsonTemplate, actionType: { schemaJson } } } = nodeData;
+        const { actionConfigJson, action: { schemaJson, configJsonTemplate, actionType: { schemaJson: schemaJsonFromActionType } } } = nodeData;
         const actionConfigJsonObject = actionConfigJson ? JSON.parse(actionConfigJson) : {};
         const configJsonTemplateObject = configJsonTemplate ? JSON.parse(configJsonTemplate) : {};
-        let schemaJsonObject = schemaJson ? JSON.parse(schemaJson) : {};
+        let schemaJsonFromActionTypeObject = schemaJsonFromActionType ? JSON.parse(lodash_1.default.template(schemaJsonFromActionType)(substitutionsSchemaJson)) : {};
+        let schemaJsonFromActionObject = schemaJson ? JSON.parse(lodash_1.default.template(schemaJson)(substitutionsSchemaJson)) : {};
+        let schemaJsonObject = { ...schemaJsonFromActionTypeObject, ...schemaJsonFromActionObject };
         const mergeValues = {
             ...configJsonTemplateObject,
             ...actionConfigJsonObject
@@ -122,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,
@@ -177,7 +218,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], Node.prototype, "AddActionConfigJson", null);
 __decorate([
-    core_1.Get(),
+    core_1.Post(),
     core_1.DbSettings('Orm'),
     core_1.ReadOnly(false),
     core_1.Log(true),

package/dist/entity/Action.d.ts

@@ -11,7 +11,9 @@ export default class Action extends PxpEntity {
     originKey: string;
     controllerFunction: string;
     configJsonTemplate: string;
+    eventConfig: string;
     hidden: string;
+    schemaJson: string;
     actionType: ActionType;
     nodes: Node[];
     eventNodes: Node[];

package/dist/entity/Action.js

@@ -54,10 +54,18 @@ __decorate([
     typeorm_1.Column({ name: 'config_json_template', type: 'text' }),
     __metadata("design:type", String)
 ], Action.prototype, "configJsonTemplate", void 0);
+__decorate([
+    typeorm_1.Column({ name: 'event_config', type: 'text' }),
+    __metadata("design:type", String)
+], Action.prototype, "eventConfig", void 0);
 __decorate([
     typeorm_1.Column({ type: 'varchar', nullable: false, length: 1, default: 'N' }),
     __metadata("design:type", String)
 ], Action.prototype, "hidden", void 0);
+__decorate([
+    typeorm_1.Column({ name: 'schema_json', type: 'text' }),
+    __metadata("design:type", String)
+], Action.prototype, "schemaJson", void 0);
 __decorate([
     typeorm_1.ManyToOne(() => ActionType_1.default, actionType => actionType.actions, { eager: true }),
     typeorm_1.JoinColumn({ name: 'action_type_id' }),

package/dist/subscribers/Event.d.ts

@@ -17,4 +17,5 @@ import EventModel from '../entity/Event';
 export declare class Event implements EntitySubscriberInterface<EventModel> {
     listenTo(): typeof EventModel;
     afterInsert(event: InsertEvent<EventModel>): Promise<void>;
+    checkConditions(viewData: Record<string, any>, flowId: number, actionId: number): Promise<boolean>;
 }

package/dist/subscribers/Event.js

@@ -27,6 +27,7 @@ exports.Event = void 0;
 const typeorm_1 = require("typeorm");
 const Event_1 = __importDefault(require("../entity/Event"));
 const Node_1 = __importDefault(require("../entity/Node"));
+const Action_1 = __importDefault(require("../entity/Action"));
 const Flow_1 = __importDefault(require("../entity/Flow"));
 const core_1 = require("@pxp-nd/core");
 const FlowInstance_1 = __importDefault(require("../entity/FlowInstance"));
@@ -45,7 +46,8 @@ 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 } }));
-            if (flow.vendorId == resExecuteView[0].vendor_id) {
+            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;
                 flowInstance.dataId = newEvent.dataId;
@@ -57,6 +59,23 @@ let Event = class Event {
             }
         }
     }
+    async checkConditions(viewData, flowId, actionId) {
+        const action = await Action_1.default.findOne(actionId);
+        const node = await Node_1.default.findOne({ where: { actionId, flowId } });
+        const actionConfigJson = JSON.parse(node.actionConfigJson);
+        let res = true;
+        if (action.eventConfig) {
+            const eventConfig = JSON.parse(action.eventConfig);
+            if (eventConfig.filters) {
+                eventConfig.filters.forEach((filter) => {
+                    if (actionConfigJson[filter.nodeField] && viewData[filter.originField] != actionConfigJson[filter.nodeField]) {
+                        res = false;
+                    }
+                });
+            }
+        }
+        return res;
+    }
 };
 Event = __decorate([
     typeorm_1.EventSubscriber()

package/package.json

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