@pxp-nd/flow 1.0.17 → 1.0.21

package/dist/controllers/Action.js

@@ -48,9 +48,12 @@ let Action = class Action extends core_1.Controller {
           );*/
         const actionsFind = await Action_1.default.find({
             relations: ['actionType'],
-            where: Object.assign(Object.assign({}, (actionTypeName ? { actionType: {
-                    name: actionTypeName
-                } } : {})), (actionId ? { actionId: actionId } : {}))
+            where: {
+                ...(actionTypeName ? { actionType: {
+                        name: actionTypeName
+                    } } : {}),
+                ...(actionId ? { actionId: actionId } : {}),
+            }
         });
         return { data: actionsFind };
     }

package/dist/controllers/Flow.d.ts

@@ -11,8 +11,14 @@
  * Created at     : 2021-07-08 12:55:38
  * Last modified  :
  */
+import { EntityManager } from 'typeorm';
 import { Controller } from '@pxp-nd/core';
 declare class Flow extends Controller {
     get(params: Record<string, any>): Promise<unknown>;
+    copyNodeConnections(nodeId: number, newNodeId: number, newFlowId: number, manager: EntityManager): Promise<void>;
+    copyNode(node: Record<any, any>, newFlowId: number, manager: EntityManager): Promise<{
+        nodeId: any;
+    }>;
+    createFlowFromFlow(params: Record<string, any>, manager: EntityManager): Promise<unknown>;
 }
 export default Flow;

package/dist/controllers/Flow.js

@@ -25,9 +25,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const typeorm_1 = require("typeorm");
 const core_1 = require("@pxp-nd/core");
 const Node_1 = __importDefault(require("../entity/Node"));
 const NodeConnection_1 = __importDefault(require("../entity/NodeConnection"));
+const Flow_1 = __importDefault(require("../entity/Flow"));
 let Flow = class Flow extends core_1.Controller {
     async get(params) {
         const nodes = await Node_1.default.find({ flowId: params.flowId });
@@ -38,6 +40,43 @@ let Flow = class Flow extends core_1.Controller {
         }
         return restNodes;
     }
+    async copyNodeConnections(nodeId, newNodeId, newFlowId, manager) {
+        const connections = await core_1.__(NodeConnection_1.default.find({ nodeIdMaster: nodeId }));
+        for (let connection of connections) {
+            const newNodeConnection = new NodeConnection_1.default();
+            const { nodeConnectionId, nodeIdMaster, nodeIdChild, createdAt, modifiedAt, ...nodeConnectionToCopy } = connection;
+            // get node from nodeIdChild
+            const dataNodeChild = await Node_1.default.findOne({ nodeId: connection.nodeIdChild });
+            const { nodeId: newNodeIdChild } = await this.copyNode(dataNodeChild, newFlowId, manager);
+            Object.assign(newNodeConnection, { ...nodeConnectionToCopy, nodeIdMaster: newNodeId, nodeIdChild: newNodeIdChild });
+            const insertNewNodeConnection = await core_1.__(manager.save(NodeConnection_1.default, newNodeConnection));
+        }
+    }
+    async copyNode(node, newFlowId, manager) {
+        // insert new node
+        const newNode = new Node_1.default();
+        const { nodeId, flowId, createdAt, modifiedAt, actionConfigJson, ...nodeToCopy } = node;
+        Object.assign(newNode, { ...nodeToCopy, flowId: newFlowId });
+        const insertNewNode = await core_1.__(manager.save(Node_1.default, newNode));
+        // insert connection
+        await this.copyNodeConnections(node.nodeId, insertNewNode.nodeId, newFlowId, manager);
+        return { nodeId: insertNewNode.nodeId };
+    }
+    async createFlowFromFlow(params, manager) {
+        // we need clone the flow selected
+        const dataFlow = await core_1.__(Flow_1.default.findOne(params.flowId));
+        const { flowId, createdAt, modifiedAt, nodes, ...flowToCopy } = dataFlow;
+        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"
+        const dataNode = await Node_1.default.findOne({ where: { flowId: params.flowId }, order: { nodeId: "ASC" } });
+        dataNode && await this.copyNode(dataNode, insertNewFlow.flowId, manager);
+        return { flowId: insertNewFlow.flowId };
+    }
 };
 __decorate([
     core_1.Get(),
@@ -48,6 +87,15 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
 ], Flow.prototype, "get", null);
+__decorate([
+    core_1.Post(),
+    core_1.DbSettings('Orm'),
+    core_1.ReadOnly(false),
+    core_1.Log(true),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, typeorm_1.EntityManager]),
+    __metadata("design:returntype", Promise)
+], Flow.prototype, "createFlowFromFlow", null);
 Flow = __decorate([
     core_1.Model('flow-nd/Flow')
 ], Flow);

package/dist/controllers/Node.d.ts

@@ -18,5 +18,6 @@ declare class Node extends Controller {
     add(params: Record<string, any>, manager: EntityManager): Promise<unknown>;
     AddActionConfigJson(params: Record<string, any>, manager: EntityManager): Promise<unknown>;
     getParameterizedNode(params: Record<string, any>, manager: EntityManager): Promise<unknown>;
+    executeActionJson(params: Record<string, any>, manager: EntityManager): Promise<unknown>;
 }
 export default Node;

package/dist/controllers/Node.js

@@ -21,17 +21,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -40,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 {
@@ -75,12 +65,10 @@ let Node = class Node extends core_1.Controller {
         return nodeData;
     }
     async AddActionConfigJson(params, manager) {
-        console.log('params', params);
-        let { nodeId: removed, __metadata: removed2 } = params, actionConfigJson = __rest(params, ["nodeId", "__metadata"]);
+        let { nodeId: removed, __metadata: removed2, ...actionConfigJson } = params;
         Object.entries(params.__metadata).forEach(([nameKey, values]) => {
             actionConfigJson[nameKey] = `{{ ${values.name} }}`;
         });
-        console.log('actionConfigJson', actionConfigJson);
         const upd = await core_1.__(manager.update(Node_1.default, params.nodeId, {
             actionConfigJson: JSON.stringify(actionConfigJson),
         }));
@@ -92,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: {
@@ -114,11 +103,16 @@ 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) : {};
-        const mergeValues = Object.assign(Object.assign({}, configJsonTemplateObject), actionConfigJsonObject);
+        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
+        };
         const verifyIfValueFromFieldMap = (str) => {
             if (/^{{/.test(str) && /}}$/.test(str)) {
                 return true;
@@ -134,7 +128,11 @@ let Node = class Node extends core_1.Controller {
         };
         Object.entries(mergeValues).forEach(([nameKey, value]) => {
             if (schemaJsonObject[nameKey]) {
-                schemaJsonObject[nameKey] = Object.assign(Object.assign(Object.assign({}, schemaJsonObject[nameKey]), { initialValue: value }), (verifyIfValueFromFieldMap(value) && Object.assign({ fromFieldMap: true }, findFieldMapAndMetaData(value))));
+                schemaJsonObject[nameKey] = {
+                    ...schemaJsonObject[nameKey],
+                    initialValue: value,
+                    ...(verifyIfValueFromFieldMap(value) && { fromFieldMap: true, ...findFieldMapAndMetaData(value) }),
+                };
             }
         });
         return {
@@ -147,6 +145,22 @@ let Node = class Node extends core_1.Controller {
             fieldMapData,
         };
     }
+    async executeActionJson(params, manager) {
+        const { nodeId, originName, originKey, fromValues } = params;
+        // we need to get the value from merge values with originKey
+        const getParameterizedNodeData = await core_1.__(this.getParameterizedNode({ nodeId: nodeId }, manager));
+        const { mergeValues } = getParameterizedNodeData;
+        const findOriginValue = Object.entries(mergeValues).find(([nameValue]) => fromValues === nameValue);
+        const resValueObject = Object.fromEntries([findOriginValue]);
+        const originValue = resValueObject[fromValues];
+        const executeViewString = `select * from ${originName} where ${originKey} = ${originValue}`;
+        const resExecuteView = await typeorm_1.getManager().query(executeViewString);
+        /*const executeView = `select * from ${originName} where ${originKey} = ${newEvent.dataId}`;
+        const resExecuteView = await getManager().query(executeView);*/
+        return {
+            ...resExecuteView[0]
+        };
+    }
 };
 __decorate([
     core_1.Post(),
@@ -167,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),
@@ -175,6 +189,15 @@ __decorate([
     __metadata("design:paramtypes", [Object, typeorm_1.EntityManager]),
     __metadata("design:returntype", Promise)
 ], Node.prototype, "getParameterizedNode", null);
+__decorate([
+    core_1.Post(),
+    core_1.DbSettings('Orm'),
+    core_1.ReadOnly(false),
+    core_1.Log(true),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, typeorm_1.EntityManager]),
+    __metadata("design:returntype", Promise)
+], Node.prototype, "executeActionJson", null);
 Node = __decorate([
     core_1.Model('flow-nd/Node')
 ], Node);

package/dist/controllers/NodeInstance.js

@@ -53,7 +53,11 @@ let NodeInstance = class NodeInstance extends core_1.Controller {
         if (configJsonTemplate !== '' || actionConfigJson !== '') {
             const actionConfigJsonObject = actionConfigJson && JSON.parse(lodash_1.default.template(actionConfigJson)(resultFromOrigin));
             const configJsonTemplateObject = configJsonTemplate && JSON.parse(lodash_1.default.template(configJsonTemplate)(resultFromOrigin));
-            mergeJson = Object.assign(Object.assign(Object.assign({}, (configJsonTemplateObject || {})), (actionConfigJsonObject || {})), { __resultFromOrigin: resultFromOrigin });
+            mergeJson = {
+                ...(configJsonTemplateObject || {}),
+                ...(actionConfigJsonObject || {}),
+                __resultFromOrigin: resultFromOrigin
+            };
         }
         let nodeInstance = new NodeInstance_1.default();
         nodeInstance.flowInstanceId = flowInstance.flowInstanceId;
@@ -116,7 +120,6 @@ let NodeInstance = class NodeInstance extends core_1.Controller {
                     .andWhere("ni.status = 'WAIT' ")
                     .limit((maxNodes && maxNodes.value))
                     .getMany());
-                console.log('nodeInstanceDelayData', nodeInstanceDelayData);
                 for (const nodeInstance of nodeInstanceDelayData) {
                     //update status from wait to executing
                     await core_1.__(manager.update(NodeInstance_1.default, nodeInstance.nodeInstanceId, {

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/dist/entity/ActionType.d.ts

@@ -11,5 +11,6 @@ export default class ActionType extends PxpEntity {
     hidden: string;
     controller: string;
     extraSchemaJson: string;
+    actionsJson: string;
     actions: Action[];
 }

package/dist/entity/ActionType.js

@@ -57,6 +57,10 @@ __decorate([
     typeorm_1.Column({ name: 'extra_schema_json', type: 'text' }),
     __metadata("design:type", String)
 ], ActionType.prototype, "extraSchemaJson", void 0);
+__decorate([
+    typeorm_1.Column({ name: 'actions_json', type: 'text' }),
+    __metadata("design:type", String)
+], ActionType.prototype, "actionsJson", void 0);
 __decorate([
     typeorm_1.OneToMany(() => Action_1.default, (action) => action.actionType),
     __metadata("design:type", Array)

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/package.json

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

package/tsconfig.json

@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-      "target": "es2017",
+      "target": "es2019",
       "module": "commonjs",
       "allowJs": false,
       "outDir": "dist",
@@ -26,4 +26,4 @@
       "node_modules",
       "dist"
     ]
-  }
+  }