From 182346095ba4e43072a04b7e70c850cf59357f45 Mon Sep 17 00:00:00 2001
From: Roman <ixrock@gmail.com>
Date: Thu, 12 Nov 2020 00:54:29 +0200
Subject: [PATCH] fixes

Signed-off-by: Roman <ixrock@gmail.com>
---
 extensions/support-page/main.ts           | 2 +-
 extensions/support-page/renderer.tsx      | 7 ++-----
 src/extensions/lens-main-extension.ts     | 4 +++-
 src/extensions/lens-renderer-extension.ts | 5 +++++
 src/extensions/renderer-api/navigation.ts | 1 -
 src/renderer/navigation.ts                | 4 ++--
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/extensions/support-page/main.ts b/extensions/support-page/main.ts
index 1436fe47b8..d5c78ae53e 100644
--- a/extensions/support-page/main.ts
+++ b/extensions/support-page/main.ts
@@ -7,7 +7,7 @@ export default class SupportPageMainExtension extends LensMainExtension {
       parentId: "help",
       label: "Support",
       click: () => {
-        this.navigate(this.getPageUrl(pageUrl)); // todo: simplify
+        this.navigate(pageUrl);
       }
     }
   ]
diff --git a/extensions/support-page/renderer.tsx b/extensions/support-page/renderer.tsx
index feb14457ee..b46eaa67aa 100644
--- a/extensions/support-page/renderer.tsx
+++ b/extensions/support-page/renderer.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { Component, Interface, LensRendererExtension, Navigation } from "@k8slens/extensions";
+import { Component, Interface, LensRendererExtension } from "@k8slens/extensions";
 import { Support } from "./src/support";
 import { pageRoute, pageUrl } from "./src/common-vars";
 
@@ -16,10 +16,7 @@ export default class SupportPageRendererExtension extends LensRendererExtension
   statusBarItems = [
     {
       item: (
-        <div
-          className="flex align-center gaps hover-highlight"
-          onClick={() => Navigation.navigate(this.getPageUrl(pageUrl))}
-        >
+        <div className="flex align-center gaps hover-highlight" onClick={() => this.navigate(pageUrl)}>
           <Component.Icon material="help" smallest/>
         </div>
       )
diff --git a/src/extensions/lens-main-extension.ts b/src/extensions/lens-main-extension.ts
index 5e5aa073f3..bf54293e3b 100644
--- a/src/extensions/lens-main-extension.ts
+++ b/src/extensions/lens-main-extension.ts
@@ -7,6 +7,8 @@ export class LensMainExtension extends LensExtension {
   @observable.shallow appMenus: MenuRegistration[] = []
 
   async navigate(location: string, frameId?: number) {
-    await WindowManager.getInstance<WindowManager>().navigate(location, frameId)
+    const windowManager = WindowManager.getInstance<WindowManager>();
+    const url = this.getPageUrl(location);
+    await windowManager.navigate(url, frameId)
   }
 }
diff --git a/src/extensions/lens-renderer-extension.ts b/src/extensions/lens-renderer-extension.ts
index 018cd254ca..9d9317ad1d 100644
--- a/src/extensions/lens-renderer-extension.ts
+++ b/src/extensions/lens-renderer-extension.ts
@@ -17,4 +17,9 @@ export class LensRendererExtension extends LensExtension {
   @observable.shallow statusBarItems: StatusBarRegistration[] = []
   @observable.shallow kubeObjectDetailItems: KubeObjectDetailRegistration[] = []
   @observable.shallow kubeObjectMenuItems: KubeObjectMenuRegistration[] = []
+
+  async navigate(location: string){
+    const { navigate } = await import("../renderer/navigation");
+    navigate(this.getPageUrl(location));
+  }
 }
diff --git a/src/extensions/renderer-api/navigation.ts b/src/extensions/renderer-api/navigation.ts
index 0072064b2d..f923f6e152 100644
--- a/src/extensions/renderer-api/navigation.ts
+++ b/src/extensions/renderer-api/navigation.ts
@@ -1,4 +1,3 @@
-export { RouteProps } from "react-router"
 export { navigate } from "../../renderer/navigation";
 export { hideDetails, showDetails, getDetailsUrl } from "../../renderer/navigation"
 export { IURLParams } from "../../common/utils/buildUrl";
diff --git a/src/renderer/navigation.ts b/src/renderer/navigation.ts
index 7018ada3ca..ed7e19faab 100644
--- a/src/renderer/navigation.ts
+++ b/src/renderer/navigation.ts
@@ -4,11 +4,11 @@ import { ipcRenderer } from "electron";
 import { matchPath, RouteProps } from "react-router";
 import { reaction } from "mobx";
 import { createObservableHistory } from "mobx-observable-history";
-import { createBrowserHistory, createMemoryHistory, LocationDescriptor } from "history";
+import { createBrowserHistory, LocationDescriptor } from "history";
 import logger from "../main/logger";
 import { clusterViewRoute, IClusterViewRouteParams } from "./components/cluster-manager/cluster-view.route";
 
-export const history = typeof window !== "undefined" ? createBrowserHistory() : createMemoryHistory();
+export const history = createBrowserHistory();
 export const navigation = createObservableHistory(history);
 
 /**