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 terminal 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:47:14 +03:00
parent 845d4ce1f1
commit d4cb72ef53
No known key found for this signature in database
GPG Key ID: 8C6CFB2FFFE8F68A
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/front-end-routing/routes/preferences/terminal/navigate-to-terminal-preferences.injectable.ts → src/features/preferences/common/navigate-to-terminal-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 terminalPreferencesRouteInjectable from "./terminal-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 navigateToTerminalPreferencesInjectable = getInjectable({ const navigateToTerminalPreferencesInjectable = getInjectable({
id: "navigate-to-terminal-preferences", id: "navigate-to-terminal-preferences",
instantiate: (di) => { instantiate: (di) => {
const navigateToRoute = di.inject(navigateToRouteInjectionToken); const navigateToRoute = di.inject(navigateToRouteInjectionToken);
const route = di.inject(terminalPreferencesRouteInjectable); const route = di.inject(preferencesRouteInjectable);
return () => navigateToRoute(route); return () => navigateToRoute(route, { parameters: { preferenceTabId: "terminal" }});
}, },
}); });

18
src/renderer/components/+preferences/preferences-navigation/terminal-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 terminalPreferencesRouteInjectable from "../../../../common/front-end-routing/routes/preferences/terminal/terminal-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 terminalPreferencesNavigationItemInjectable = getInjectable({ const terminalPreferencesNavigationItemInjectable = getInjectable({
id: "terminal-preferences-navigation-item", id: "terminal-preferences-navigation-item",
instantiate: (di) => { instantiate: (di) => {
const navigateToPreferenceTab = di.inject( const navigateToPreferenceTab = di.inject(navigateToPreferenceTabInjectable);
navigateToPreferenceTabInjectable, const preferenceTabIsActive = di.inject(preferenceTabIsActiveInjectable, "terminal");
);
const route = di.inject(terminalPreferencesRouteInjectable);
const routeIsActive = di.inject(routeIsActiveInjectable, route);
return { return {
id: "terminal", id: "terminal",
label: "Terminal", label: "Terminal",
parent: "general", parent: "general",
navigate: navigateToPreferenceTab(route), navigate: () => navigateToPreferenceTab("terminal"),
isActive: routeIsActive, isActive: preferenceTabIsActive,
isVisible: computed(() => true), isVisible: computed(() => true),
orderNumber: 50, orderNumber: 50,
}; };