From 8765645179f16fd2e67ed0708b87c88b0db18477 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Tue, 18 Jan 2022 11:31:40 +0200
Subject: [PATCH] UI: Menu models improvements

---
 ui-ngx/src/app/core/services/menu.models.ts                 | 1 -
 ui-ngx/src/app/core/services/menu.service.ts                | 5 +----
 ui-ngx/src/app/modules/home/menu/menu-toggle.component.html | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/ui-ngx/src/app/core/services/menu.models.ts b/ui-ngx/src/app/core/services/menu.models.ts
index 99008fb7a6..bc08e60f2d 100644
--- a/ui-ngx/src/app/core/services/menu.models.ts
+++ b/ui-ngx/src/app/core/services/menu.models.ts
@@ -23,7 +23,6 @@ export interface MenuSection extends HasUUID{
   type: MenuSectionType;
   path: string;
   icon: string;
-  notExact?: boolean;
   isMdiIcon?: boolean;
   height?: string;
   pages?: Array<MenuSection>;
diff --git a/ui-ngx/src/app/core/services/menu.service.ts b/ui-ngx/src/app/core/services/menu.service.ts
index 51e557642e..4a52fc66f6 100644
--- a/ui-ngx/src/app/core/services/menu.service.ts
+++ b/ui-ngx/src/app/core/services/menu.service.ts
@@ -235,7 +235,6 @@ export class MenuService {
         name: 'home.home',
         type: 'link',
         path: '/home',
-        notExact: true,
         icon: 'home'
       },
       {
@@ -344,8 +343,7 @@ export class MenuService {
         name: 'api-usage.api-usage',
         type: 'link',
         path: '/usage',
-        icon: 'insert_chart',
-        notExact: true
+        icon: 'insert_chart'
       },
       {
         id: guid(),
@@ -517,7 +515,6 @@ export class MenuService {
         name: 'home.home',
         type: 'link',
         path: '/home',
-        notExact: true,
         icon: 'home'
       },
       {
diff --git a/ui-ngx/src/app/modules/home/menu/menu-toggle.component.html b/ui-ngx/src/app/modules/home/menu/menu-toggle.component.html
index 9682c1476d..0635205581 100644
--- a/ui-ngx/src/app/modules/home/menu/menu-toggle.component.html
+++ b/ui-ngx/src/app/modules/home/menu/menu-toggle.component.html
@@ -16,7 +16,7 @@
 
 -->
 <a mat-button class="tb-button-toggle"
-        routerLinkActive="tb-active" [routerLinkActiveOptions]="{exact: true}" routerLink="{{section.path}}">
+        routerLinkActive="tb-active" [routerLinkActiveOptions]="{paths: 'exact', queryParams: 'ignored', matrixParams: 'ignored', fragment: 'ignored'}" routerLink="{{section.path}}">
   <mat-icon *ngIf="!section.isMdiIcon && section.icon != null" class="material-icons">{{section.icon}}</mat-icon>
   <mat-icon *ngIf="section.isMdiIcon && section.icon != null" [svgIcon]="section.icon"></mat-icon>
   <span>{{section.name | translate}}</span>