@pxp-nd/flow 1.0.20 → 1.0.21

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

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

package/dist/entity/Action.js

@@ -58,6 +58,10 @@ __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/package.json

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