@pxp-nd/flow 1.1.15 → 1.1.17

package/dist/controllers/Flow.js

@@ -66,7 +66,6 @@ const Action_1 = __importDefault(require("../entity/Action"));
 const NodeConnection_1 = __importDefault(require("../entity/NodeConnection"));
 const Flow_1 = __importDefault(require("../entity/Flow"));
 const FlowInstance_1 = __importDefault(require("../entity/FlowInstance"));
-const NodeInstance_1 = __importDefault(require("../entity/NodeInstance"));
 const Node_2 = __importDefault(require("./Node"));
 const axios_1 = __importDefault(require("axios"));
 //import {configFacebookStrategy} from "./passport-facebook";
@@ -747,21 +746,25 @@ let Flow = class Flow extends core_1.Controller {
                     validFlowInstances.push(flowInstance.flowInstanceId);
                 }
                 else {
+                    /*Commented because scheduled nodes shouldn't be affected by stopping
                     let flowInstanceId = flowInstance.flowInstanceId;
-                    const totalNI = await NodeInstance_1.default.find({ flowInstanceId, isActive: true });
-                    const nodeInstances = await (0, typeorm_1.getManager)().transaction(async (transactionalEntityManager) => {
-                        const queryBuilder = transactionalEntityManager.createQueryBuilder(NodeInstance_1.default, 'node_instance');
-                        queryBuilder
-                            .where('node_instance.flowInstanceId = :flowInstanceId', { flowInstanceId })
-                            .andWhere('((node_instance.status IS NULL AND (node_instance.schedule = :schedule OR node_instance.schedule IS NULL)) OR (node_instance.status = :status AND node_instance.schedule != :schedule AND node_instance.schedule IS NOT NULL))', {
-                            status: 'executed',
-                            schedule: '0000-00-00 00:00:00',
-                        });
-                        return queryBuilder.getMany();
-                    });
-                    if (totalNI.length > nodeInstances.length) {
-                        validFlowInstances.push(flowInstanceId);
-                    }
+                    const totalNI = await NodeInstanceModel.find({ flowInstanceId, isActive: true});
+                    const nodeInstances = await getManager().transaction(async (transactionalEntityManager) => {
+                       const queryBuilder: SelectQueryBuilder<NodeInstanceModel> = transactionalEntityManager.createQueryBuilder(NodeInstanceModel, 'node_instance');
+                       queryBuilder
+                         .where('node_instance.flowInstanceId = :flowInstanceId', { flowInstanceId })
+                         .andWhere('((node_instance.status IS NULL AND (node_instance.schedule = :schedule OR node_instance.schedule IS NULL)) OR (node_instance.status = :status AND node_instance.schedule != :schedule AND node_instance.schedule IS NOT NULL))', {
+                           status: 'executed',
+                           schedule: '0000-00-00 00:00:00',
+                         });
+ 
+                       return queryBuilder.getMany();
+                     });
+ 
+ 
+                   if (totalNI.length > nodeInstances.length ) {
+                     validFlowInstances.push(flowInstanceId);
+                   }*/
                 }
             }
             if (validFlowInstances.length > 0) {

package/dist/controllers/FlowInstance.d.ts

@@ -18,5 +18,6 @@ declare class FlowInstance extends Controller {
     processPending(params: Record<string, any>, manager: EntityManager): Promise<unknown>;
     eventProcesss(manager: EntityManager): Promise<void>;
     checkConditions(viewData: Record<string, any>, flowId: number, actionId: number): Promise<boolean>;
+    insert(params: Record<string, any>, manager: EntityManager): Promise<unknown>;
 }
 export default FlowInstance;

package/dist/controllers/FlowInstance.js

@@ -135,6 +135,18 @@ class FlowInstance extends core_1.Controller {
         }
         return res;
     }
+    async insert(params, manager) {
+        const { flowId, dataId, status, actionId, originName = '', originKey = '' } = params;
+        let flowInstance = new FlowInstance_1.default();
+        flowInstance.flowId = flowId;
+        flowInstance.dataId = dataId;
+        flowInstance.originName = originName;
+        flowInstance.originKey = originKey;
+        flowInstance.actionId = actionId;
+        flowInstance.status = status;
+        flowInstance = await manager.save(FlowInstance_1.default, flowInstance);
+        return flowInstance;
+    }
 }
 __decorate([
     (0, core_1.Post)(),
@@ -145,4 +157,13 @@ __decorate([
     __metadata("design:paramtypes", [Object, typeorm_1.EntityManager]),
     __metadata("design:returntype", Promise)
 ], FlowInstance.prototype, "processPending", null);
+__decorate([
+    (0, core_1.Post)(),
+    (0, core_1.DbSettings)('Orm'),
+    (0, core_1.ReadOnly)(false),
+    (0, core_1.Log)(true),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, typeorm_1.EntityManager]),
+    __metadata("design:returntype", Promise)
+], FlowInstance.prototype, "insert", null);
 exports.default = FlowInstance;

package/package.json

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