@pxp-nd/flow 1.0.19 → 1.0.23

package/README.md

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

package/dist/controllers/Flow.js

@@ -69,6 +69,7 @@ let Flow = class Flow extends core_1.Controller {
         const newFlow = new Flow_1.default();
         Object.assign(newFlow, flowToCopy);
         newFlow.name = params.name;
+        newFlow.description = params.description;
         const insertNewFlow = await core_1.__(manager.save(Flow_1.default, newFlow));
         // create the nodes
         // get the first node "the trigger node"

package/dist/controllers/Node.js

@@ -29,6 +29,7 @@ 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"));
 let Node = class Node extends core_1.Controller {
@@ -79,7 +80,8 @@ let Node = class Node extends core_1.Controller {
         };
     }
     async getParameterizedNode(params, manager) {
-        const { nodeId, flowId } = params;
+        lodash_1.default.templateSettings.interpolate = /{{([\s\S]+?)}}/g;
+        const { nodeId, flowId, substitutionsSchemaJson } = params;
         /*const tNodeOrigin =  __(NodeModel.find({
           relations: ['action'],
           where: {
@@ -101,10 +103,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
@@ -177,7 +181,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/entity/Flow.d.ts

@@ -6,6 +6,7 @@ export default class Flow extends PxpEntity {
     vendorId: number;
     code: number;
     name: string;
+    description: string;
     enabled: string;
     type: string;
     instances: FlowInstance[];

package/dist/entity/Flow.js

@@ -34,6 +34,10 @@ __decorate([
     typeorm_1.Column({ type: 'varchar', nullable: false, length: 100 }),
     __metadata("design:type", String)
 ], Flow.prototype, "name", void 0);
+__decorate([
+    typeorm_1.Column({ type: 'text', nullable: false }),
+    __metadata("design:type", String)
+], Flow.prototype, "description", void 0);
 __decorate([
     typeorm_1.Column({ type: 'varchar', nullable: false, length: 100 }),
     __metadata("design:type", String)

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,9 @@ 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) {
+            const boolConditions = await core_1.__(this.checkConditions(resExecuteView[0], n.flowId, newEvent.actionId));
+            if (flow.vendorId == resExecuteView[0].vendor_id && boolConditions) {
+                //now check all conditions
                 let flowInstance = new FlowInstance_1.default();
                 flowInstance.flowId = n.flowId;
                 flowInstance.dataId = newEvent.dataId;
@@ -57,6 +60,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,45 +1,45 @@
-{
-  "name": "@pxp-nd/flow",
-  "version": "1.0.19",
-  "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.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"
+  }
+}

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"
+    ]
+  }