@pxp-nd/flow 1.0.79 → 1.0.81

package/dist/controllers/Flow.d.ts

@@ -17,6 +17,7 @@
  * 01-Sep-2023    SP08SEP23     Rensi Arteaga          add base flow list
  * 16-Sep-2023    SP22SEP23     Mercedes Zambrana       Change GET to POST in insertEventFlow
  * 28-Sep-2023    SP06OCT23     Mercedes Zambrana      Add Validation when change off status (validateFlow, deleteflow, saveFlow, saveflowName)
+ * 20-Feb-2024    SP01MAR24     Mercedes Zambrana      Add in getFlowRender, insertEventFlow condition for at.name=PAGE
  * ******************************************************************************
  */
 import { EntityManager } from 'typeorm';

package/dist/controllers/Flow.js

@@ -18,6 +18,7 @@
  * 01-Sep-2023    SP08SEP23     Rensi Arteaga          add base flow list
  * 16-Sep-2023    SP22SEP23     Mercedes Zambrana       Change GET to POST in insertEventFlow
  * 28-Sep-2023    SP06OCT23     Mercedes Zambrana      Add Validation when change off status (validateFlow, deleteflow, saveFlow, saveflowName)
+ * 20-Feb-2024    SP01MAR24     Mercedes Zambrana      Add in getFlowRender, insertEventFlow condition for at.name=PAGE
  * ******************************************************************************
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
@@ -106,6 +107,7 @@ let Flow = class Flow extends core_1.Controller {
         // insert new node
         const newNode = new Node_1.default();
         const { nodeId, flowId, createdAt, modifiedAt, ...nodeToCopy } = node;
+        //for each node, get schema_json from action_type. So, if has templateId check in configGetDescValue the parameter storeId
         Object.assign(newNode, { ...nodeToCopy, flowId: newFlowId });
         const insertNewNode = await (0, core_1.__)(manager.save(Node_1.default, newNode));
         if (isFirst) {
@@ -366,25 +368,37 @@ let Flow = class Flow extends core_1.Controller {
         return { success: true, nodeId: newId };
     }
     async getFlowRender(params) {
-        var _a;
+        var _a, _b, _c;
         const flow = await (0, typeorm_1.getManager)().findOne(Flow_1.default, params.flowId);
         const totalNodes = await (0, typeorm_1.getManager)()
             .createQueryBuilder(Node_1.default, "n")
             .select([
             "n.nodeId",
-            "a.originName"
+            "a.originName",
+            "a.actionId"
         ])
             .innerJoin("n.action", "a")
             .where(`n.isActive = 1 and n.flowId = :flowId`, { flowId: params.flowId })
             .getOne();
         let cond = " and 0=0";
         if (!totalNodes) {
-            cond = " and at.name= 'EVENT' ";
+            cond = " and (at.name in ( 'EVENT','PAGE')) ";
         }
         else {
             const oName = (_a = totalNodes === null || totalNodes === void 0 ? void 0 : totalNodes.action) === null || _a === void 0 ? void 0 : _a.originName;
-            //
-            cond = `and at.name != 'EVENT' and (a.originName is null or a.originName = '${oName}')`;
+            const condPage = " and a.actionId = " + ((_b = totalNodes === null || totalNodes === void 0 ? void 0 : totalNodes.action) === null || _b === void 0 ? void 0 : _b.actionId);
+            const actionTypePage = await (0, typeorm_1.getManager)().query(`
+                select at.name
+              from twf_action a
+              inner join twf_action_type at on at.action_type_id = a.action_type_id
+              where a.action_id = ${(_c = totalNodes === null || totalNodes === void 0 ? void 0 : totalNodes.action) === null || _c === void 0 ? void 0 : _c.actionId}
+            `);
+            if (actionTypePage[0].name == 'PAGE') {
+                cond = `and at.name = 'PAGE' `;
+            }
+            else {
+                cond = `and (at.name not in ('EVENT','PAGE')) and (a.originName is null or a.originName = '${oName}') `;
+            }
         }
         let actions = await (0, typeorm_1.getManager)()
             .createQueryBuilder(Action_1.default, "a")
@@ -500,7 +514,7 @@ let Flow = class Flow extends core_1.Controller {
                 "a.actionId"
             ])
                 .innerJoin("a.actionType", "at")
-                .where(`a.isActive = 1 and a.hidden = 'N' and at.name = 'EVENT' and at.isActive = 1 `, { actionId: params.actionId })
+                .where(`a.isActive = 1 and a.hidden = 'N' and at.name in ('EVENT','PAGE') and at.isActive = 1 `, { actionId: params.actionId })
                 .getMany();
             if (action) {
                 const newNode = manager.create(Node_1.default, {

package/dist/entity/Flow.d.ts

@@ -15,4 +15,5 @@ export default class Flow extends PxpEntity {
     status: string;
     modifiedAt: Date;
     modifiedBy: string;
+    templateType: string;
 }

package/dist/entity/Flow.js

@@ -23,6 +23,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * Date Change      ID              Author              Description
  * -----------      -----------     --------------      ------------------------------------
  * 04-Sep-2023      SP08SEP23       Rensi Arteaga       add modified at and by
+ * 19-Feb-2024		SP01MAR24		Mercedes Zambrana	add template_type
  *****************************************************************************/
 const typeorm_1 = require("typeorm");
 const FlowInstance_1 = __importDefault(require("./FlowInstance"));
@@ -82,6 +83,10 @@ __decorate([
     (0, typeorm_1.Column)({ name: 'modified_by', type: 'varchar', length: 500 }),
     __metadata("design:type", String)
 ], Flow.prototype, "modifiedBy", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'template_type', type: 'varchar', nullable: false, length: 15 }),
+    __metadata("design:type", String)
+], Flow.prototype, "templateType", void 0);
 Flow = __decorate([
     (0, typeorm_1.Entity)({ name: 'twf_flow' })
 ], Flow);

package/dist/entity/index.d.ts

@@ -3,12 +3,13 @@ import ActionType from './ActionType';
 import Event from './Event';
 import FieldMap from './FieldMap';
 import Flow from './Flow';
+import FlowLog from './FlowLog';
 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 { Action, ActionType, Event, FieldMap, Flow, FlowInstance, Node, NodeConnection, NodeInstance, OriginName, FlowLog };
 export declare const entities: {
     Action: typeof Action;
     ActionType: typeof ActionType;
@@ -20,4 +21,5 @@ export declare const entities: {
     NodeConnection: typeof NodeConnection;
     NodeInstance: typeof NodeInstance;
     OriginName: typeof OriginName;
+    FlowLog: typeof FlowLog;
 };

package/dist/entity/index.js

@@ -3,7 +3,7 @@ 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;
+exports.entities = exports.FlowLog = 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"));
@@ -14,6 +14,8 @@ const FieldMap_1 = __importDefault(require("./FieldMap"));
 exports.FieldMap = FieldMap_1.default;
 const Flow_1 = __importDefault(require("./Flow"));
 exports.Flow = Flow_1.default;
+const FlowLog_1 = __importDefault(require("./FlowLog"));
+exports.FlowLog = FlowLog_1.default;
 const FlowInstance_1 = __importDefault(require("./FlowInstance"));
 exports.FlowInstance = FlowInstance_1.default;
 const Node_1 = __importDefault(require("./Node"));
@@ -24,4 +26,4 @@ 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 };
+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, FlowLog: FlowLog_1.default };

package/package.json

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