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

Switch to using competition for proxy preferences

Browse Source 
Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
This commit is contained in:
Janne Savolainen 2022-10-13 15:22:13 +03:00
parent 17cd5a8097
commit ea07f94e9e
No known key found for this signature in database
GPG Key ID: 8C6CFB2FFFE8F68A
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/front-end-routing/routes/preferences/proxy/navigate-to-proxy-preferences.injectable.ts → src/features/preferences/common/navigate-to-proxy-preferences.injectable.ts
View File

@ -3,17 +3,17 @@
* Licensed under MIT License. See LICENSE in root directory for more information. * Licensed under MIT License. See LICENSE in root directory for more information.
*/ */
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
import proxyPreferencesRouteInjectable from "./proxy-preferences-route.injectable"; import { navigateToRouteInjectionToken } from "../../../common/front-end-routing/navigate-to-route-injection-token";
import { navigateToRouteInjectionToken } from "../../../navigate-to-route-injection-token"; import preferencesRouteInjectable from "./preferences-route.injectable";
const navigateToProxyPreferencesInjectable = getInjectable({ const navigateToProxyPreferencesInjectable = getInjectable({
id: "navigate-to-proxy-preferences", id: "navigate-to-proxy-preferences",
instantiate: (di) => { instantiate: (di) => {
const navigateToRoute = di.inject(navigateToRouteInjectionToken); const navigateToRoute = di.inject(navigateToRouteInjectionToken);
const route = di.inject(proxyPreferencesRouteInjectable); const route = di.inject(preferencesRouteInjectable);
return () => navigateToRoute(route); return () => navigateToRoute(route, { parameters: { preferenceTabId: "proxy" }});
}, },
}); });

2
src/features/preferences/navigation-to-application-preferences.test.ts
View File

@ -5,7 +5,7 @@
import type { RenderResult } from "@testing-library/react"; import type { RenderResult } from "@testing-library/react";
import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
import { getApplicationBuilder } 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", () => { describe("preferences - navigation to application preferences", () => {
let builder: ApplicationBuilder; let builder: ApplicationBuilder;

18
src/renderer/components/+preferences/preferences-navigation/proxy-preferences-navigation-item.injectable.ts
View File

@ -4,29 +4,23 @@
*/ */
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
import { preferenceNavigationItemInjectionToken } from "./preference-navigation-items.injectable"; import { preferenceNavigationItemInjectionToken } from "./preference-navigation-items.injectable";
import routeIsActiveInjectable from "../../../routes/route-is-active.injectable";
import { computed } from "mobx"; 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/navigate-to-preference-tab.injectable";
import navigateToPreferenceTabInjectable from "./navigate-to-preference-tab.injectable"; import preferenceTabIsActiveInjectable from "./navigate-to-preference-tab/preference-tab-is-active.injectable";
const proxyPreferencesNavigationItemInjectable = getInjectable({ const proxyPreferencesNavigationItemInjectable = getInjectable({
id: "proxy-preferences-navigation-item", id: "proxy-preferences-navigation-item",
instantiate: (di) => { instantiate: (di) => {
const route = di.inject(proxyPreferencesRouteInjectable); const navigateToPreferenceTab = di.inject(navigateToPreferenceTabInjectable);
const preferenceTabIsActive = di.inject(preferenceTabIsActiveInjectable, "proxy");
const navigateToPreferenceTab = di.inject(
navigateToPreferenceTabInjectable,
);
const routeIsActive = di.inject(routeIsActiveInjectable, route);
return { return {
id: "proxy", id: "proxy",
label: "Proxy", label: "Proxy",
parent: "general", parent: "general",
navigate: navigateToPreferenceTab(route), navigate: () => navigateToPreferenceTab("proxy"),
isActive: routeIsActive, isActive: preferenceTabIsActive,
isVisible: computed(() => true), isVisible: computed(() => true),
orderNumber: 20, orderNumber: 20,
}; };