Changed Toggle navigation shortcut, fix for Url issue

Signed-off-by: Milan Klanjsek <mklanjsek@pivotal.io>
vmware-archive · Oct 20, 2020 · dcd0781 · dcd0781
1 parent e4b120e
commit dcd0781
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/web/src/app/modules/shared/components/smart/helper/helper.component.html b/web/src/app/modules/shared/components/smart/helper/helper.component.html
@@ -179,7 +179,7 @@ <h3 class="modal-title">Keyboard Shortcuts</h3>
         >
           <clr-stack-label>Toggle Navigation</clr-stack-label>
           <clr-stack-content>
-            <span class="label">Ctrl Shift<span class="badge">N</span></span>
+            <span class="label">Ctrl<span class="badge">b</span></span>
           </clr-stack-content>
         </clr-stack-block>
         <clr-stack-block

diff --git a/web/src/app/modules/shared/services/navigation/navigation.service.ts b/web/src/app/modules/shared/services/navigation/navigation.service.ts
@@ -59,7 +59,12 @@ export class NavigationService {
       this.current.next(update);
       this.createModules(update.sections);
       if (update.defaultPath) {
-        this.activeUrl.next(update.defaultPath);
+        const newUrl = update.defaultPath.startsWith('/')
+          ? update.defaultPath
+          : '/' + update.defaultPath;
+        if (newUrl !== this.activeUrl.value) {
+          this.activeUrl.next(newUrl);
+        }
       }
       this.updateLastSelection();
     });

diff --git a/web/src/app/modules/sugarloaf/components/smart/navigation/navigation.component.ts b/web/src/app/modules/sugarloaf/components/smart/navigation/navigation.component.ts
@@ -100,7 +100,7 @@ export class NavigationComponent implements OnInit, OnDestroy {
       event.preventDefault();
       event.cancelBubble = true;
       this.themeService.switchTheme();
-    } else if (event.key === 'N' && event.ctrlKey) {
+    } else if (event.key === 'b' && event.ctrlKey) {
       event.preventDefault();
       event.cancelBubble = true;
       this.updateNavCollapsed(!this.collapsed);