diff --git a/src/common/front-end-routing/routes/preferences/proxy/navigate-to-proxy-preferences.injectable.ts b/src/features/preferences/common/navigate-to-proxy-preferences.injectable.ts similarity index 58% rename from src/common/front-end-routing/routes/preferences/proxy/navigate-to-proxy-preferences.injectable.ts rename to src/features/preferences/common/navigate-to-proxy-preferences.injectable.ts index 258be70c60..173f1de3c0 100644 --- a/src/common/front-end-routing/routes/preferences/proxy/navigate-to-proxy-preferences.injectable.ts +++ b/src/features/preferences/common/navigate-to-proxy-preferences.injectable.ts @@ -3,17 +3,17 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import proxyPreferencesRouteInjectable from "./proxy-preferences-route.injectable"; -import { navigateToRouteInjectionToken } from "../../../navigate-to-route-injection-token"; +import { navigateToRouteInjectionToken } from "../../../common/front-end-routing/navigate-to-route-injection-token"; +import preferencesRouteInjectable from "./preferences-route.injectable"; const navigateToProxyPreferencesInjectable = getInjectable({ id: "navigate-to-proxy-preferences", instantiate: (di) => { const navigateToRoute = di.inject(navigateToRouteInjectionToken); - const route = di.inject(proxyPreferencesRouteInjectable); + const route = di.inject(preferencesRouteInjectable); - return () => navigateToRoute(route); + return () => navigateToRoute(route, { parameters: { preferenceTabId: "proxy" }}); }, }); diff --git a/src/features/preferences/navigation-to-application-preferences.test.ts b/src/features/preferences/navigation-to-application-preferences.test.ts index c90a2b3cc5..4453b75f96 100644 --- a/src/features/preferences/navigation-to-application-preferences.test.ts +++ b/src/features/preferences/navigation-to-application-preferences.test.ts @@ -5,7 +5,7 @@ import type { RenderResult } from "@testing-library/react"; import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; -import navigateToProxyPreferencesInjectable from "../../common/front-end-routing/routes/preferences/proxy/navigate-to-proxy-preferences.injectable"; +import navigateToProxyPreferencesInjectable from "./common/navigate-to-proxy-preferences.injectable"; describe("preferences - navigation to application preferences", () => { let builder: ApplicationBuilder; diff --git a/src/renderer/components/+preferences/preferences-navigation/proxy-preferences-navigation-item.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/proxy-preferences-navigation-item.injectable.ts index fd0b835d12..8340a5b7e4 100644 --- a/src/renderer/components/+preferences/preferences-navigation/proxy-preferences-navigation-item.injectable.ts +++ b/src/renderer/components/+preferences/preferences-navigation/proxy-preferences-navigation-item.injectable.ts @@ -4,29 +4,23 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { preferenceNavigationItemInjectionToken } from "./preference-navigation-items.injectable"; -import routeIsActiveInjectable from "../../../routes/route-is-active.injectable"; import { computed } from "mobx"; -import proxyPreferencesRouteInjectable from "../../../../common/front-end-routing/routes/preferences/proxy/proxy-preferences-route.injectable"; -import navigateToPreferenceTabInjectable from "./navigate-to-preference-tab.injectable"; +import navigateToPreferenceTabInjectable from "./navigate-to-preference-tab/navigate-to-preference-tab.injectable"; +import preferenceTabIsActiveInjectable from "./navigate-to-preference-tab/preference-tab-is-active.injectable"; const proxyPreferencesNavigationItemInjectable = getInjectable({ id: "proxy-preferences-navigation-item", instantiate: (di) => { - const route = di.inject(proxyPreferencesRouteInjectable); - - const navigateToPreferenceTab = di.inject( - navigateToPreferenceTabInjectable, - ); - - const routeIsActive = di.inject(routeIsActiveInjectable, route); + const navigateToPreferenceTab = di.inject(navigateToPreferenceTabInjectable); + const preferenceTabIsActive = di.inject(preferenceTabIsActiveInjectable, "proxy"); return { id: "proxy", label: "Proxy", parent: "general", - navigate: navigateToPreferenceTab(route), - isActive: routeIsActive, + navigate: () => navigateToPreferenceTab("proxy"), + isActive: preferenceTabIsActive, isVisible: computed(() => true), orderNumber: 20, };