From 1e47d5b3fffbfe6905299613b09920a49e41ce6b Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Tue, 21 Mar 2023 12:19:37 +0200
Subject: [PATCH] UI: Minor improvements

---
 ui-ngx/src/app/core/services/menu.service.ts              | 8 ++++----
 .../app/modules/home/pages/admin/admin-routing.module.ts  | 1 -
 .../home/pages/rulechain/rulechain-page.component.ts      | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ui-ngx/src/app/core/services/menu.service.ts b/ui-ngx/src/app/core/services/menu.service.ts
index 27fce29aa8..9f160a40bf 100644
--- a/ui-ngx/src/app/core/services/menu.service.ts
+++ b/ui-ngx/src/app/core/services/menu.service.ts
@@ -15,7 +15,6 @@
 ///
 
 import { Injectable } from '@angular/core';
-import { AuthService } from '../auth/auth.service';
 import { select, Store } from '@ngrx/store';
 import { AppState } from '../core.state';
 import { getCurrentOpenedMenuSections, selectAuth, selectIsAuthenticated } from '../auth/auth.selectors';
@@ -37,7 +36,6 @@ export class MenuService {
   homeSections$: Subject<Array<HomeSection>> = new BehaviorSubject<Array<HomeSection>>([]);
 
   constructor(private store: Store<AppState>,
-              private authService: AuthService,
               private router: Router) {
     this.store.pipe(select(selectIsAuthenticated)).subscribe(
       (authenticated: boolean) => {
@@ -180,8 +178,9 @@ export class MenuService {
       {
         id: guid(),
         name: 'security.security',
-        type: 'link',
+        type: 'toggle',
         path: '/security-settings',
+        height: '120px',
         icon: 'security',
         pages: [
           {
@@ -553,8 +552,9 @@ export class MenuService {
       {
         id: guid(),
         name: 'security.security',
-        type: 'link',
+        type: 'toggle',
         path: '/security-settings',
+        height: '40px',
         icon: 'security',
         pages: [
           {
diff --git a/ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts b/ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts
index bf8302d9c6..7b3fb8664e 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts
+++ b/ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts
@@ -278,7 +278,6 @@ const routes: Routes = [
   },
   {
     path: 'security-settings',
-    component: RouterTabsComponent,
     data: {
       auth: [Authority.SYS_ADMIN, Authority.TENANT_ADMIN],
       breadcrumb: {
diff --git a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts
index ab553793fc..5efc23a85b 100644
--- a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts
@@ -1456,7 +1456,7 @@ export class RuleChainPageComponent extends PageComponent
           this.isDirtyValue = false;
           this.isImport = false;
           if (this.ruleChainType !== RuleChainType.EDGE) {
-            this.router.navigateByUrl(`ruleChains/${this.ruleChain.id.id}`);
+            this.router.navigateByUrl(`features/ruleChains/${this.ruleChain.id.id}`);
           } else {
             this.router.navigateByUrl(`edgeManagement/ruleChains/${this.ruleChain.id.id}`);
           }