Merge branch 'feature/hide-edge-on-ui' into develop/3.3-edge

@@ -16,21 +16,18 @@
 
 
 import { AuthUser, User } from '@shared/models/user.model';
 import { AuthUser, User } from '@shared/models/user.model';
 
 
-export interface AuthPayload {
-  authUser: AuthUser;
-  userDetails: User;
+export interface SysParamsState {
   userTokenAccessEnabled: boolean;
   userTokenAccessEnabled: boolean;
   allowedDashboardIds: string[];
   allowedDashboardIds: string[];
-  forceFullscreen: boolean;
+  edgesSupportEnabled: boolean;
 }
 }
-
-export interface AuthState {
-  isAuthenticated: boolean;
-  isUserLoaded: boolean;
+export interface AuthPayload extends SysParamsState {
   authUser: AuthUser;
   authUser: AuthUser;
   userDetails: User;
   userDetails: User;
-  userTokenAccessEnabled: boolean;
-  allowedDashboardIds: string[];
   forceFullscreen: boolean;
   forceFullscreen: boolean;
+}
+export interface AuthState extends AuthPayload {
+  isAuthenticated: boolean;
+  isUserLoaded: boolean;
   lastPublicDashboardId: string;
   lastPublicDashboardId: string;
 }
 }

@@ -22,7 +22,8 @@ const emptyUserAuthState: AuthPayload = {
   userDetails: null,
   userDetails: null,
   userTokenAccessEnabled: false,
   userTokenAccessEnabled: false,
   forceFullscreen: false,
   forceFullscreen: false,
-  allowedDashboardIds: []
+  allowedDashboardIds: [],
+  edgesSupportEnabled: false
 };
 };
 
 
 export const initialState: AuthState = {
 export const initialState: AuthState = {

@@ -31,7 +31,7 @@ import { ActionAuthAuthenticated, ActionAuthLoadUser, ActionAuthUnauthenticated
 import { getCurrentAuthState, getCurrentAuthUser } from './auth.selectors';
 import { getCurrentAuthState, getCurrentAuthUser } from './auth.selectors';
 import { Authority } from '@shared/models/authority.enum';
 import { Authority } from '@shared/models/authority.enum';
 import { ActionSettingsChangeLanguage } from '@app/core/settings/settings.actions';
 import { ActionSettingsChangeLanguage } from '@app/core/settings/settings.actions';
-import { AuthPayload, AuthState } from '@core/auth/auth.models';
+import { AuthPayload, AuthState, SysParamsState } from '@core/auth/auth.models';
 import { TranslateService } from '@ngx-translate/core';
 import { TranslateService } from '@ngx-translate/core';
 import { AuthUser } from '@shared/models/user.model';
 import { AuthUser } from '@shared/models/user.model';
 import { TimeService } from '@core/services/time.service';
 import { TimeService } from '@core/services/time.service';
@@ -45,6 +45,7 @@ import { ActionNotificationShow } from '@core/notification/notification.actions'
 import { MatDialog, MatDialogConfig } from '@angular/material/dialog';
 import { MatDialog, MatDialogConfig } from '@angular/material/dialog';
 import { AlertDialogComponent } from '@shared/components/dialog/alert-dialog.component';
 import { AlertDialogComponent } from '@shared/components/dialog/alert-dialog.component';
 import { OAuth2ClientInfo } from '@shared/models/oauth2.models';
 import { OAuth2ClientInfo } from '@shared/models/oauth2.models';
+import { EdgeService } from "@core/http/edge.service";
 
 
 @Injectable({
 @Injectable({
     providedIn: 'root'
     providedIn: 'root'
@@ -425,16 +426,24 @@ export class AuthService {
     }
     }
   }
   }
 
 
-  private loadSystemParams(authPayload: AuthPayload): Observable<any> {
-    const sources: Array<Observable<any>> = [this.loadIsUserTokenAccessEnabled(authPayload.authUser),
-                                             this.fetchAllowedDashboardIds(authPayload),
-                                             this.timeService.loadMaxDatapointsLimit()];
+  public loadIsEdgesSupportEnabled(): Observable<boolean> {
+    return this.http.get<boolean>('/api/edges/enabled', defaultHttpOptions());
+  }
+
+  private loadSystemParams(authPayload: AuthPayload): Observable<SysParamsState> {
+    const sources = [this.loadIsUserTokenAccessEnabled(authPayload.authUser),
+                     this.fetchAllowedDashboardIds(authPayload),
+                     this.loadIsEdgesSupportEnabled(),
+                     this.timeService.loadMaxDatapointsLimit()];
     return forkJoin(sources)
     return forkJoin(sources)
       .pipe(map((data) => {
       .pipe(map((data) => {
-        const userTokenAccessEnabled: boolean = data[0];
-        const allowedDashboardIds: string[] = data[1];
-        return {userTokenAccessEnabled, allowedDashboardIds};
-      }));
+        const userTokenAccessEnabled: boolean = data[0] as boolean;
+        const allowedDashboardIds: string[] = data[1] as string[];
+        const edgesSupportEnabled: boolean = data[2] as boolean;
+        return {userTokenAccessEnabled, allowedDashboardIds, edgesSupportEnabled};
+      }, catchError((err) => {
+        return of({});
+      })));
   }
   }
 
 
   public refreshJwtToken(loadUserElseStoreJwtToken = true): Observable<LoginResponse> {
   public refreshJwtToken(loadUserElseStoreJwtToken = true): Observable<LoginResponse> {

@@ -18,13 +18,14 @@ import { Injectable } from '@angular/core';
 import { AuthService } from '../auth/auth.service';
 import { AuthService } from '../auth/auth.service';
 import { select, Store } from '@ngrx/store';
 import { select, Store } from '@ngrx/store';
 import { AppState } from '../core.state';
 import { AppState } from '../core.state';
-import { selectAuthUser, selectIsAuthenticated } from '../auth/auth.selectors';
+import {selectAuth, selectAuthUser, selectIsAuthenticated} from '../auth/auth.selectors';
 import { take } from 'rxjs/operators';
 import { take } from 'rxjs/operators';
 import { HomeSection, MenuSection } from '@core/services/menu.models';
 import { HomeSection, MenuSection } from '@core/services/menu.models';
 import { BehaviorSubject, Observable, Subject } from 'rxjs';
 import { BehaviorSubject, Observable, Subject } from 'rxjs';
 import { Authority } from '@shared/models/authority.enum';
 import { Authority } from '@shared/models/authority.enum';
 import { AuthUser } from '@shared/models/user.model';
 import { AuthUser } from '@shared/models/user.model';
 import { guid } from '@core/utils';
 import { guid } from '@core/utils';
+import {AuthState} from "@core/auth/auth.models";
 
 
 @Injectable({
 @Injectable({
   providedIn: 'root'
   providedIn: 'root'
@@ -45,23 +46,23 @@ export class MenuService {
   }
   }
 
 
   private buildMenu() {
   private buildMenu() {
-    this.store.pipe(select(selectAuthUser), take(1)).subscribe(
-      (authUser: AuthUser) => {
-        if (authUser) {
+    this.store.pipe(select(selectAuth), take(1)).subscribe(
+      (authState: AuthState) => {
+        if (authState.authUser) {
           let menuSections: Array<MenuSection>;
           let menuSections: Array<MenuSection>;
           let homeSections: Array<HomeSection>;
           let homeSections: Array<HomeSection>;
-          switch (authUser.authority) {
+          switch (authState.authUser.authority) {
             case Authority.SYS_ADMIN:
             case Authority.SYS_ADMIN:
-              menuSections = this.buildSysAdminMenu(authUser);
-              homeSections = this.buildSysAdminHome(authUser);
+              menuSections = this.buildSysAdminMenu(authState);
+              homeSections = this.buildSysAdminHome(authState);
               break;
               break;
             case Authority.TENANT_ADMIN:
             case Authority.TENANT_ADMIN:
-              menuSections = this.buildTenantAdminMenu(authUser);
-              homeSections = this.buildTenantAdminHome(authUser);
+              menuSections = this.buildTenantAdminMenu(authState);
+              homeSections = this.buildTenantAdminHome(authState);
               break;
               break;
             case Authority.CUSTOMER_USER:
             case Authority.CUSTOMER_USER:
-              menuSections = this.buildCustomerUserMenu(authUser);
-              homeSections = this.buildCustomerUserHome(authUser);
+              menuSections = this.buildCustomerUserMenu(authState);
+              homeSections = this.buildCustomerUserHome(authState);
               break;
               break;
           }
           }
           this.menuSections$.next(menuSections);
           this.menuSections$.next(menuSections);
@@ -71,7 +72,7 @@ export class MenuService {
     );
     );
   }
   }
 
 
-  private buildSysAdminMenu(authUser: any): Array<MenuSection> {
+  private buildSysAdminMenu(authState: AuthState): Array<MenuSection> {
     const sections: Array<MenuSection> = [];
     const sections: Array<MenuSection> = [];
     sections.push(
     sections.push(
       {
       {
@@ -152,7 +153,7 @@ export class MenuService {
     return sections;
     return sections;
   }
   }
 
 
-  private buildSysAdminHome(authUser: any): Array<HomeSection> {
+  private buildSysAdminHome(authState: AuthState): Array<HomeSection> {
     const homeSections: Array<HomeSection> = [];
     const homeSections: Array<HomeSection> = [];
     homeSections.push(
     homeSections.push(
       {
       {
@@ -215,7 +216,7 @@ export class MenuService {
     return homeSections;
     return homeSections;
   }
   }
 
 
-  private buildTenantAdminMenu(authUser: any): Array<MenuSection> {
+  private buildTenantAdminMenu(authState: AuthState): Array<MenuSection> {
     const sections: Array<MenuSection> = [];
     const sections: Array<MenuSection> = [];
     sections.push(
     sections.push(
       {
       {
@@ -267,31 +268,37 @@ export class MenuService {
         type: 'link',
         type: 'link',
         path: '/entityViews',
         path: '/entityViews',
         icon: 'view_quilt'
         icon: 'view_quilt'
-      },
-      {
-        id: guid(),
-        name: 'edge.management',
-        type: 'toggle',
-        path: '/edges',
-        height: '80px',
-        icon: 'router',
-        pages: [
-          {
-            id: guid(),
-            name: 'edge.edges',
-            type: 'link',
-            path: '/edges',
-            icon: 'router'
-          },
-          {
-            id: guid(),
-            name: 'rulechain.edge-rulechains',
-            type: 'link',
-            path: '/edges/ruleChains',
-            icon: 'settings_ethernet'
-          }
-        ]
-      },
+      }
+    );
+    if (authState.edgesSupportEnabled) {
+      sections.push(
+        {
+          id: guid(),
+          name: 'edge.management',
+          type: 'toggle',
+          path: '/edges',
+          height: '80px',
+          icon: 'router',
+          pages: [
+            {
+              id: guid(),
+              name: 'edge.edges',
+              type: 'link',
+              path: '/edges',
+              icon: 'router'
+            },
+            {
+              id: guid(),
+              name: 'rulechain.edge-rulechains',
+              type: 'link',
+              path: '/edges/ruleChains',
+              icon: 'settings_ethernet'
+            }
+          ]
+        }
+      );
+    }
+    sections.push(
       {
       {
         id: guid(),
         id: guid(),
         name: 'widget.widget-library',
         name: 'widget.widget-library',
@@ -325,7 +332,7 @@ export class MenuService {
     return sections;
     return sections;
   }
   }
 
 
-  private buildTenantAdminHome(authUser: any): Array<HomeSection> {
+  private buildTenantAdminHome(authState: AuthState): Array<HomeSection> {
     const homeSections: Array<HomeSection> = [];
     const homeSections: Array<HomeSection> = [];
     homeSections.push(
     homeSections.push(
       {
       {
@@ -383,22 +390,28 @@ export class MenuService {
             path: '/entityViews'
             path: '/entityViews'
           }
           }
         ]
         ]
-      },
-      {
-        name: 'edge.management',
-        places: [
-          {
-            name: 'edge.edges',
-            icon: 'router',
-            path: '/edges'
-          },
-          {
-            name: 'rulechain.edge-rulechains',
-            icon: 'settings_ethernet',
-            path: '/edges/ruleChains'
-          }
-        ]
-      },
+      }
+    );
+    if (authState.edgesSupportEnabled) {
+      homeSections.push(
+        {
+          name: 'edge.management',
+          places: [
+            {
+              name: 'edge.edges',
+              icon: 'router',
+              path: '/edges'
+            },
+            {
+              name: 'rulechain.edge-rulechains',
+              icon: 'settings_ethernet',
+              path: '/edges/ruleChains'
+            }
+          ]
+        }
+      );
+    }
+    homeSections.push(
       {
       {
         name: 'dashboard.management',
         name: 'dashboard.management',
         places: [
         places: [
@@ -433,7 +446,7 @@ export class MenuService {
     return homeSections;
     return homeSections;
   }
   }
 
 
-  private buildCustomerUserMenu(authUser: any): Array<MenuSection> {
+  private buildCustomerUserMenu(authState: AuthState): Array<MenuSection> {
     const sections: Array<MenuSection> = [];
     const sections: Array<MenuSection> = [];
     sections.push(
     sections.push(
       {
       {
@@ -475,7 +488,7 @@ export class MenuService {
     return sections;
     return sections;
   }
   }
 
 
-  private buildCustomerUserHome(authUser: any): Array<HomeSection> {
+  private buildCustomerUserHome(authState: AuthState): Array<HomeSection> {
     const homeSections: Array<HomeSection> = [
     const homeSections: Array<HomeSection> = [
       {
       {
         name: 'asset.view-assets',
         name: 'asset.view-assets',