From 6f4a6c95fccb2963e08f4821d0947cdbffa4f0b6 Mon Sep 17 00:00:00 2001 From: Iku-turso Date: Mon, 17 Oct 2022 12:21:31 +0300 Subject: [PATCH] Remove code made redundant with hiding of preference tabs without content Co-authored-by: Janne Savolainen Signed-off-by: Iku-turso --- .../telemetry-preference-page.injectable.tsx | 22 +++++++---------- .../telemetry-preference-tab.injectable.ts | 24 +++++++------------ 2 files changed, 17 insertions(+), 29 deletions(-) diff --git a/src/features/preferences/renderer/preference-items/telemetry/telemetry-preference-page.injectable.tsx b/src/features/preferences/renderer/preference-items/telemetry/telemetry-preference-page.injectable.tsx index 8c78c0d008..3cb2775896 100644 --- a/src/features/preferences/renderer/preference-items/telemetry/telemetry-preference-page.injectable.tsx +++ b/src/features/preferences/renderer/preference-items/telemetry/telemetry-preference-page.injectable.tsx @@ -6,24 +6,18 @@ import { getInjectable } from "@ogre-tools/injectable"; import { preferenceItemInjectionToken } from "../preference-item-injection-token"; import { TelemetryPage } from "./telemetry-page"; import React from "react"; -import sentryDataSourceNameInjectable from "../../../../../common/vars/sentry-dsn-url.injectable"; const telemetryPreferencePageInjectable = getInjectable({ id: "telemetry-preference-page", - instantiate: (di) => { - const sentryDnsUrl = di.inject(sentryDataSourceNameInjectable); - - return { - kind: "page" as const, - id: "telemetry-page", - parentId: "telemetry-tab", - orderNumber: 0, - Component: TelemetryPage, - childrenSeparator: () =>
, - isShown: !!sentryDnsUrl, - }; - }, + instantiate: () => ({ + kind: "page" as const, + id: "telemetry-page", + parentId: "telemetry-tab", + orderNumber: 0, + Component: TelemetryPage, + childrenSeparator: () =>
, + }), injectionToken: preferenceItemInjectionToken, }); diff --git a/src/features/preferences/renderer/preference-items/telemetry/telemetry-preference-tab.injectable.ts b/src/features/preferences/renderer/preference-items/telemetry/telemetry-preference-tab.injectable.ts index e6333698d8..e95ae98b4d 100644 --- a/src/features/preferences/renderer/preference-items/telemetry/telemetry-preference-tab.injectable.ts +++ b/src/features/preferences/renderer/preference-items/telemetry/telemetry-preference-tab.injectable.ts @@ -4,25 +4,19 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { preferenceItemInjectionToken } from "../preference-item-injection-token"; -import sentryDataSourceNameInjectable from "../../../../../common/vars/sentry-dsn-url.injectable"; const telemetryPreferenceTabInjectable = getInjectable({ id: "telemetry-preference-tab", - instantiate: (di) => { - const sentryDnsUrl = di.inject(sentryDataSourceNameInjectable); - - return { - kind: "tab" as const, - id: "telemetry-tab", - parentId: "general-tab-group" as const, - pathId: "telemetry", - testId: "terminal-preferences-page", - label: "Telemetry", - orderNumber: 60, - isShown: !!sentryDnsUrl, - }; - }, + instantiate: () => ({ + kind: "tab" as const, + id: "telemetry-tab", + parentId: "general-tab-group" as const, + pathId: "telemetry", + testId: "terminal-preferences-page", + label: "Telemetry", + orderNumber: 60, + }), injectionToken: preferenceItemInjectionToken, });