Fix filter by robot workflow

Author: skadefro

OpenFlow/src/public/Controllers.ts

@@ -112,13 +112,18 @@ export class RPAWorkflowsCtrl extends entitiesCtrl<Base> {
         this.basequery = { _type: "workflow" };
         this.baseprojection = { _type: 1, type: 1, name: 1, _created: 1, _createdby: 1, _modified: 1, projectandname: 1 };
         this.postloadData = this.processdata;
-        if (this.userdata.data.RPAWorkflowsCtrl) {
-            this.basequery = this.userdata.data.RPAWorkflowsCtrl.basequery;
-            this.collection = this.userdata.data.RPAWorkflowsCtrl.collection;
-            this.baseprojection = this.userdata.data.RPAWorkflowsCtrl.baseprojection;
-            this.orderby = this.userdata.data.RPAWorkflowsCtrl.orderby;
-            this.searchstring = this.userdata.data.RPAWorkflowsCtrl.searchstring;
-            this.basequeryas = this.userdata.data.RPAWorkflowsCtrl.basequeryas;
+        if (this.userdata.data != null && this.userdata.data.basequeryas != null) {
+            this.basequeryas = this.userdata.data.basequeryas;
+        } else if (this.userdata.data.RPAWorkflowsCtrl) {
+            if (this.userdata.data.RPAWorkflowsCtrl.basequeryas) this.basequeryas = this.userdata.data.RPAWorkflowsCtrl.basequeryas;
+            if (this.userdata.data.RPAWorkflowsCtrl.basequery) {
+                this.basequery = this.userdata.data.RPAWorkflowsCtrl.basequery;
+                this.collection = this.userdata.data.RPAWorkflowsCtrl.collection;
+                this.baseprojection = this.userdata.data.RPAWorkflowsCtrl.baseprojection;
+                this.orderby = this.userdata.data.RPAWorkflowsCtrl.orderby;
+                this.searchstring = this.userdata.data.RPAWorkflowsCtrl.searchstring;
+                this.basequeryas = this.userdata.data.RPAWorkflowsCtrl.basequeryas;
+            }
         }
         WebSocketClientService.onSignedin((user: TokenUser) => {
             this.loadData();
@@ -2955,7 +2960,7 @@ export class RobotsCtrl extends entitiesCtrl<unattendedclient> {
     ) {
         super($scope, $location, $routeParams, $interval, WebSocketClientService, api, userdata);
         this.autorefresh = true;
-        console.debug("RolesCtrl");
+        console.debug("RobotsCtrl");
         this.basequery = { _type: "user" };
         this.collection = "users";
         this.postloadData = this.processdata;
@@ -3014,6 +3019,8 @@ export class RobotsCtrl extends entitiesCtrl<unattendedclient> {
         if (!this.$scope.$$phase) { this.$scope.$apply(); }
     }
     ShowWorkflows(model: any) {
+        if (!this.userdata.data.RPAWorkflowsCtrl) this.userdata.data.RPAWorkflowsCtrl = {};
+        this.userdata.data.RPAWorkflowsCtrl.basequeryas = model._id;
         this.userdata.data.basequeryas = model._id;
         this.$location.path("/RPAWorkflows");
         if (!this.$scope.$$phase) { this.$scope.$apply(); }

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openflow-nodered",
-  "version": "1.1.52",
+  "version": "1.1.53",
   "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": {

VERSION

@@ -1 +1 @@
-1.1.52
+1.1.53

docker-compose-toolbox.yml

@@ -82,7 +82,7 @@ services:
       - "traefik.http.routers.nodered.rule=Host(`nodered1.toolbox.openrpa.dk`)"
       - "traefik.http.routers.nodered.entrypoints=web"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
-    image: "cloudhack/openflownodered:1.1.52"
+    image: "cloudhack/openflownodered:1.1.53"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose-traefik-letsencrypt.yml

@@ -107,7 +107,7 @@ services:
       - "traefik.http.routers.nodered.entrypoints=web,websecure"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
       - "traefik.http.routers.nodered.tls.certresolver=myresolver"
-    image: "cloudhack/openflownodered:1.1.52"
+    image: "cloudhack/openflownodered:1.1.53"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose-traefik.yml

@@ -82,7 +82,7 @@ services:
       - "traefik.http.routers.nodered.rule=Host(`nodered1.localhost.openrpa.dk`)"
       - "traefik.http.routers.nodered.entrypoints=web"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
-    image: "cloudhack/openflownodered:1.1.52"
+    image: "cloudhack/openflownodered:1.1.53"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose.yml

@@ -52,7 +52,7 @@ services:
       - "80:80"
       - "5858:5858"
   nodered:
-    image: "cloudhack/openflownodered:1.1.52"
+    image: "cloudhack/openflownodered:1.1.53"
     environment:
       #      - nodered_id=1
       - nodered_sa=nodered1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openiap",
-  "version": "1.1.52",
+  "version": "1.1.53",
   "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": {