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 telemetry 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:44:47 +03:00
parent 0a6f1bbbdc
commit 845d4ce1f1
No known key found for this signature in database
GPG Key ID: 8C6CFB2FFFE8F68A
3 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

2
src/features/preferences/navigation-to-telemetry-preferences.test.tsx
View File

@ -6,7 +6,7 @@ import type { RenderResult } from "@testing-library/react";
import React from "react"; import React from "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 navigateToTelemetryPreferencesInjectable from "../../common/front-end-routing/routes/preferences/telemetry/navigate-to-telemetry-preferences.injectable"; import navigateToTelemetryPreferencesInjectable from "./common/navigate-to-telemetry-preferences.injectable";
import sentryDataSourceNameInjectable from "../../common/vars/sentry-dsn-url.injectable"; import sentryDataSourceNameInjectable from "../../common/vars/sentry-dsn-url.injectable";
import type { FakeExtensionOptions } from "../../renderer/components/test-utils/get-extension-fake"; import type { FakeExtensionOptions } from "../../renderer/components/test-utils/get-extension-fake";

24
src/renderer/components/+preferences/preferences-navigation/telemetry-preferences-navigation-item.injectable.ts
View File

@ -4,37 +4,27 @@
*/ */
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 telemetryPreferenceItemsInjectable from "../telemetry-preference-items.injectable"; import telemetryPreferenceItemsInjectable from "../telemetry-preference-items.injectable";
import telemetryPreferencesRouteInjectable from "../../../../common/front-end-routing/routes/preferences/telemetry/telemetry-preferences-route.injectable";
import sentryDataSourceNameInjectable from "../../../../common/vars/sentry-dsn-url.injectable"; import sentryDataSourceNameInjectable from "../../../../common/vars/sentry-dsn-url.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 terminalPreferencesNavigationItemInjectable = getInjectable({ const terminalPreferencesNavigationItemInjectable = getInjectable({
id: "telemetry-preferences-navigation-item", id: "telemetry-preferences-navigation-item",
instantiate: (di) => { instantiate: (di) => {
const sentryDataSourceName = di.inject(sentryDataSourceNameInjectable); const sentryDataSourceName = di.inject(sentryDataSourceNameInjectable);
const telemetryPreferenceItems = di.inject(telemetryPreferenceItemsInjectable);
const telemetryPreferenceItems = di.inject( const navigateToPreferenceTab = di.inject(navigateToPreferenceTabInjectable);
telemetryPreferenceItemsInjectable, const preferenceTabIsActive = di.inject(preferenceTabIsActiveInjectable, "telemetry");
);
const navigateToPreferenceTab = di.inject(
navigateToPreferenceTabInjectable,
);
const route = di.inject(telemetryPreferencesRouteInjectable);
const routeIsActive = di.inject(routeIsActiveInjectable, route);
return { return {
id: "telemetry", id: "telemetry",
label: "Telemetry", label: "Telemetry",
parent: "general", parent: "general",
navigate: navigateToPreferenceTab(route), navigate: () => navigateToPreferenceTab("telemetry"),
isActive: routeIsActive, isActive: preferenceTabIsActive,
isVisible: computed( isVisible: computed(
() => !!sentryDataSourceName || telemetryPreferenceItems.get().length > 0, () => !!sentryDataSourceName || telemetryPreferenceItems.get().length > 0,