hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix main's navigate to route

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2022-06-09 07:58:29 -04:00
parent a3fedd3810
commit 7767b3727d
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/front-end-routing/navigate-to-route-injection-token.ts
View File

@ -37,7 +37,7 @@ export type NavigateToRouteOptions<TParameter> = Parameters<TParameter> & {
withoutAffectingBackButton?: boolean; 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, route: TRoute,
options?: NavigateToRouteOptions<TParameter>, options?: NavigateToRouteOptions<TParameter>,
) => void; ) => void;

2
src/extensions/lens-extension-set-dependencies.ts
View File

@ -25,7 +25,7 @@ export interface LensMainExtensionDependencies extends LensExtensionDependencies
export interface LensRendererExtensionDependencies extends LensExtensionDependencies { export interface LensRendererExtensionDependencies extends LensExtensionDependencies {
navigateToRoute: NavigateToRoute; navigateToRoute: NavigateToRoute;
getExtensionPageParameters: GetExtensionPageParameters; getExtensionPageParameters: GetExtensionPageParameters;
readonly routes: IComputedValue<Route<unknown>[]>; readonly routes: IComputedValue<Route<object | void>[]>;
readonly entityRegistry: RendererCatalogEntityRegistry; readonly entityRegistry: RendererCatalogEntityRegistry;
readonly categoryRegistry: CatalogCategoryRegistry; readonly categoryRegistry: CatalogCategoryRegistry;
} }

2
src/main/start-main-application/lens-window/navigate-for-extension.injectable.ts
View File

@ -39,7 +39,7 @@ const navigateForExtensionInjectable = getInjectable({
applicationWindow.send({ applicationWindow.send({
channel: "extension:navigate", channel: "extension:navigate",
frameInfo, frameInfo,
data: [extId, pageId, params], data: { extId, pageId, params },
}); });
}; };
}, },

2
src/main/start-main-application/lens-window/navigate.injectable.ts
View File

@ -32,7 +32,7 @@ const navigateInjectable = getInjectable({
applicationWindow.send({ applicationWindow.send({
channel, channel,
frameInfo, frameInfo,
data: [url], data: url,
}); });
}; };
}, },

2
src/renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab.injectable.ts
View File

@ -12,7 +12,7 @@ const navigateToPreferenceTabInjectable = getInjectable({
instantiate: (di) => { instantiate: (di) => {
const navigateToRoute = di.inject(navigateToRouteInjectionToken); const navigateToRoute = di.inject(navigateToRouteInjectionToken);
return (route: Route) => () => { return <Parameter extends object | void>(route: Route<Parameter>) => () => {
navigateToRoute(route, { withoutAffectingBackButton: true }); navigateToRoute(route, { withoutAffectingBackButton: true });
}; };
}, },

2
src/renderer/initializers/ipc.ts
View File

@ -8,7 +8,7 @@ import type { ExtensionLoader } from "../../extensions/extension-loader";
import type { LensRendererExtension } from "../../extensions/lens-renderer-extension"; import type { LensRendererExtension } from "../../extensions/lens-renderer-extension";
export function initIpcRendererListeners(extensionLoader: ExtensionLoader) { 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; const ext = extensionLoader.getInstanceById(extId) as LensRendererExtension | undefined;
ext?.navigate(pageId, params); ext?.navigate(pageId, params);