From 97a04a2fba22b598311b39c210c1acd933e7a9a5 Mon Sep 17 00:00:00 2001
From: Rajnikant Lodhi <rajnikant.lodhi@solarwinds.com>
Date: Mon, 25 Jul 2022 11:49:21 +0530
Subject: [PATCH] Resolve  the top-right menu url  issue

---
 src/app/app-routing.module.ts                          |  6 +++---
 .../default-layout/default-layout.component.html       | 10 ++++++++--
 .../layouts/default-layout/default-layout.component.ts |  1 +
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index f87fd595..b7e80bbf 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -92,9 +92,9 @@ const routes: Routes = [
         canActivate: [LoginGuard],
         resolve: { controller: ControllerResolve },
       },
-      { path: 'help', component: HelpComponent },
-      { path: 'settings', component: SettingsComponent },
-      { path: 'settings/console', component: ConsoleComponent },
+      { path: 'controller/:controller_id/help', component: HelpComponent },
+      { path: 'controller/:controller_id/settings', component: SettingsComponent },
+      { path: 'controller/:controller_id/settings/console', component: ConsoleComponent },
       {
         path: 'controller/:controller_id/management/users/:user_id',
         component: UserDetailComponent,
diff --git a/src/app/layouts/default-layout/default-layout.component.html b/src/app/layouts/default-layout/default-layout.component.html
index b2e84204..f3d77d67 100644
--- a/src/app/layouts/default-layout/default-layout.component.html
+++ b/src/app/layouts/default-layout/default-layout.component.html
@@ -38,7 +38,10 @@
         <mat-icon>collections</mat-icon>
         <span>Image manager</span>
       </button>
-      <button mat-menu-item routerLink="/settings">
+      <button mat-menu-item
+      [disabled]="!controllerId"
+      [routerLink]="['controller', controllerId, 'settings']"
+      >
         <mat-icon>settings</mat-icon>
         <span>Settings</span>
       </button>
@@ -48,7 +51,10 @@
         <mat-icon>groups</mat-icon>
         <span>Management</span>
       </button>
-      <button mat-menu-item routerLink="/help">
+      <button mat-menu-item 
+      [disabled]="!controllerId"
+      [routerLink]="['controller', controllerId, 'help']"
+      >
         <mat-icon>help</mat-icon>
         <span>Help</span>
       </button>
diff --git a/src/app/layouts/default-layout/default-layout.component.ts b/src/app/layouts/default-layout/default-layout.component.ts
index d0940b74..571ad42f 100644
--- a/src/app/layouts/default-layout/default-layout.component.ts
+++ b/src/app/layouts/default-layout/default-layout.component.ts
@@ -41,6 +41,7 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
     private controllerService: ControllerService
   ) {
     this.router.events.subscribe((data) => {
+      debugger
       if (data instanceof NavigationEnd) {
         this.controllerId = this.route.children[0].snapshot.paramMap.get("controller_id");
       }