diff --git a/extensions/support-page/main.ts b/extensions/support-page/main.ts
index d5c78ae53e..870478afb2 100644
--- a/extensions/support-page/main.ts
+++ b/extensions/support-page/main.ts
@@ -1,5 +1,4 @@
import { LensMainExtension } from "@k8slens/extensions";
-import { pageUrl } from "./src/common-vars";
export default class SupportPageMainExtension extends LensMainExtension {
appMenus = [
@@ -7,7 +6,7 @@ export default class SupportPageMainExtension extends LensMainExtension {
parentId: "help",
label: "Support",
click: () => {
- this.navigate(pageUrl);
+ this.navigate();
}
}
]
diff --git a/extensions/support-page/renderer.tsx b/extensions/support-page/renderer.tsx
index 64b46b76b7..452af1278c 100644
--- a/extensions/support-page/renderer.tsx
+++ b/extensions/support-page/renderer.tsx
@@ -1,14 +1,12 @@
import React from "react";
import { Component, Interface, LensRendererExtension } from "@k8slens/extensions";
-import { Support } from "./src/support";
-import { pageRoute, pageUrl } from "./src/common-vars";
+import { SupportPage } from "./src/support";
export default class SupportPageRendererExtension extends LensRendererExtension {
globalPages: Interface.PageRegistration[] = [
{
- routePath: pageRoute,
components: {
- Page: Support,
+ Page: SupportPage,
}
}
]
@@ -16,7 +14,7 @@ export default class SupportPageRendererExtension extends LensRendererExtension
statusBarItems: Interface.StatusBarRegistration[] = [
{
item: (
-
this.navigate(pageUrl)}>
+
this.navigate()}>
)
diff --git a/extensions/support-page/src/common-vars.ts b/extensions/support-page/src/common-vars.ts
deleted file mode 100644
index 4a3cec5d58..0000000000
--- a/extensions/support-page/src/common-vars.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// Common variables for both processes (main & renderer)
-
-export const pageRoute = "/support"
-export const pageUrl = pageRoute; // same since no special :placeholder-s for react-router's route
diff --git a/extensions/support-page/src/support.scss b/extensions/support-page/src/support.scss
index efc14f2827..d4a29cd24f 100644
--- a/extensions/support-page/src/support.scss
+++ b/extensions/support-page/src/support.scss
@@ -1,4 +1,4 @@
-.PageLayout.Support {
+.SupportPage {
a[target=_blank] {
text-decoration: none;
border-bottom: 1px solid;
diff --git a/extensions/support-page/src/support.tsx b/extensions/support-page/src/support.tsx
index 6c588a1cef..fbdf54d9eb 100644
--- a/extensions/support-page/src/support.tsx
+++ b/extensions/support-page/src/support.tsx
@@ -6,12 +6,12 @@ import { observer } from "mobx-react"
import { App, Component } from "@k8slens/extensions";
@observer
-export class Support extends React.Component {
+export class SupportPage extends React.Component {
render() {
const { PageLayout } = Component;
const { slackUrl, issuesTrackerUrl } = App;
return (
-
Support}>
+ Support}>
Community Slack Channel
Ask a question, see what's being discussed, join the conversation here
diff --git a/src/extensions/lens-main-extension.ts b/src/extensions/lens-main-extension.ts
index bf54293e3b..0055344a66 100644
--- a/src/extensions/lens-main-extension.ts
+++ b/src/extensions/lens-main-extension.ts
@@ -6,9 +6,9 @@ import { WindowManager } from "../main/window-manager";
export class LensMainExtension extends LensExtension {
@observable.shallow appMenus: MenuRegistration[] = []
- async navigate(location: string, frameId?: number) {
+ async navigate(location?: string, frameId?: number) {
const windowManager = WindowManager.getInstance();
- const url = this.getPageUrl(location);
- await windowManager.navigate(url, frameId)
+ const url = this.getPageUrl(location); // get full path to extension's page
+ await windowManager.navigate(url, frameId);
}
}
diff --git a/src/extensions/lens-renderer-extension.ts b/src/extensions/lens-renderer-extension.ts
index 86be06e17e..87ca214805 100644
--- a/src/extensions/lens-renderer-extension.ts
+++ b/src/extensions/lens-renderer-extension.ts
@@ -1,5 +1,4 @@
import type { AppPreferenceRegistration, ClusterFeatureRegistration, KubeObjectDetailRegistration, KubeObjectMenuRegistration, KubeObjectStatusRegistration, PageMenuRegistration, PageRegistration, StatusBarRegistration, } from "./registries"
-import { ipcRenderer } from "electron"
import { observable } from "mobx";
import { LensExtension } from "./lens-extension"
@@ -15,7 +14,8 @@ export class LensRendererExtension extends LensExtension {
@observable.shallow kubeObjectDetailItems: KubeObjectDetailRegistration[] = []
@observable.shallow kubeObjectMenuItems: KubeObjectMenuRegistration[] = []
- navigate(location: string) {
- ipcRenderer.emit("renderer:navigate", this.getPageUrl(location))
+ async navigate(location?: string) {
+ const { navigate } = await import("../renderer/navigation");
+ navigate(this.getPageUrl(location));
}
}