diff --git a/extensions/support-page/main.ts b/extensions/support-page/main.ts index 70ec3bc026..5ad5fe5f86 100644 --- a/extensions/support-page/main.ts +++ b/extensions/support-page/main.ts @@ -1,13 +1,13 @@ import { LensMainExtension, windowManager } from "@k8slens/extensions"; -import { supportPageURL } from "./src/support.route"; +import { pageUrl } from "./src/common-vars"; export default class SupportPageMainExtension extends LensMainExtension { appMenus = [ { parentId: "help", label: "Support", - click() { - windowManager.navigate(supportPageURL()); + click: () => { + windowManager.navigate(this.getPageUrl(pageUrl)); // todo: simplify } } ] diff --git a/extensions/support-page/package-lock.json b/extensions/support-page/package-lock.json index f67bf34b5f..a93741c0aa 100644 --- a/extensions/support-page/package-lock.json +++ b/extensions/support-page/package-lock.json @@ -26,6 +26,12 @@ "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==", "dev": true }, + "@types/node": { + "version": "14.14.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz", + "integrity": "sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==", + "dev": true + }, "@types/prop-types": { "version": "15.7.3", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz", diff --git a/extensions/support-page/renderer.tsx b/extensions/support-page/renderer.tsx index 9334a7a2a4..feb14457ee 100644 --- a/extensions/support-page/renderer.tsx +++ b/extensions/support-page/renderer.tsx @@ -1,28 +1,26 @@ import React from "react"; -import { Component, LensRendererExtension, Navigation } from "@k8slens/extensions"; -import { supportPageRoute, supportPageURL } from "./src/support.route"; +import { Component, Interface, LensRendererExtension, Navigation } from "@k8slens/extensions"; import { Support } from "./src/support"; +import { pageRoute, pageUrl } from "./src/common-vars"; export default class SupportPageRendererExtension extends LensRendererExtension { - // globalPages = [ - // { - // ...supportPageRoute, - // url: supportPageURL(), - // hideInMenu: true, - // components: { - // Page: Support, - // } - // } - // ] + globalPages: Interface.PageRegistration[] = [ + { + routePath: pageRoute, + components: { + Page: Support, + } + } + ] statusBarItems = [ { item: (