Merge pull request openiap#203 from skadefro/master

add grafana link

Author: skadefro

OpenFlow/src/LoginProvider.ts

@@ -395,6 +395,7 @@ export class LoginProvider {
                     collections_with_text_index: DatabaseConnection.collections_with_text_index,
                     timeseries_collections: DatabaseConnection.timeseries_collections,
                     ping_clients_interval: Config.ping_clients_interval,
+                    validlicense: Logger.License.validlicense
                 }
                 res.end(JSON.stringify(res2));
             } catch (error) {

OpenFlow/src/public/WebSocketClientService.ts

@@ -44,7 +44,7 @@ export class WebSocketClientService {
                 if (data.timeseries_collections) this.timeseries_collections = data.timeseries_collections;
 
                 this.ping_clients_interval = data.ping_clients_interval;
-
+                this.validlicense = data.validlicense;
 
 
                 if (NoderedUtil.IsNullUndefinded(WebSocketClient.instance)) {
@@ -186,6 +186,7 @@ export class WebSocketClientService {
     public collections_with_text_index: string[] = [];
     public timeseries_collections: string[] = [];
     public ping_clients_interval: number = 10000;
+    public validlicense: boolean = false;
 
     getJSON(url: string, callback: any): void {
         const xhr: XMLHttpRequest = new XMLHttpRequest();

OpenFlow/src/public/index.html

@@ -41,12 +41,15 @@
         ng-show="(menuctrl.hasrole('users') && !menuctrl.hasrole('menu hide rpaworkflows')) || menuctrl.hasrole('admins')"><span
           translate lib="web">rpaworkflows</span></a>
 
+      <a href="//grafana.{{menuctrl.WebSocketClientService.domain}}" class="sidebar-link" id="menugrafana" target="_blank"
+        ng-show="menuctrl.WebSocketClientService.validlicense"><span
+          translate lib="web">grafana</span></a>
+
       <div ng-show="(menuctrl.hasrole('users') && !menuctrl.hasrole('menu hide admins')) || menuctrl.hasrole('admins')">
         <h5 class="sidebar-title">User management</h5>
         <div class="sidebar-divider"></div>
-        <a class="sidebar-link" 
-        ng-class="{active: menuctrl.PathIs(['/User/{{menuctrl.user._id}}'])}"
-        ng-href="#/User/{{menuctrl.user._id}}"> {{menuctrl.user.name || menuctrl.user.username
+        <a class="sidebar-link" ng-class="{active: menuctrl.PathIs(['/User/{{menuctrl.user._id}}'])}"
+          ng-href="#/User/{{menuctrl.user._id}}"> {{menuctrl.user.name || menuctrl.user.username
           }} </a>
 
         <a class="sidebar-link" href="#/Users" id="menuadminusers"
@@ -65,9 +68,9 @@ <h5 class="sidebar-title">Misc management</h5>
       <div class="sidebar-divider"></div>
 
       <a href="#/WorkitemQueues" class="sidebar-link" id="menuworkitems"
-      ng-class="{active: menuctrl.PathIs(['/WorkitemQueues', '/WorkitemQueue/', '/WorkitemQueue'])}"
-      ng-show="(menuctrl.hasrole('admins') || menuctrl.hasrole('workitem queue users'))"><span translate
-        lib="web">workitemqueues</span></a>
+        ng-class="{active: menuctrl.PathIs(['/WorkitemQueues', '/WorkitemQueue/', '/WorkitemQueue'])}"
+        ng-show="(menuctrl.hasrole('admins') || menuctrl.hasrole('workitem queue users'))"><span translate
+          lib="web">workitemqueues</span></a>
 
 
       <a href="#/Entities" class="sidebar-link" id="menuentities"
@@ -90,14 +93,12 @@ <h5 class="sidebar-title">Misc management</h5>
       <a class="sidebar-link" href="#/Forms" id="menuadminforms"
         ng-class="{active: menuctrl.PathIs(['/Forms', '/EditForm', '/EditForm/'])}"><span translate
           lib="web">forms</span></a>
-      <a class="sidebar-link" href="#/Providers" 
-      ng-class="{active: menuctrl.PathIs(['/Providers', '/Provider', '/Provider/'])}"
-      ng-show="menuctrl.hasrole('admins')"><span translate
-          lib="web">providers</span></a>
-      <a class="sidebar-link" href="#/OAuthClients" 
-      ng-class="{active: menuctrl.PathIs(['/OAuthClients', '/OAuthClient', '/OAuthClient/'])}"
-      ng-show="menuctrl.hasrole('admins')"><span translate
-          lib="web">oauthclients</span></a>
+      <a class="sidebar-link" href="#/Providers"
+        ng-class="{active: menuctrl.PathIs(['/Providers', '/Provider', '/Provider/'])}"
+        ng-show="menuctrl.hasrole('admins')"><span translate lib="web">providers</span></a>
+      <a class="sidebar-link" href="#/OAuthClients"
+        ng-class="{active: menuctrl.PathIs(['/OAuthClients', '/OAuthClient', '/OAuthClient/'])}"
+        ng-show="menuctrl.hasrole('admins')"><span translate lib="web">oauthclients</span></a>
       <a class="sidebar-link" id="menuadminfiles" ng-class="{active: menuctrl.PathIs(['/Files'])}" href="#/Files"><span
           translate lib="web">files</span></a>
       <a class="sidebar-link" ng-class="{active: menuctrl.PathIs(['/hdrobots'])}" href="#/hdrobots"><span translate

OpenFlow/src/public/languages/da-DK/web.json

@@ -7,6 +7,7 @@
     "workitems": "Arbejdsopgaver",
     "workitemqueues": "Opgaver Køer",
     "home": "Hjem",
+    "grafana": "Grafana",
     "entities": "Objekter",
     "deleted entities": "Slettede objekter",
     "admin": "Admin",

OpenFlow/src/public/languages/en-US/web.json

@@ -7,6 +7,7 @@
     "workitems": "Work Items",
     "workitemqueues": "Work Item Queues",
     "home": "Home",
+    "grafana": "Grafana",
     "entities": "Entities",
     "deleted entities": "Deleted entities",
     "admin": "Admin",