fix: support-page extension

Signed-off-by: Roman <ixrock@gmail.com>

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() {
+      click: () => {
-        windowManager.navigate(supportPageURL());
+        windowManager.navigate(this.getPageUrl(pageUrl)); // todo: simplify
       }
     }
   ]

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",

extensions/support-page/renderer.tsx

@@ -1,28 +1,26 @@
 import React from "react";
-import { Component, LensRendererExtension, Navigation } from "@k8slens/extensions";
+import { Component, Interface, LensRendererExtension, Navigation } from "@k8slens/extensions";
-import { supportPageRoute, supportPageURL } from "./src/support.route";
 import { Support } from "./src/support";
+import { pageRoute, pageUrl } from "./src/common-vars";
 
 export default class SupportPageRendererExtension extends LensRendererExtension {
-  // globalPages = [
+  globalPages: Interface.PageRegistration[] = [
-  //   {
+    {
-  //     ...supportPageRoute,
+      routePath: pageRoute,
-  //     url: supportPageURL(),
+      components: {
-  //     hideInMenu: true,
+        Page: Support,
-  //     components: {
+      }
-  //       Page: Support,
+    }
-  //     }
+  ]
-  //   }
-  // ]
 
   statusBarItems = [
     {
       item: (
         <div
           className="flex align-center gaps hover-highlight"
-          onClick={() => Navigation.navigate(supportPageURL())}
+          onClick={() => Navigation.navigate(this.getPageUrl(pageUrl))}
         >
-          <Component.Icon material="help" smallest />
+          <Component.Icon material="help" smallest/>
         </div>
       )
     }

extensions/support-page/src/common-vars.ts

@@ -0,0 +1,4 @@
+// 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

extensions/support-page/src/support.route.ts

@@ -1,7 +0,0 @@
-import type { RouteProps } from "react-router";
-
-export const supportPageRoute: RouteProps = {
-  path: "/support"
-}
-
-export const supportPageURL = () => supportPageRoute.path.toString();

package.json

@@ -241,6 +241,7 @@
     "openid-client": "^3.15.2",
     "path-to-regexp": "^6.1.0",
     "proper-lockfile": "^4.1.1",
+    "react-router": "^5.2.0",
     "request": "^2.88.2",
     "request-promise-native": "^1.0.8",
     "semver": "^7.3.2",
@@ -365,7 +366,6 @@
     "react-beautiful-dnd": "^13.0.0",
     "react-dom": "^16.13.1",
     "react-refresh": "^0.9.0",
-    "react-router": "^5.2.0",
     "react-router-dom": "^5.2.0",
     "react-select": "^3.1.0",
     "react-window": "^1.8.5",

src/extensions/lens-extension.ts

@@ -15,7 +15,7 @@ export interface LensExtensionManifest {
 }
 
 export class LensExtension {
-  readonly routePrefix = "/extensions/:name"
+  readonly routePrefix = "/extension/:name"
   readonly manifest: LensExtensionManifest;
   readonly manifestPath: string;
   readonly isBundled: boolean;
@@ -45,11 +45,11 @@ export class LensExtension {
   }
 
   getPageUrl(baseUrl: string) {
-    return compile(this.routePrefix)({ name: this.name }) + "/" + baseUrl
+    return compile(this.routePrefix)({ name: this.name }) + baseUrl
   }
 
   getPageRoute(baseRoute: string) {
-    return this.routePrefix + "/" + baseRoute;
+    return this.routePrefix + baseRoute;
   }
 
   @action