save state on more pages

Author: skadefro

OpenFlow/src/public/Controllers.ts

@@ -112,13 +112,30 @@ 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;
+        }
         WebSocketClientService.onSignedin((user: TokenUser) => {
             this.loadData();
         });
     }
     processdata() {
         this.loading = true;
         this.loading = false;
+        if (!this.userdata.data.RPAWorkflowsCtrl) this.userdata.data.RPAWorkflowsCtrl = {};
+        this.userdata.data.RPAWorkflowsCtrl.basequery = this.basequery;
+        this.userdata.data.RPAWorkflowsCtrl.collection = this.collection;
+        this.userdata.data.RPAWorkflowsCtrl.baseprojection = this.baseprojection;
+        this.userdata.data.RPAWorkflowsCtrl.orderby = this.orderby;
+        this.userdata.data.RPAWorkflowsCtrl.searchstring = this.searchstring;
+        this.userdata.data.RPAWorkflowsCtrl.basequeryas = this.basequeryas;
+        var chart: chartset = null;
+        this.loading = false;
         if (!this.$scope.$$phase) { this.$scope.$apply(); }
         this.dographs();
     }
@@ -210,10 +227,30 @@ export class WorkflowsCtrl extends entitiesCtrl<Base> {
         this.collection = "workflow";
         this.basequery = { _type: "workflow", web: true };
         console.debug("WorkflowsCtrl");
+        this.postloadData = this.processData;
+        if (this.userdata.data.WorkflowsCtrl) {
+            this.basequery = this.userdata.data.WorkflowsCtrl.basequery;
+            this.collection = this.userdata.data.WorkflowsCtrl.collection;
+            this.baseprojection = this.userdata.data.WorkflowsCtrl.baseprojection;
+            this.orderby = this.userdata.data.WorkflowsCtrl.orderby;
+            this.searchstring = this.userdata.data.WorkflowsCtrl.searchstring;
+            this.basequeryas = this.userdata.data.WorkflowsCtrl.basequeryas;
+        }
         WebSocketClientService.onSignedin((user: TokenUser) => {
             this.loadData();
         });
     }
+    async processData(): Promise<void> {
+        if (!this.userdata.data.WorkflowsCtrl) this.userdata.data.WorkflowsCtrl = {};
+        this.userdata.data.WorkflowsCtrl.basequery = this.basequery;
+        this.userdata.data.WorkflowsCtrl.collection = this.collection;
+        this.userdata.data.WorkflowsCtrl.baseprojection = this.baseprojection;
+        this.userdata.data.WorkflowsCtrl.orderby = this.orderby;
+        this.userdata.data.WorkflowsCtrl.searchstring = this.searchstring;
+        this.userdata.data.WorkflowsCtrl.basequeryas = this.basequeryas;
+        this.loading = false;
+        if (!this.$scope.$$phase) { this.$scope.$apply(); }
+    }
 }
 export class chartset {
     options: any = {
@@ -1000,7 +1037,6 @@ export class UsersCtrl extends entitiesCtrl<TokenUser> {
         this.userdata.data.UsersCtrl.orderby = this.orderby;
         this.userdata.data.UsersCtrl.searchstring = this.searchstring;
         this.userdata.data.UsersCtrl.basequeryas = this.basequeryas;
-        var chart: chartset = null;
         this.loading = false;
         if (!this.$scope.$$phase) { this.$scope.$apply(); }
     }
@@ -3692,7 +3728,6 @@ export class CredentialsCtrl extends entitiesCtrl<Base> {
         this.userdata.data.CredentialsCtrl.orderby = this.orderby;
         this.userdata.data.CredentialsCtrl.searchstring = this.searchstring;
         this.userdata.data.CredentialsCtrl.basequeryas = this.basequeryas;
-        var chart: chartset = null;
         this.loading = false;
         if (!this.$scope.$$phase) { this.$scope.$apply(); }
     }

OpenFlow/src/public/index.html

@@ -46,6 +46,10 @@
           ng-show="menuctrl.WebSocketClientService.allow_personal_nodered == true && menuctrl.hasrole('personal nodered users')">
           <a class="nav-link" href="#/Nodered"><span translate lib="web">nodered</span></a>
         </li>
+        <li class="nav-item" ng-show="menuctrl.WebSocketClientService.stripe_api_key != ''">
+          <a class="nav-link" href="#/Payment"><span translate lib="web">billing</span></a>
+        </li>
+
         <li class="nav-item dropdown" ng-show="menuctrl.hasrole('users') || menuctrl.hasrole('admins')">
           <a class="nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
             translate lib="web">admin</a>
@@ -66,9 +70,9 @@
             <a class="dropdown-item" href="#/Sockets" ng-show="menuctrl.hasrole('admins')"><span translate
                 lib="web">sockets</span></a>
 
-            <a class="dropdown-item" href="#/Payment"
+            <!-- <a class="dropdown-item" href="#/Payment"
               ng-show="menuctrl.WebSocketClientService.stripe_api_key != ''"><span translate
-                lib="web">billing</span></a>
+                lib="web">billing</span></a> -->
 
             <a class="dropdown-item" href>ver {{menuctrl.WebSocketClientService.version}}</a>