From 7767b3727de05d608868b984c8fde7f799d14b12 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Thu, 9 Jun 2022 07:58:29 -0400
Subject: [PATCH] Fix main's navigate to route

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .../front-end-routing/navigate-to-route-injection-token.ts      | 2 +-
 src/extensions/lens-extension-set-dependencies.ts               | 2 +-
 .../lens-window/navigate-for-extension.injectable.ts            | 2 +-
 .../start-main-application/lens-window/navigate.injectable.ts   | 2 +-
 .../navigate-to-preference-tab.injectable.ts                    | 2 +-
 src/renderer/initializers/ipc.ts                                | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/common/front-end-routing/navigate-to-route-injection-token.ts b/src/common/front-end-routing/navigate-to-route-injection-token.ts
index dfdc133fff..1df8c4690e 100644
--- a/src/common/front-end-routing/navigate-to-route-injection-token.ts
+++ b/src/common/front-end-routing/navigate-to-route-injection-token.ts
@@ -37,7 +37,7 @@ export type NavigateToRouteOptions<TParameter> = Parameters<TParameter> & {
   withoutAffectingBackButton?: boolean;
 };
 
-export type NavigateToRoute = <TRoute extends Route<TParameter>, TParameter extends object>(
+export type NavigateToRoute = <TRoute extends Route<TParameter>, TParameter extends object | void>(
   route: TRoute,
   options?: NavigateToRouteOptions<TParameter>,
 ) => void;
diff --git a/src/extensions/lens-extension-set-dependencies.ts b/src/extensions/lens-extension-set-dependencies.ts
index 0f06103af2..4c8371c196 100644
--- a/src/extensions/lens-extension-set-dependencies.ts
+++ b/src/extensions/lens-extension-set-dependencies.ts
@@ -25,7 +25,7 @@ export interface LensMainExtensionDependencies extends LensExtensionDependencies
 export interface LensRendererExtensionDependencies extends LensExtensionDependencies {
   navigateToRoute: NavigateToRoute;
   getExtensionPageParameters: GetExtensionPageParameters;
-  readonly routes: IComputedValue<Route<unknown>[]>;
+  readonly routes: IComputedValue<Route<object | void>[]>;
   readonly entityRegistry: RendererCatalogEntityRegistry;
   readonly categoryRegistry: CatalogCategoryRegistry;
 }
diff --git a/src/main/start-main-application/lens-window/navigate-for-extension.injectable.ts b/src/main/start-main-application/lens-window/navigate-for-extension.injectable.ts
index 7bada3f3bd..9aa1d0bc54 100644
--- a/src/main/start-main-application/lens-window/navigate-for-extension.injectable.ts
+++ b/src/main/start-main-application/lens-window/navigate-for-extension.injectable.ts
@@ -39,7 +39,7 @@ const navigateForExtensionInjectable = getInjectable({
       applicationWindow.send({
         channel: "extension:navigate",
         frameInfo,
-        data: [extId, pageId, params],
+        data: { extId, pageId, params },
       });
     };
   },
diff --git a/src/main/start-main-application/lens-window/navigate.injectable.ts b/src/main/start-main-application/lens-window/navigate.injectable.ts
index f9d80e4205..9a7a233a95 100644
--- a/src/main/start-main-application/lens-window/navigate.injectable.ts
+++ b/src/main/start-main-application/lens-window/navigate.injectable.ts
@@ -32,7 +32,7 @@ const navigateInjectable = getInjectable({
       applicationWindow.send({
         channel,
         frameInfo,
-        data: [url],
+        data: url,
       });
     };
   },
diff --git a/src/renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab.injectable.ts
index 70b5da347c..ffded63f2b 100644
--- a/src/renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab.injectable.ts
+++ b/src/renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab.injectable.ts
@@ -12,7 +12,7 @@ const navigateToPreferenceTabInjectable = getInjectable({
   instantiate: (di) => {
     const navigateToRoute = di.inject(navigateToRouteInjectionToken);
 
-    return (route: Route) => () => {
+    return <Parameter extends object | void>(route: Route<Parameter>) => () => {
       navigateToRoute(route, { withoutAffectingBackButton: true });
     };
   },
diff --git a/src/renderer/initializers/ipc.ts b/src/renderer/initializers/ipc.ts
index cdb7dd04d5..264a1a0bad 100644
--- a/src/renderer/initializers/ipc.ts
+++ b/src/renderer/initializers/ipc.ts
@@ -8,7 +8,7 @@ import type { ExtensionLoader } from "../../extensions/extension-loader";
 import type { LensRendererExtension } from "../../extensions/lens-renderer-extension";
 
 export function initIpcRendererListeners(extensionLoader: ExtensionLoader) {
-  ipcRendererOn("extension:navigate", (event, extId: string, pageId ?: string, params?: Record<string, any>) => {
+  ipcRendererOn("extension:navigate", (event, { extId, pageId, params }: { extId: string; pageId: string | undefined; params: Partial<Record<string, string>> | undefined }) => {
     const ext = extensionLoader.getInstanceById(extId) as LensRendererExtension | undefined;
 
     ext?.navigate(pageId, params);