add better filter to client page

Author: skadefro

OpenFlow/src/Messages/Message.ts

@@ -1052,6 +1052,10 @@ export class Message {
                         user._lastopenrpaclientversion = cli.clientversion;
                         UpdateDoc.$set["_lastopenrpaclientversion"] = cli.clientversion;
                     }
+                    if (cli.clientagent == "webapp") {
+                        user._lastopenrpaclientversion = cli.clientversion;
+                        UpdateDoc.$set["_lastwebappclientversion"] = cli.clientversion;
+                    }
                     if (cli.clientagent == "nodered") {
                         user._lastnoderedclientversion = cli.clientversion;
                         UpdateDoc.$set["_lastnoderedclientversion"] = cli.clientversion;

OpenFlow/src/public/Clients.html

@@ -19,8 +19,16 @@ <h1 translate lib="web">robots</h1>
     <!-- <a ng-href="#/Entity/{{ctrl.collection}}" class="btn btn-info" translate lib="web">addentity</a> -->
     <input type="checkbox" ng-model="ctrl.showinactive" ng-change="ctrl.loadData()"> <span translate
       lib="web">showinactive</span>
-    <input type="checkbox" ng-model="ctrl.showall" ng-change="ctrl.loadData()"> <span translate lib="web">showall</span>
+    <input type="radio" name="show" value="openrpa" ng-model="ctrl.show" ng-change="ctrl.loadData()"> <span translate
+      lib="web">openrpa</span>
+    <input type="radio" name="show" value="nodered" ng-model="ctrl.show" ng-change="ctrl.loadData()"> <span translate
+      lib="web">nodered</span>
+    <input type="radio" name="show" value="webapp" ng-model="ctrl.show" ng-change="ctrl.loadData()"> <span translate
+      lib="web">web</span>
+    <input type="radio" name="show" value="all" ng-model="ctrl.show" ng-change="ctrl.loadData()"> <span translate
+      lib="web">showall</span>
     <!-- <a ng-href="#/Entity/{{ctrl.collection}}" class="btn btn-info"><i class="az-add-lg"></i></a> -->
+    <br> {{ctrl.showall}} / {{ctrl.show}}
   </div>
 </div>
 <div ng-show="ctrl.errormessage != ''"" class=" alert alert-danger" role="alert">{{ctrl.errormessage}}</div>
@@ -58,7 +66,12 @@ <h1 translate lib="web">robots</h1>
       <!-- <td>
         <timesince ng-model="model._heartbeat" />
       </td> -->
-      <td>{{model._lastopenrpaclientversion}}</td>
+      <td>
+        <div ng-show="ctrl.show == 'openrpa'">{{model._lastopenrpaclientversion}}</div>
+        <div ng-show="ctrl.show == 'nodered'">{{model._lastnoderedclientversion}}</div>
+        <div ng-show="ctrl.show == 'webapp'">{{model._lastwebappclientversion}}</div>
+        <div ng-show="ctrl.show == 'all'">{{model._lastclientversion}}</div>
+      </td>
       <td class="btn-cell">
         <a href ng-click="ctrl.ShowWorkflows(model)" class="table-btn">workflows</a>
       </td>

OpenFlow/src/public/Controllers.ts

@@ -3092,8 +3092,8 @@ export class hdrobotsCtrl extends entitiesCtrl<unattendedclient> {
     }
 }
 export class ClientsCtrl extends entitiesCtrl<unattendedclient> {
-    public showall: boolean = true;
     public showinactive: boolean = false;
+    public show: string = "all";
     constructor(
         public $scope: ng.IScope,
         public $location: ng.ILocationService,
@@ -3112,17 +3112,17 @@ export class ClientsCtrl extends entitiesCtrl<unattendedclient> {
         this.preloadData = () => {
             const dt = new Date(new Date().toISOString());
             if (this.showinactive) {
-                if (this.showall) {
-                    this.basequery = { _heartbeat: { "$exists": true } };
-                } else {
-                    this.basequery = { _rpaheartbeat: { "$exists": true } };
-                }
-            } else if (this.showall) {
-                dt.setMinutes(dt.getMinutes() - 1);
-                this.basequery = { _heartbeat: { "$gte": dt } };
+                if (this.show == "openrpa") this.basequery = { "_rpaheartbeat": { "$exists": true } };
+                if (this.show == "nodered") this.basequery = { "_noderedheartbeat": { "$exists": true } };
+                if (this.show == "webapp") this.basequery = { "_webheartbeat": { "$exists": true } };
+                if (this.show == "all") this.basequery = { _heartbeat: { "$exists": true } };
             } else {
                 dt.setMinutes(dt.getMinutes() - 1);
-                this.basequery = { _rpaheartbeat: { "$gte": dt } };
+                this.basequery = { "$or": [] };
+                if (this.show == "openrpa") this.basequery = { "_rpaheartbeat": { "$gte": dt } };
+                if (this.show == "nodered") this.basequery = { "_noderedheartbeat": { "$gte": dt } };
+                if (this.show == "webapp") this.basequery = { "_webheartbeat": { "$gte": dt } };
+                if (this.show == "all") this.basequery = { _heartbeat: { "$gte": dt } };
             }
         };
         if (this.userdata.data.ClientsCtrl) {
@@ -3133,7 +3133,7 @@ export class ClientsCtrl extends entitiesCtrl<unattendedclient> {
             this.searchstring = this.userdata.data.ClientsCtrl.searchstring;
             this.basequeryas = this.userdata.data.ClientsCtrl.basequeryas;
             this.showinactive = this.userdata.data.ClientsCtrl.showinactive;
-            this.showall = this.userdata.data.ClientsCtrl.showall;
+            this.show = this.userdata.data.ClientsCtrl.show;
         }
         WebSocketClientService.onSignedin((user: TokenUser) => {
             this.loadData();
@@ -3148,7 +3148,7 @@ export class ClientsCtrl extends entitiesCtrl<unattendedclient> {
         this.userdata.data.ClientsCtrl.searchstring = this.searchstring;
         this.userdata.data.ClientsCtrl.basequeryas = this.basequeryas;
         this.userdata.data.ClientsCtrl.showinactive = this.showinactive;
-        this.userdata.data.ClientsCtrl.showall = this.showall;
+        this.userdata.data.ClientsCtrl.show = this.show;
 
         for (let i = 0; i < this.models.length; i++) {
             const model: any = this.models[i];