update api version/extend retry checkqueue

Author: skadefro

OpenFlow/src/DatabaseConnection.ts

@@ -349,7 +349,7 @@ export class DatabaseConnection {
         }
         for (var i: number = 0; i < arr.length; i++) { arr[i] = this.decryptentity(arr[i]); }
         DatabaseConnection.traversejsondecode(arr);
-        this._logger.debug("[" + user.username + "][" + collectionname + "] query gave " + arr.length + " results " + JSON.stringify(query));
+        this._logger.debug("[" + user.username + "][" + collectionname + "] query gave " + arr.length + " results ");
         return arr;
     }
     /**

OpenFlow/src/amqpwrapper.ts

@@ -456,7 +456,7 @@ export class amqpwrapper {
                 }
                 return hasConsumers;
             }, {
-                retries: 5,
+                retries: 10,
                 minTimeout: 500,
                 maxTimeout: 500,
                 onRetry: function (error: Error, count: number): void {

OpenFlow/src/public/Controllers.ts

@@ -1535,11 +1535,22 @@ export class EntitiesCtrl extends entitiesCtrl<Base> {
             this.orderby = this.userdata.data.EntitiesCtrl.orderby;
             this.searchstring = this.userdata.data.EntitiesCtrl.searchstring;
             this.basequeryas = this.userdata.data.EntitiesCtrl.basequeryas;
+        } else {
+            if (NoderedUtil.IsNullEmpty(this.collection)) {
+                this.$location.path("/Entities/entities");
+                if (!this.$scope.$$phase) { this.$scope.$apply(); }
+                return;
+            }
         }
+        console.log("path: " + this.$location.path());
         if (NoderedUtil.IsNullEmpty(this.collection)) {
             this.$location.path("/Entities/entities");
-        } else {
+            if (!this.$scope.$$phase) { this.$scope.$apply(); }
+            return;
+        } else if (this.$location.path() != "/Entities/" + this.collection) {
             this.$location.path("/Entities/" + this.collection);
+            if (!this.$scope.$$phase) { this.$scope.$apply(); }
+            return;
         }
         if (!this.$scope.$$phase) { this.$scope.$apply(); }
         WebSocketClientService.onSignedin(async (user: TokenUser) => {

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openflow-nodered",
-  "version": "1.0.45",
+  "version": "1.0.46",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {
@@ -38,7 +38,7 @@
     "node-gyp": "^7.0.0",
     "node-red": "^1.1.0",
     "node-red-node-email": "^1.7.8",
-    "openflow-api": "^1.0.5",
+    "openflow-api": "^1.0.7",
     "os-service": "^2.2.0",
     "passport-saml": "^1.3.3",
     "passport-saml-metadata": "^2.3.0",

VERSION

@@ -1 +1 @@
-1.0.45
+1.0.46

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openiap",
-  "version": "1.0.45",
+  "version": "1.0.46",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {
@@ -58,7 +58,7 @@
     "morgan": "^1.10.0",
     "multer": "^1.4.2",
     "multer-gridfs-storage": "^4.2.0",
-    "openflow-api": "^1.0.5",
+    "openflow-api": "^1.0.7",
     "os-service": "^2.2.0",
     "passport": "^0.4.1",
     "passport-google-oauth20": "^2.0.0",