@pxp-nd/flow 1.0.68 → 1.0.70

package/.yalc/@pxp-nd/flow/dist/entity/NodeInstance.js

@@ -0,0 +1,58 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+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 FlowInstance_1 = __importDefault(require("./FlowInstance"));
+const Node_1 = __importDefault(require("./Node"));
+const common_1 = require("@pxp-nd/common");
+let NodeInstance = class NodeInstance extends common_1.PxpEntity {
+};
+__decorate([
+    (0, typeorm_1.PrimaryGeneratedColumn)({ name: 'node_instance_id' }),
+    __metadata("design:type", Number)
+], NodeInstance.prototype, "nodeInstanceId", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'node_id', type: 'numeric', nullable: true }),
+    __metadata("design:type", Number)
+], NodeInstance.prototype, "nodeId", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'flow_instance_id', type: 'numeric', nullable: true }),
+    __metadata("design:type", Number)
+], NodeInstance.prototype, "flowInstanceId", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'run_time', type: 'timestamp', nullable: false }),
+    __metadata("design:type", Date)
+], NodeInstance.prototype, "runTime", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'schedule', type: 'timestamp', nullable: false }),
+    __metadata("design:type", Date)
+], NodeInstance.prototype, "schedule", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'status', type: 'varchar', nullable: false, length: 50 }),
+    __metadata("design:type", String)
+], NodeInstance.prototype, "status", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => FlowInstance_1.default, flowInstance => flowInstance.nodeInstances),
+    (0, typeorm_1.JoinColumn)({ name: 'flow_instance_id' }),
+    __metadata("design:type", FlowInstance_1.default)
+], NodeInstance.prototype, "flowInstance", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => Node_1.default, node => node.nodeInstances, { eager: true }),
+    (0, typeorm_1.JoinColumn)({ name: 'node_id' }),
+    __metadata("design:type", Node_1.default)
+], NodeInstance.prototype, "node", void 0);
+NodeInstance = __decorate([
+    (0, typeorm_1.Entity)({ name: 'twf_node_instance' })
+], NodeInstance);
+exports.default = NodeInstance;

package/.yalc/@pxp-nd/flow/dist/entity/OriginName.d.ts

@@ -0,0 +1,9 @@
+import FieldMap from './FieldMap';
+import { PxpEntity } from '@pxp-nd/common';
+export default class OriginName extends PxpEntity {
+    originNameId: number;
+    name: string;
+    description: string;
+    originKey: string;
+    fields: FieldMap[];
+}

package/.yalc/@pxp-nd/flow/dist/entity/OriginName.js

@@ -0,0 +1,43 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+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 FieldMap_1 = __importDefault(require("./FieldMap"));
+const common_1 = require("@pxp-nd/common");
+let OriginName = class OriginName extends common_1.PxpEntity {
+};
+__decorate([
+    (0, typeorm_1.PrimaryGeneratedColumn)({ name: 'origin_name_id' }),
+    __metadata("design:type", Number)
+], OriginName.prototype, "originNameId", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', nullable: false, length: 100 }),
+    __metadata("design:type", String)
+], OriginName.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'text', nullable: false }),
+    __metadata("design:type", String)
+], OriginName.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', nullable: false, length: 150 }),
+    __metadata("design:type", String)
+], OriginName.prototype, "originKey", void 0);
+__decorate([
+    (0, typeorm_1.OneToMany)(() => FieldMap_1.default, (fieldMap) => fieldMap.originName),
+    __metadata("design:type", Array)
+], OriginName.prototype, "fields", void 0);
+OriginName = __decorate([
+    (0, typeorm_1.Entity)({ name: 'twf_origin_name' })
+], OriginName);
+exports.default = OriginName;

package/.yalc/@pxp-nd/flow/dist/entity/index.d.ts

@@ -0,0 +1,23 @@
+import Action from './Action';
+import ActionType from './ActionType';
+import Event from './Event';
+import FieldMap from './FieldMap';
+import Flow from './Flow';
+import FlowInstance from './FlowInstance';
+import Node from './Node';
+import NodeConnection from './NodeConnection';
+import NodeInstance from './NodeInstance';
+import OriginName from './OriginName';
+export { Action, ActionType, Event, FieldMap, Flow, FlowInstance, Node, NodeConnection, NodeInstance, OriginName };
+export declare const entities: {
+    Action: typeof Action;
+    ActionType: typeof ActionType;
+    Event: typeof Event;
+    FieldMap: typeof FieldMap;
+    Flow: typeof Flow;
+    FlowInstance: typeof FlowInstance;
+    Node: typeof Node;
+    NodeConnection: typeof NodeConnection;
+    NodeInstance: typeof NodeInstance;
+    OriginName: typeof OriginName;
+};

package/.yalc/@pxp-nd/flow/dist/entity/index.js

@@ -0,0 +1,27 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.entities = exports.OriginName = exports.NodeInstance = exports.NodeConnection = exports.Node = exports.FlowInstance = exports.Flow = exports.FieldMap = exports.Event = exports.ActionType = exports.Action = void 0;
+const Action_1 = __importDefault(require("./Action"));
+exports.Action = Action_1.default;
+const ActionType_1 = __importDefault(require("./ActionType"));
+exports.ActionType = ActionType_1.default;
+const Event_1 = __importDefault(require("./Event"));
+exports.Event = Event_1.default;
+const FieldMap_1 = __importDefault(require("./FieldMap"));
+exports.FieldMap = FieldMap_1.default;
+const Flow_1 = __importDefault(require("./Flow"));
+exports.Flow = Flow_1.default;
+const FlowInstance_1 = __importDefault(require("./FlowInstance"));
+exports.FlowInstance = FlowInstance_1.default;
+const Node_1 = __importDefault(require("./Node"));
+exports.Node = Node_1.default;
+const NodeConnection_1 = __importDefault(require("./NodeConnection"));
+exports.NodeConnection = NodeConnection_1.default;
+const NodeInstance_1 = __importDefault(require("./NodeInstance"));
+exports.NodeInstance = NodeInstance_1.default;
+const OriginName_1 = __importDefault(require("./OriginName"));
+exports.OriginName = OriginName_1.default;
+exports.entities = { Action: Action_1.default, ActionType: ActionType_1.default, Event: Event_1.default, FieldMap: FieldMap_1.default, Flow: Flow_1.default, FlowInstance: FlowInstance_1.default, Node: Node_1.default, NodeConnection: NodeConnection_1.default, NodeInstance: NodeInstance_1.default, OriginName: OriginName_1.default };

package/.yalc/@pxp-nd/flow/dist/index.d.ts

@@ -0,0 +1,3 @@
+export * from './entity';
+export * from './controllers';
+export * from './subscribers';

package/.yalc/@pxp-nd/flow/dist/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./entity"), exports);
+__exportStar(require("./controllers"), exports);
+__exportStar(require("./subscribers"), exports);

package/.yalc/@pxp-nd/flow/dist/subscribers/Event.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Kplian 2021
+ *
+ * MIT
+ *
+ * Member Controller
+ *
+ * @summary Event Subscriber
+ * @author Favio Figueroa
+ *         Jaime Rivera
+ *
+ * Created at     : 2021-07-08 12:55:38
+ * Last modified  :
+ */
+import { EntitySubscriberInterface, InsertEvent } from "typeorm";
+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/.yalc/@pxp-nd/flow/dist/subscribers/Event.js

@@ -0,0 +1,84 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Event = void 0;
+/**
+ * Kplian 2021
+ *
+ * MIT
+ *
+ * Member Controller
+ *
+ * @summary Event Subscriber
+ * @author Favio Figueroa
+ *         Jaime Rivera
+ *
+ * Created at     : 2021-07-08 12:55:38
+ * Last modified  :
+ */
+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"));
+let Event = class Event {
+    listenTo() {
+        return Event_1.default;
+    }
+    async afterInsert(event) {
+        //todo investigate  replace variables into condition
+        const newEvent = event.entity;
+        const node = await (0, core_1.__)(Node_1.default.find({ where: { actionId: newEvent.actionId, isActive: 1 } }));
+        for (const n of node) {
+            //get data of view
+            const { action: { originName, originKey }, } = n;
+            const executeView = `select * from ${originName} where ${originKey} = ${newEvent.dataId}`;
+            const resExecuteView = await (0, typeorm_1.getManager)().query(executeView);
+            const flow = await (0, core_1.__)(Flow_1.default.findOne({ where: { flowId: n.flowId, isActive: 1 } }));
+            if (flow && flow.vendorId == resExecuteView[0].vendor_id &&
+                (await 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;
+                flowInstance.originName = originName;
+                flowInstance.originKey = originKey;
+                flowInstance.actionId = newEvent.actionId;
+                flowInstance.status = "pending";
+                flowInstance = await event.manager.save(FlowInstance_1.default, flowInstance);
+            }
+        }
+    }
+    async checkConditions(viewData, flowId, actionId) {
+        const action = await Action_1.default.findOne(actionId);
+        const node = await Node_1.default.findOne({ where: { actionId, flowId, isActive: 1 } });
+        let res = true;
+        if (node && action.eventConfig && node.actionConfigJson) {
+            const eventConfig = JSON.parse(action.eventConfig);
+            const actionConfigJson = JSON.parse(node.actionConfigJson);
+            if (eventConfig.filters) {
+                eventConfig.filters.forEach((filter) => {
+                    if (actionConfigJson[filter.nodeField] &&
+                        viewData[filter.originField] != actionConfigJson[filter.nodeField]) {
+                        res = false;
+                    }
+                });
+            }
+        }
+        return res;
+    }
+};
+Event = __decorate([
+    (0, typeorm_1.EventSubscriber)()
+], Event);
+exports.Event = Event;

package/.yalc/@pxp-nd/flow/dist/subscribers/index.d.ts

@@ -0,0 +1,3 @@
+import { Event as EventSubscriber } from './Event';
+export { EventSubscriber };
+export declare const subscribers: (typeof EventSubscriber)[];

package/.yalc/@pxp-nd/flow/dist/subscribers/index.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.subscribers = exports.EventSubscriber = void 0;
+const Event_1 = require("./Event");
+Object.defineProperty(exports, "EventSubscriber", { enumerable: true, get: function () { return Event_1.Event; } });
+exports.subscribers = [Event_1.Event];

package/.yalc/@pxp-nd/flow/package.json

@@ -0,0 +1,39 @@
+{
+  "name": "@pxp-nd/flow",
+  "version": "1.0.47",
+  "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",
+  "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"
+  },
+  "yalcSig": "baf56e8c290984dd34d85e5866d5c63c"
+}

package/.yalc/@pxp-nd/flow/tsconfig.json

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

package/.yalc/@pxp-nd/flow/yalc.lock

@@ -0,0 +1,9 @@
+{
+  "version": "v1",
+  "packages": {
+    "@pxp-nd/flow": {
+      "signature": "422e0ce2e6378fafb43bcb62bcff57f5",
+      "file": true
+    }
+  }
+}

package/.yalc/@pxp-nd/flow/yalc.sig

@@ -0,0 +1 @@
+baf56e8c290984dd34d85e5866d5c63c

package/dist/controllers/Flow.js

@@ -76,7 +76,7 @@ let Flow = class Flow extends core_1.Controller {
     async copyNode(node, newFlowId, manager, isFirst = false) {
         // insert new node
         const newNode = new Node_1.default();
-        const { nodeId, flowId, createdAt, modifiedAt, actionConfigJson, ...nodeToCopy } = node;
+        const { nodeId, flowId, createdAt, modifiedAt, ...nodeToCopy } = node;
         Object.assign(newNode, { ...nodeToCopy, flowId: newFlowId });
         const insertNewNode = await (0, core_1.__)(manager.save(Node_1.default, newNode));
         if (isFirst) {
@@ -85,6 +85,7 @@ let Flow = class Flow extends core_1.Controller {
                 nodeIdMaster: undefined,
                 nodeIdChild: insertNewNode.nodeId,
             });
+            await manager.save(duplicatedConnection);
         }
         // insert connection
         await this.copyNodeConnections(node.nodeId, insertNewNode.nodeId, newFlowId, manager);
@@ -506,6 +507,7 @@ let Flow = class Flow extends core_1.Controller {
         const isActive = params._isActive;
         const type = params._type;
         const vendorId = params._vendorId;
+        const allowedColumns = ['name', 'description'];
         const queryBuilder = await (0, typeorm_1.getManager)()
             .createQueryBuilder()
             .select([
@@ -539,8 +541,11 @@ let Flow = class Flow extends core_1.Controller {
         if (vendorId) {
             queryBuilder.andWhere('f.vendor_id = :vendorId', { vendorId });
         }
-        // Sorting and pagination
-        queryBuilder.orderBy(`f.${params.sort}`, params.dir).skip(params.start).take(params.limit);
+        if (allowedColumns.includes(params.genericFilterFields)) {
+            if (params.genericFilterFields && params.genericFilterValue) {
+                queryBuilder.andWhere(`f.${params.genericFilterFields} LIKE :genericFilterValue`, { genericFilterValue: `%${params.genericFilterValue}%` });
+            }
+        }
         queryBuilder.groupBy([
             'f.flow_id',
             'f.vendor_id',
@@ -559,6 +564,12 @@ let Flow = class Flow extends core_1.Controller {
             'f.icon',
             'f.status',
         ]);
+        // Sorting and pagination
+        //queryBuilder.orderBy(`f.${params.sort}`, params.dir).skip(params.start).take(params.limit);
+        // Sorting and pagination
+        queryBuilder.orderBy(`f.${params.sort}`, params.dir);
+        // Agrega manualmente la cláusula LIMIT y OFFSET
+        queryBuilder.limit(params.limit).offset(params.start);
         const data = await queryBuilder.getRawMany();
         // Construct the count query
         const countQuery = await (0, typeorm_1.getManager)()
@@ -575,9 +586,14 @@ let Flow = class Flow extends core_1.Controller {
         if (vendorId) {
             countQuery.andWhere('f.vendor_id = :vendorId', { vendorId });
         }
+        if (allowedColumns.includes(params.genericFilterFields)) {
+            if (params.genericFilterFields && params.genericFilterValue) {
+                countQuery.andWhere(`f.${params.genericFilterFields} LIKE :genericFilterValue`, { genericFilterValue: `%${params.genericFilterValue}%` });
+            }
+        }
         const totalCount = await countQuery.getRawOne();
-        const total = totalCount.count;
-        return { data, total };
+        const count = totalCount.count;
+        return { data, count };
     }
 };
 __decorate([

package/package.json

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

package/yalc.lock

@@ -0,0 +1,9 @@
+{
+  "version": "v1",
+  "packages": {
+    "@pxp-nd/flow": {
+      "signature": "baf56e8c290984dd34d85e5866d5c63c",
+      "file": true
+    }
+  }
+}