add validated to users add more sorts

Author: skadefro

OpenFlow/src/public/Users.html

@@ -21,8 +21,13 @@ <h1 translate lib="web">users</h1>
       <th ng-click="ctrl.ToggleOrder('username')"><b translate lib="web">username</b></th>
       <th ng-click="ctrl.ToggleOrder('_created')"><b translate lib="web">created</b></th>
       <th ng-click="ctrl.ToggleOrder('lastseen')"><b translate lib="web">lastseen</b></th>
+      <th ng-show="ctrl.WebSocketClientService.stripe_api_key != ''" ng-click="ctrl.ToggleOrder('_hasbilling')">
+        <i class="fas fa-money-bill-wave"></i>
+      </th>
       <th></th>
-      <th></th>
+      <th ng-show="ctrl.WebSocketClientService.validate_user_form != ''" ng-click="ctrl.ToggleOrder('validated')">
+        <i class="fas fa-check"></i>
+      </th>
       <th></th>
       <th></th>
     </tr>
@@ -42,15 +47,18 @@ <h1 translate lib="web">users</h1>
           chart-labels="model.chart.labels" chart-series="model.chart.series" height="40px" width="200">
         </canvas>
       </td> -->
-      <td class="btn-cell">
+      <td class="btn-cell" ng-show="ctrl.WebSocketClientService.stripe_api_key != ''">
         <a ng-href="#/Payment/{{model._id}}" class="table-btn"
-          ng-show="menuctrl.WebSocketClientService.stripe_api_key != '' && menuctrl.hasrole('admins') && model._hasbilling == true">
+          ng-show="menuctrl.hasrole('admins') && model._hasbilling == true">
           <i class="fas fa-money-bill-wave"></i></a>
       </td>
       <td class="btn-cell">
         <a ng-href ng-click="ctrl.Impersonate(model)" ng-show="model._id != ctrl.WebSocketClientService.user._id"><i
             class="fas fa-user-secret" style="color: #007bff;"></i></a>
       </td>
+      <td class="btn-cell" ng-show="ctrl.WebSocketClientService.validate_user_form != ''">
+        <i ng-show="model.validated" class="fas fa-check"></i></th>
+      </td>
       <td class="btn-cell">
         <a ng-href="#/User/{{model._id}}"><i class="az-edit"></i></a>
       </td>

OpenFlow/src/public/WebSocketClientService.ts

@@ -32,6 +32,7 @@ export class WebSocketClientService {
                 this.nodered_domain_schema = data.nodered_domain_schema;
                 this.websocket_package_size = data.websocket_package_size;
                 this.stripe_api_key = data.stripe_api_key;
+                this.validate_user_form = data.validate_user_form;
 
                 if (WebSocketClient.instance == null) {
                     const cli: WebSocketClient = new WebSocketClient(this.logger, wsurl);
@@ -151,6 +152,7 @@ export class WebSocketClientService {
     public nodered_domain_schema: string = "";
     public websocket_package_size: number = 4096;
     public stripe_api_key: string = "";
+    public validate_user_form: string = "";
 
     getJSON(url: string, callback: any): void {
         const xhr: XMLHttpRequest = new XMLHttpRequest();

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openiap/nodered",
-  "version": "1.1.156",
+  "version": "1.1.157",
   "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.156
+1.1.157

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openiap/openflow",
-  "version": "1.1.156",
+  "version": "1.1.157",
   "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": {