From 794ab633609ac8967adb83df3cc77ed9ece4570f Mon Sep 17 00:00:00 2001 From: Iku-turso Date: Tue, 8 Nov 2022 13:53:20 +0200 Subject: [PATCH] Migrate some functionality to Feature-module of "preferences" Co-authored-by: Janne Savolainen Signed-off-by: Iku-turso --- package.json | 6 +- ...ate-channel-preference-block.injectable.ts | 2 +- ...helm-charts-preference-block.injectable.ts | 2 +- .../preferences/closing-preferences.test.tsx | 2 +- .../hiding-of-empty-branches.test.tsx | 2 +- ...trator-for-preference-items.injectable.tsx | 2 +- ...application-preference-page.injectable.tsx | 6 +- .../application-preference-tab.injectable.ts | 2 +- ...ll-registry-preference-block.injectable.ts | 2 +- .../start-up-preference-block.injectable.ts | 2 +- .../theme-preference-block.injectable.ts | 2 +- .../timezone-preference-block.injectable.ts | 2 +- ...ent-preference-tab-composite.injectable.ts | 2 +- ...font-family-preference-block.injectable.ts | 2 +- ...r-font-size-preference-block.injectable.ts | 2 +- .../editor-preference-page.injectable.tsx | 4 +- .../editor-preference-tab.injectable.ts | 2 +- ...ine-numbers-preference-block.injectable.ts | 2 +- .../minimap-preference-block.injectable.ts | 2 +- .../tab-size-preference-block.injectable.ts | 2 +- ...ensions-preference-tab-group.injectable.ts | 2 +- ...general-preference-tab-group.injectable.ts | 2 +- ...config-sync-preference-block.injectable.ts | 2 +- ...ry-download-preference-block.injectable.ts | 2 +- ...or-binaries-preference-block.injectable.ts | 2 +- ...load-mirror-preference-block.injectable.ts | 2 +- ...bectl-group-preference-item.injectable.tsx | 4 +- ...h-to-binary-preference-block.injectable.ts | 2 +- .../kubernetes-preference-page.injectable.tsx | 4 +- .../kubernetes-preference-tab.injectable.ts | 2 +- .../preference-item-injection-token.ts | 68 ------------------- .../preference-items/preference-tab-root.tsx | 2 +- .../preferences-composite.injectable.ts | 4 +- ...ertificates-preference-block.injectable.ts | 2 +- ...p-proxy-url-preference-block.injectable.ts | 2 +- .../proxy-preference-page.injectable.tsx | 4 +- .../proxy/proxy-preference-tab.injectable.ts | 2 +- ...or-reporting-preference-item.injectable.ts | 2 +- .../telemetry-preference-page.injectable.tsx | 4 +- .../telemetry-preference-tab.injectable.ts | 2 +- ...rom-terminal-preference-item.injectable.ts | 2 +- ...-font-family-preference-item.injectable.ts | 2 +- ...al-font-size-preference-item.injectable.ts | 2 +- ...rminal-page-preference-item.injectable.tsx | 4 +- .../terminal-preference-tab.injectable.ts | 2 +- ...l-shell-path-preference-item.injectable.ts | 2 +- ...rminal-theme-preference-item.injectable.ts | 2 +- .../preferences-navigation-tab.tsx | 2 +- .../preferences-navigation.tsx | 2 +- .../preferences/renderer/preferences.tsx | 2 +- 50 files changed, 62 insertions(+), 126 deletions(-) delete mode 100644 src/features/preferences/renderer/preference-items/preference-item-injection-token.ts diff --git a/package.json b/package.json index a4d9b321bf..45bc7fe0ef 100644 --- a/package.json +++ b/package.json @@ -291,7 +291,11 @@ "winston-console-format": "^1.0.8", "winston-transport-browserconsole": "^1.0.5", "ws": "^8.11.0", - "xterm-link-provider": "^1.3.1" + "xterm-link-provider": "^1.3.1", + "@lensapp/composable-responsibilities": "0.0.1", + "@lensapp/utils": "0.0.1", + "@lensapp/composite": "0.0.1", + "@lensapp/preferences": "0.0.1" }, "devDependencies": { "@async-fn/jest": "1.6.4", diff --git a/src/features/application-update/child-features/preferences/renderer/update-channel/update-channel-preference-block.injectable.ts b/src/features/application-update/child-features/preferences/renderer/update-channel/update-channel-preference-block.injectable.ts index aa4fe3f5fb..bfca9b7cb8 100644 --- a/src/features/application-update/child-features/preferences/renderer/update-channel/update-channel-preference-block.injectable.ts +++ b/src/features/application-update/child-features/preferences/renderer/update-channel/update-channel-preference-block.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../../../../../preferences/renderer/preference-items/preference-item-injection-token"; import { UpdateChannel } from "./update-channel"; const updateChannelPreferenceBlockInjectable = getInjectable({ diff --git a/src/features/helm-charts/child-features/preferences/renderer/helm-charts-preference-block.injectable.ts b/src/features/helm-charts/child-features/preferences/renderer/helm-charts-preference-block.injectable.ts index e9beba4eb9..835cda4766 100644 --- a/src/features/helm-charts/child-features/preferences/renderer/helm-charts-preference-block.injectable.ts +++ b/src/features/helm-charts/child-features/preferences/renderer/helm-charts-preference-block.injectable.ts @@ -2,9 +2,9 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; import { HelmCharts } from "./helm-charts"; -import { preferenceItemInjectionToken } from "../../../../preferences/renderer/preference-items/preference-item-injection-token"; const helmChartsPreferenceBlockInjectable = getInjectable({ id: "helm-charts-preference-block", diff --git a/src/features/preferences/closing-preferences.test.tsx b/src/features/preferences/closing-preferences.test.tsx index 7f979969aa..60dc84cb83 100644 --- a/src/features/preferences/closing-preferences.test.tsx +++ b/src/features/preferences/closing-preferences.test.tsx @@ -18,7 +18,7 @@ import { createMemoryHistory } from "history"; import { createObservableHistory } from "mobx-observable-history"; import navigateToFrontPageInjectable from "../../common/front-end-routing/navigate-to-front-page.injectable"; import { navigateToRouteInjectionToken } from "../../common/front-end-routing/navigate-to-route-injection-token"; -import { preferenceItemInjectionToken } from "./renderer/preference-items/preference-item-injection-token"; +import { preferenceItemInjectionToken } from "@lensapp/preferences"; describe("preferences - closing-preferences", () => { let builder: ApplicationBuilder; diff --git a/src/features/preferences/hiding-of-empty-branches.test.tsx b/src/features/preferences/hiding-of-empty-branches.test.tsx index 0bc2d67d24..e7d4d43eec 100644 --- a/src/features/preferences/hiding-of-empty-branches.test.tsx +++ b/src/features/preferences/hiding-of-empty-branches.test.tsx @@ -9,9 +9,9 @@ import type { RenderResult } from "@testing-library/react"; import { runInAction } from "mobx"; import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; -import { preferenceItemInjectionToken } from "./renderer/preference-items/preference-item-injection-token"; import type { Discover } from "../../renderer/components/test-utils/discovery-of-html-elements"; import { discoverFor } from "../../renderer/components/test-utils/discovery-of-html-elements"; +import { preferenceItemInjectionToken } from "@lensapp/preferences"; describe("preferences - hiding-of-empty-branches, given in preferences page", () => { let builder: ApplicationBuilder; diff --git a/src/features/preferences/renderer/compliance-for-legacy-extension-api/registrator-for-preference-items.injectable.tsx b/src/features/preferences/renderer/compliance-for-legacy-extension-api/registrator-for-preference-items.injectable.tsx index 6a79f96c37..292ea4f3b7 100644 --- a/src/features/preferences/renderer/compliance-for-legacy-extension-api/registrator-for-preference-items.injectable.tsx +++ b/src/features/preferences/renderer/compliance-for-legacy-extension-api/registrator-for-preference-items.injectable.tsx @@ -5,12 +5,12 @@ import React from "react"; import { getInjectable } from "@ogre-tools/injectable"; import type { LensRendererExtension } from "../../../../extensions/lens-renderer-extension"; -import { preferenceItemInjectionToken } from "../preference-items/preference-item-injection-token"; import { extensionRegistratorInjectionToken } from "../../../../extensions/extension-loader/extension-registrator-injection-token"; import { PreferencePageComponent } from "../preference-page-component"; import { ExtensionPreferenceBlock } from "./extension-preference-block"; import { computed } from "mobx"; import { HorizontalLine } from "../../../../renderer/components/horizontal-line/horizontal-line"; +import { preferenceItemInjectionToken } from "@lensapp/preferences"; const registratorForPreferenceItemsInjectable = getInjectable({ id: "registrator-for-preference-items", diff --git a/src/features/preferences/renderer/preference-items/application/application-preference-page.injectable.tsx b/src/features/preferences/renderer/preference-items/application/application-preference-page.injectable.tsx index cdf1b2048f..6dd9ec6fb4 100644 --- a/src/features/preferences/renderer/preference-items/application/application-preference-page.injectable.tsx +++ b/src/features/preferences/renderer/preference-items/application/application-preference-page.injectable.tsx @@ -3,11 +3,11 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import type { PreferenceItemComponent, PreferencePage } from "../preference-item-injection-token"; -import { preferenceItemInjectionToken } from "../preference-item-injection-token"; -import { PreferencePageComponent } from "../../preference-page-component"; import { HorizontalLine } from "../../../../../renderer/components/horizontal-line/horizontal-line"; import React from "react"; +import type { PreferenceItemComponent, PreferencePage } from "@lensapp/preferences"; +import { preferenceItemInjectionToken } from "@lensapp/preferences"; +import { PreferencePageComponent } from "../../preference-page-component"; const ApplicationPage: PreferenceItemComponent = ({ children, item }) => ( diff --git a/src/features/preferences/renderer/preference-items/application/application-preference-tab.injectable.ts b/src/features/preferences/renderer/preference-items/application/application-preference-tab.injectable.ts index 0091dd2023..bcc107275b 100644 --- a/src/features/preferences/renderer/preference-items/application/application-preference-tab.injectable.ts +++ b/src/features/preferences/renderer/preference-items/application/application-preference-tab.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../preference-item-injection-token"; const applicationPreferenceTabInjectable = getInjectable({ id: "application-preference-tab", diff --git a/src/features/preferences/renderer/preference-items/application/extension-install-registry/extension-install-registry-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/application/extension-install-registry/extension-install-registry-preference-block.injectable.ts index edda55f3de..0ac1b1489a 100644 --- a/src/features/preferences/renderer/preference-items/application/extension-install-registry/extension-install-registry-preference-block.injectable.ts +++ b/src/features/preferences/renderer/preference-items/application/extension-install-registry/extension-install-registry-preference-block.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { ExtensionInstallRegistry } from "./extension-install-registry"; const extensionInstallRegistryPreferenceBlockInjectable = getInjectable({ diff --git a/src/features/preferences/renderer/preference-items/application/start-up/start-up-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/application/start-up/start-up-preference-block.injectable.ts index 2db579bf6e..c0c52cb6cc 100644 --- a/src/features/preferences/renderer/preference-items/application/start-up/start-up-preference-block.injectable.ts +++ b/src/features/preferences/renderer/preference-items/application/start-up/start-up-preference-block.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { StartUp } from "./start-up"; const startUpPreferenceBlockInjectable = getInjectable({ diff --git a/src/features/preferences/renderer/preference-items/application/theme/theme-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/application/theme/theme-preference-block.injectable.ts index 285b068d62..f94c898691 100644 --- a/src/features/preferences/renderer/preference-items/application/theme/theme-preference-block.injectable.ts +++ b/src/features/preferences/renderer/preference-items/application/theme/theme-preference-block.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { Theme } from "./theme"; const themePreferenceBlockInjectable = getInjectable({ diff --git a/src/features/preferences/renderer/preference-items/application/timezone/timezone-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/application/timezone/timezone-preference-block.injectable.ts index 5357341f9a..739f36b10a 100644 --- a/src/features/preferences/renderer/preference-items/application/timezone/timezone-preference-block.injectable.ts +++ b/src/features/preferences/renderer/preference-items/application/timezone/timezone-preference-block.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { Timezone } from "./timezone"; const timezonePreferenceBlockInjectable = getInjectable({ diff --git a/src/features/preferences/renderer/preference-items/current-preference-tab-composite.injectable.ts b/src/features/preferences/renderer/preference-items/current-preference-tab-composite.injectable.ts index 5930aaa7e4..2ac03630a0 100644 --- a/src/features/preferences/renderer/preference-items/current-preference-tab-composite.injectable.ts +++ b/src/features/preferences/renderer/preference-items/current-preference-tab-composite.injectable.ts @@ -4,7 +4,6 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import type { PreferenceTab, PreferenceItemTypes } from "./preference-item-injection-token"; import type { Composite } from "../../../../common/utils/composite/get-composite/get-composite"; import { filter, map } from "lodash/fp"; import { pipeline } from "@ogre-tools/fp"; @@ -12,6 +11,7 @@ import { getCompositeNormalization } from "../../../../common/utils/composite/ge import preferencesCompositeInjectable from "./preferences-composite.injectable"; import type { PreferenceTabsRoot } from "./preference-tab-root"; import currentPreferenceTabIdInjectable from "./current-preference-tab-id.injectable"; +import type { PreferenceItemTypes, PreferenceTab } from "@lensapp/preferences"; const currentPreferenceTabCompositeInjectable = getInjectable({ id: "current-preference-page-composite", diff --git a/src/features/preferences/renderer/preference-items/editor/editor-font-family/editor-font-family-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/editor/editor-font-family/editor-font-family-preference-block.injectable.ts index 6db49581f7..266c89a8ac 100644 --- a/src/features/preferences/renderer/preference-items/editor/editor-font-family/editor-font-family-preference-block.injectable.ts +++ b/src/features/preferences/renderer/preference-items/editor/editor-font-family/editor-font-family-preference-block.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { EditorFontFamily } from "./editor-font-family"; const editorFontFamilyPreferenceBlockInjectable = getInjectable({ diff --git a/src/features/preferences/renderer/preference-items/editor/editor-font-size/editor-font-size-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/editor/editor-font-size/editor-font-size-preference-block.injectable.ts index c61250cbda..e380119c08 100644 --- a/src/features/preferences/renderer/preference-items/editor/editor-font-size/editor-font-size-preference-block.injectable.ts +++ b/src/features/preferences/renderer/preference-items/editor/editor-font-size/editor-font-size-preference-block.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { EditorFontSize } from "./editor-font-size"; const editorFontSizePreferenceBlockInjectable = getInjectable({ diff --git a/src/features/preferences/renderer/preference-items/editor/editor-preference-page.injectable.tsx b/src/features/preferences/renderer/preference-items/editor/editor-preference-page.injectable.tsx index 3d075d6f22..6c0ef09c8f 100644 --- a/src/features/preferences/renderer/preference-items/editor/editor-preference-page.injectable.tsx +++ b/src/features/preferences/renderer/preference-items/editor/editor-preference-page.injectable.tsx @@ -3,10 +3,10 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import type { PreferenceItemComponent, PreferencePage } from "../preference-item-injection-token"; -import { preferenceItemInjectionToken } from "../preference-item-injection-token"; import { PreferencePageComponent } from "../../preference-page-component"; import React from "react"; +import type { PreferenceItemComponent, PreferencePage } from "@lensapp/preferences"; +import { preferenceItemInjectionToken } from "@lensapp/preferences"; const EditorPage: PreferenceItemComponent = ({ children, item }) => ( diff --git a/src/features/preferences/renderer/preference-items/editor/editor-preference-tab.injectable.ts b/src/features/preferences/renderer/preference-items/editor/editor-preference-tab.injectable.ts index c1dc4a29c0..9acaf86a56 100644 --- a/src/features/preferences/renderer/preference-items/editor/editor-preference-tab.injectable.ts +++ b/src/features/preferences/renderer/preference-items/editor/editor-preference-tab.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../preference-item-injection-token"; const editorPreferenceTabInjectable = getInjectable({ id: "editor-preference-tab", diff --git a/src/features/preferences/renderer/preference-items/editor/line-numbers/line-numbers-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/editor/line-numbers/line-numbers-preference-block.injectable.ts index 104e0db62a..af382d4a9d 100644 --- a/src/features/preferences/renderer/preference-items/editor/line-numbers/line-numbers-preference-block.injectable.ts +++ b/src/features/preferences/renderer/preference-items/editor/line-numbers/line-numbers-preference-block.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { LineNumbers } from "./line-numbers"; const lineNumbersPreferenceBlockInjectable = getInjectable({ diff --git a/src/features/preferences/renderer/preference-items/editor/minimap/minimap-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/editor/minimap/minimap-preference-block.injectable.ts index 90d34aba7e..25e6240010 100644 --- a/src/features/preferences/renderer/preference-items/editor/minimap/minimap-preference-block.injectable.ts +++ b/src/features/preferences/renderer/preference-items/editor/minimap/minimap-preference-block.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { Minimap } from "./minimap"; const minimapPreferenceBlockInjectable = getInjectable({ diff --git a/src/features/preferences/renderer/preference-items/editor/tab-size/tab-size-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/editor/tab-size/tab-size-preference-block.injectable.ts index 11bcae8440..935d127e34 100644 --- a/src/features/preferences/renderer/preference-items/editor/tab-size/tab-size-preference-block.injectable.ts +++ b/src/features/preferences/renderer/preference-items/editor/tab-size/tab-size-preference-block.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { TabSize } from "./tab-size"; const tabSizePreferenceBlockInjectable = getInjectable({ diff --git a/src/features/preferences/renderer/preference-items/extensions-preference-tab-group.injectable.ts b/src/features/preferences/renderer/preference-items/extensions-preference-tab-group.injectable.ts index 1a5fdb6645..a75fb1cd05 100644 --- a/src/features/preferences/renderer/preference-items/extensions-preference-tab-group.injectable.ts +++ b/src/features/preferences/renderer/preference-items/extensions-preference-tab-group.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "./preference-item-injection-token"; const extensionsPreferenceTabGroupInjectable = getInjectable({ id: "extensions-preference-tab-group", diff --git a/src/features/preferences/renderer/preference-items/general-preference-tab-group.injectable.ts b/src/features/preferences/renderer/preference-items/general-preference-tab-group.injectable.ts index fe46026aa8..9678ca9df0 100644 --- a/src/features/preferences/renderer/preference-items/general-preference-tab-group.injectable.ts +++ b/src/features/preferences/renderer/preference-items/general-preference-tab-group.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "./preference-item-injection-token"; const generalPreferenceTabGroupInjectable = getInjectable({ id: "general-preference-tab-group", diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync-preference-block.injectable.ts index ec4556c1b9..543bfdbba8 100644 --- a/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync-preference-block.injectable.ts +++ b/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync-preference-block.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { KubeconfigSync } from "./kubeconfig-sync"; const kubeconfigSyncPreferenceBlockInjectable = getInjectable({ diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-binary-download/kubectl-binary-download-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-binary-download/kubectl-binary-download-preference-block.injectable.ts index 7c37c0cf23..fefcd03b70 100644 --- a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-binary-download/kubectl-binary-download-preference-block.injectable.ts +++ b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-binary-download/kubectl-binary-download-preference-block.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../../../preference-item-injection-token"; import { KubectlBinaryDownload } from "./kubectl-binary-download"; const kubectlBinaryDownloadPreferenceBlockInjectable = getInjectable({ diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-directory-for-binaries/kubectl-directory-for-binaries-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-directory-for-binaries/kubectl-directory-for-binaries-preference-block.injectable.ts index f820821358..c0a7c0b256 100644 --- a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-directory-for-binaries/kubectl-directory-for-binaries-preference-block.injectable.ts +++ b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-directory-for-binaries/kubectl-directory-for-binaries-preference-block.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../../../preference-item-injection-token"; import { KubectlDirectoryForBinaries } from "./kubectl-directory-for-binaries"; const kubectlDirectoryForBinariesPreferenceBlockInjectable = getInjectable({ diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-download-mirror/kubectl-download-mirror-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-download-mirror/kubectl-download-mirror-preference-block.injectable.ts index 86776ab330..970862d412 100644 --- a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-download-mirror/kubectl-download-mirror-preference-block.injectable.ts +++ b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-download-mirror/kubectl-download-mirror-preference-block.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../../../preference-item-injection-token"; import { KubectlDownloadMirror } from "./kubectl-download-mirror"; const kubectlDownloadMirrorPreferenceBlockInjectable = getInjectable({ diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-group-preference-item.injectable.tsx b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-group-preference-item.injectable.tsx index 190ce03eeb..2324b46ef9 100644 --- a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-group-preference-item.injectable.tsx +++ b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-group-preference-item.injectable.tsx @@ -3,10 +3,10 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import type { PreferenceItemTypes } from "../../preference-item-injection-token"; -import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import Gutter from "../../../../../../renderer/components/gutter/gutter"; import React from "react"; +import type { PreferenceItemTypes } from "@lensapp/preferences"; +import { preferenceItemInjectionToken } from "@lensapp/preferences"; const PreferenceItemGroup = ({ children, diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-path-to-binary/kubectl-path-to-binary-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-path-to-binary/kubectl-path-to-binary-preference-block.injectable.ts index a87f8fd749..969f5f735c 100644 --- a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-path-to-binary/kubectl-path-to-binary-preference-block.injectable.ts +++ b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-path-to-binary/kubectl-path-to-binary-preference-block.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../../../preference-item-injection-token"; import { KubectlPathToBinary } from "./kubectl-path-to-binary"; const kubectlPathToBinaryPreferenceBlockInjectable = getInjectable({ diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubernetes-preference-page.injectable.tsx b/src/features/preferences/renderer/preference-items/kubernetes/kubernetes-preference-page.injectable.tsx index 6484c67381..5d740dbc16 100644 --- a/src/features/preferences/renderer/preference-items/kubernetes/kubernetes-preference-page.injectable.tsx +++ b/src/features/preferences/renderer/preference-items/kubernetes/kubernetes-preference-page.injectable.tsx @@ -3,11 +3,11 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import type { PreferenceItemComponent, PreferencePage } from "../preference-item-injection-token"; -import { preferenceItemInjectionToken } from "../preference-item-injection-token"; import { PreferencePageComponent } from "../../preference-page-component"; import { HorizontalLine } from "../../../../../renderer/components/horizontal-line/horizontal-line"; import React from "react"; +import type { PreferenceItemComponent, PreferencePage } from "@lensapp/preferences"; +import { preferenceItemInjectionToken } from "@lensapp/preferences"; const KubernetesPage: PreferenceItemComponent = ({ children, item }) => ( diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubernetes-preference-tab.injectable.ts b/src/features/preferences/renderer/preference-items/kubernetes/kubernetes-preference-tab.injectable.ts index ae33f1177a..a98550dc96 100644 --- a/src/features/preferences/renderer/preference-items/kubernetes/kubernetes-preference-tab.injectable.ts +++ b/src/features/preferences/renderer/preference-items/kubernetes/kubernetes-preference-tab.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../preference-item-injection-token"; const kubernetesPreferenceTabInjectable = getInjectable({ id: "kubernetes-preference-tab", diff --git a/src/features/preferences/renderer/preference-items/preference-item-injection-token.ts b/src/features/preferences/renderer/preference-items/preference-item-injection-token.ts deleted file mode 100644 index 38eb14aad8..0000000000 --- a/src/features/preferences/renderer/preference-items/preference-item-injection-token.ts +++ /dev/null @@ -1,68 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { getInjectionToken } from "@ogre-tools/injectable"; -import type React from "react"; -import type { ChildOfParentComposite, ParentOfChildComposite } from "../../../../common/utils/composite/interfaces"; -import type { Discriminable } from "../../../../common/utils/composable-responsibilities/discriminable/discriminable"; -import type { Labelable } from "../../../../common/utils/composable-responsibilities/labelable/labelable"; -import type { MaybeShowable } from "../../../../common/utils/composable-responsibilities/showable/showable"; -import type { Orderable } from "../../../../common/utils/composable-responsibilities/orderable/orderable"; -import type { GetSeparator } from "../../../../common/utils/add-separator/add-separator"; -import type { Composite } from "../../../../common/utils/composite/get-composite/get-composite"; - -export type ChildrenAreSeparated = - & { childSeparator: GetSeparator, React.ReactElement> }; - -export type ChildrenAreMaybeSeparated = - & Partial; - -export type PreferenceItemComponent = React.ComponentType<{ - children: React.ReactElement; - item: T; -}>; - -export type PreferenceTab = - & Discriminable<"tab"> - & ParentOfChildComposite - & ChildOfParentComposite - & MaybeShowable - & Labelable - & Orderable - & { pathId: string }; - -export type PreferenceTabGroup = - & Discriminable<"tab-group"> - & ParentOfChildComposite - & ChildOfParentComposite<"preference-tabs"> - & MaybeShowable - & Labelable - & Orderable - & { iconName? : string }; - -interface RenderableWithSiblings - extends ChildrenAreMaybeSeparated { - Component: PreferenceItemComponent; -} - -export type PreferencePage = - & Discriminable<"page"> - & ParentOfChildComposite - & ChildOfParentComposite - & MaybeShowable - & RenderableWithSiblings; - -export type PreferenceBlock = - & Discriminable<"block"> - & ParentOfChildComposite - & ChildOfParentComposite - & MaybeShowable - & RenderableWithSiblings; - -export type PreferenceItemTypes = PreferenceTabGroup | PreferenceTab | PreferenceBlock | PreferencePage; - -export const preferenceItemInjectionToken = getInjectionToken({ - id: "preference-item-injection-token", -}); - diff --git a/src/features/preferences/renderer/preference-items/preference-tab-root.tsx b/src/features/preferences/renderer/preference-items/preference-tab-root.tsx index 2847c07515..d1369de8e8 100644 --- a/src/features/preferences/renderer/preference-items/preference-tab-root.tsx +++ b/src/features/preferences/renderer/preference-items/preference-tab-root.tsx @@ -6,8 +6,8 @@ import React from "react"; import { HorizontalLine } from "../../../../renderer/components/horizontal-line/horizontal-line"; import type { RootComposite } from "../../../../common/utils/composite/interfaces"; import type { Discriminable } from "../../../../common/utils/composable-responsibilities/discriminable/discriminable"; -import type { ChildrenAreSeparated } from "./preference-item-injection-token"; import styles from "./preference-tab-root.module.scss"; +import type { ChildrenAreSeparated } from "@lensapp/preferences"; export type PreferenceTabsRoot = & Discriminable<"preference-tabs-root"> diff --git a/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts b/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts index 45f64d6233..684b9c5dd0 100644 --- a/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts +++ b/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts @@ -5,8 +5,6 @@ import { getInjectable } from "@ogre-tools/injectable"; import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx"; import { computed } from "mobx"; -import type { PreferenceItemTypes } from "./preference-item-injection-token"; -import { preferenceItemInjectionToken } from "./preference-item-injection-token"; import { pipeline } from "@ogre-tools/fp"; import type { PreferenceTabsRoot } from "./preference-tab-root"; import { preferenceTabsRoot } from "./preference-tab-root"; @@ -14,6 +12,8 @@ import logErrorInjectable from "../../../../common/log-error.injectable"; import { isShown } from "../../../../common/utils/composable-responsibilities/showable/showable"; import { orderByOrderNumber } from "../../../../common/utils/composable-responsibilities/orderable/orderable"; import { getCompositeFor } from "../../../../common/utils/composite/get-composite/get-composite"; +import type { PreferenceItemTypes } from "@lensapp/preferences"; +import { preferenceItemInjectionToken } from "@lensapp/preferences"; const preferencesCompositeInjectable = getInjectable({ id: "preferences-composite", diff --git a/src/features/preferences/renderer/preference-items/proxy/allow-untrusted-certificates/allow-untrusted-certificates-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/proxy/allow-untrusted-certificates/allow-untrusted-certificates-preference-block.injectable.ts index a423327535..7f3d75b66f 100644 --- a/src/features/preferences/renderer/preference-items/proxy/allow-untrusted-certificates/allow-untrusted-certificates-preference-block.injectable.ts +++ b/src/features/preferences/renderer/preference-items/proxy/allow-untrusted-certificates/allow-untrusted-certificates-preference-block.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { AllowUntrustedCertificates } from "./allow-untrusted-certificates"; const allowUntrustedCertificatesPreferenceBlockInjectable = getInjectable({ diff --git a/src/features/preferences/renderer/preference-items/proxy/http-proxy-url/http-proxy-url-preference-block.injectable.ts b/src/features/preferences/renderer/preference-items/proxy/http-proxy-url/http-proxy-url-preference-block.injectable.ts index 1405c4bf6b..450c5f11d4 100644 --- a/src/features/preferences/renderer/preference-items/proxy/http-proxy-url/http-proxy-url-preference-block.injectable.ts +++ b/src/features/preferences/renderer/preference-items/proxy/http-proxy-url/http-proxy-url-preference-block.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { HttpProxyUrl } from "./http-proxy-url"; const httpProxyUrlPreferenceBlockInjectable = getInjectable({ diff --git a/src/features/preferences/renderer/preference-items/proxy/proxy-preference-page.injectable.tsx b/src/features/preferences/renderer/preference-items/proxy/proxy-preference-page.injectable.tsx index 34a698fd5c..df3d3eaa4b 100644 --- a/src/features/preferences/renderer/preference-items/proxy/proxy-preference-page.injectable.tsx +++ b/src/features/preferences/renderer/preference-items/proxy/proxy-preference-page.injectable.tsx @@ -3,11 +3,11 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import type { PreferenceItemComponent, PreferencePage } from "../preference-item-injection-token"; -import { preferenceItemInjectionToken } from "../preference-item-injection-token"; import React from "react"; import { PreferencePageComponent } from "../../preference-page-component"; import { HorizontalLine } from "../../../../../renderer/components/horizontal-line/horizontal-line"; +import type { PreferenceItemComponent, PreferencePage } from "@lensapp/preferences"; +import { preferenceItemInjectionToken } from "@lensapp/preferences"; const ProxyPage: PreferenceItemComponent = ({ children, item }) => ( diff --git a/src/features/preferences/renderer/preference-items/proxy/proxy-preference-tab.injectable.ts b/src/features/preferences/renderer/preference-items/proxy/proxy-preference-tab.injectable.ts index 6b33c9f1d1..4b98168110 100644 --- a/src/features/preferences/renderer/preference-items/proxy/proxy-preference-tab.injectable.ts +++ b/src/features/preferences/renderer/preference-items/proxy/proxy-preference-tab.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../preference-item-injection-token"; const proxyPreferenceTabInjectable = getInjectable({ id: "proxy-preference-tab", diff --git a/src/features/preferences/renderer/preference-items/telemetry/automatic-error-reporting/automatic-error-reporting-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/telemetry/automatic-error-reporting/automatic-error-reporting-preference-item.injectable.ts index fb627ab93c..83e25cc844 100644 --- a/src/features/preferences/renderer/preference-items/telemetry/automatic-error-reporting/automatic-error-reporting-preference-item.injectable.ts +++ b/src/features/preferences/renderer/preference-items/telemetry/automatic-error-reporting/automatic-error-reporting-preference-item.injectable.ts @@ -3,9 +3,9 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { AutomaticErrorReporting } from "./automatic-error-reporting"; import sentryDataSourceNameInjectable from "../../../../../../common/vars/sentry-dsn-url.injectable"; +import { preferenceItemInjectionToken } from "@lensapp/preferences"; const automaticErrorReportingPreferenceItemInjectable = getInjectable({ id: "automatic-error-reporting-preference-item", 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 18ef79ab1c..d03f81c00e 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 @@ -3,10 +3,10 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import type { PreferenceItemComponent, PreferencePage } from "../preference-item-injection-token"; -import { preferenceItemInjectionToken } from "../preference-item-injection-token"; import React from "react"; import { PreferencePageComponent } from "../../preference-page-component"; +import type { PreferenceItemComponent, PreferencePage } from "@lensapp/preferences"; +import { preferenceItemInjectionToken } from "@lensapp/preferences"; const TelemetryPage: PreferenceItemComponent = ({ children, item }) => ( 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 46021d7344..dbfc2c42ee 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 @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../preference-item-injection-token"; const telemetryPreferenceTabInjectable = getInjectable({ id: "telemetry-preference-tab", diff --git a/src/features/preferences/renderer/preference-items/terminal/copy-paste-from-terminal/copy-paste-from-terminal-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/terminal/copy-paste-from-terminal/copy-paste-from-terminal-preference-item.injectable.ts index d5783cdd6d..fc81471c0b 100644 --- a/src/features/preferences/renderer/preference-items/terminal/copy-paste-from-terminal/copy-paste-from-terminal-preference-item.injectable.ts +++ b/src/features/preferences/renderer/preference-items/terminal/copy-paste-from-terminal/copy-paste-from-terminal-preference-item.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { CopyPasteFromTerminal } from "./copy-paste-from-terminal"; const copyPasteFromTerminalPreferenceItemInjectable = getInjectable({ diff --git a/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-family-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-family-preference-item.injectable.ts index 0416afaa74..f594b27c32 100644 --- a/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-family-preference-item.injectable.ts +++ b/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-family-preference-item.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { TerminalFontFamily } from "./terminal-font-family"; const terminalFontFamilyPreferenceItemInjectable = getInjectable({ diff --git a/src/features/preferences/renderer/preference-items/terminal/terminal-font-size/terminal-font-size-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/terminal/terminal-font-size/terminal-font-size-preference-item.injectable.ts index f2d778575f..a382eb52aa 100644 --- a/src/features/preferences/renderer/preference-items/terminal/terminal-font-size/terminal-font-size-preference-item.injectable.ts +++ b/src/features/preferences/renderer/preference-items/terminal/terminal-font-size/terminal-font-size-preference-item.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { TerminalFontSize } from "./terminal-font-size"; const terminalFontSizePreferenceItemInjectable = getInjectable({ diff --git a/src/features/preferences/renderer/preference-items/terminal/terminal-page-preference-item.injectable.tsx b/src/features/preferences/renderer/preference-items/terminal/terminal-page-preference-item.injectable.tsx index 416765ffee..648f583e64 100644 --- a/src/features/preferences/renderer/preference-items/terminal/terminal-page-preference-item.injectable.tsx +++ b/src/features/preferences/renderer/preference-items/terminal/terminal-page-preference-item.injectable.tsx @@ -3,10 +3,10 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import type { PreferenceItemComponent, PreferencePage } from "../preference-item-injection-token"; -import { preferenceItemInjectionToken } from "../preference-item-injection-token"; import { PreferencePageComponent } from "../../preference-page-component"; import React from "react"; +import { preferenceItemInjectionToken } from "@lensapp/preferences"; +import type { PreferenceItemComponent, PreferencePage } from "@lensapp/preferences"; const TerminalPage: PreferenceItemComponent = ({ children, item }) => ( diff --git a/src/features/preferences/renderer/preference-items/terminal/terminal-preference-tab.injectable.ts b/src/features/preferences/renderer/preference-items/terminal/terminal-preference-tab.injectable.ts index ec4a69619b..26710416f7 100644 --- a/src/features/preferences/renderer/preference-items/terminal/terminal-preference-tab.injectable.ts +++ b/src/features/preferences/renderer/preference-items/terminal/terminal-preference-tab.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../preference-item-injection-token"; const terminalPreferenceTabInjectable = getInjectable({ id: "terminal-preference-tab", diff --git a/src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/terminal-shell-path-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/terminal-shell-path-preference-item.injectable.ts index 26c5ae8f3f..6c82ba42a8 100644 --- a/src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/terminal-shell-path-preference-item.injectable.ts +++ b/src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/terminal-shell-path-preference-item.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { TerminalShellPath } from "./terminal-shell-path"; const terminalShellPathPreferenceItemInjectable = getInjectable({ diff --git a/src/features/preferences/renderer/preference-items/terminal/terminal-theme/terminal-theme-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/terminal/terminal-theme/terminal-theme-preference-item.injectable.ts index dd26ce8c9a..72e99777b3 100644 --- a/src/features/preferences/renderer/preference-items/terminal/terminal-theme/terminal-theme-preference-item.injectable.ts +++ b/src/features/preferences/renderer/preference-items/terminal/terminal-theme/terminal-theme-preference-item.injectable.ts @@ -2,8 +2,8 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { preferenceItemInjectionToken } from "@lensapp/preferences"; import { getInjectable } from "@ogre-tools/injectable"; -import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { TerminalTheme } from "./terminal-theme"; const terminalThemePreferenceItemInjectable = getInjectable({ diff --git a/src/features/preferences/renderer/preference-navigation/preferences-navigation-tab.tsx b/src/features/preferences/renderer/preference-navigation/preferences-navigation-tab.tsx index 1ee75298d0..b43ea587b4 100644 --- a/src/features/preferences/renderer/preference-navigation/preferences-navigation-tab.tsx +++ b/src/features/preferences/renderer/preference-navigation/preferences-navigation-tab.tsx @@ -6,10 +6,10 @@ import { Tab } from "../../../../renderer/components/tabs"; import navigateToPreferenceTabInjectable from "./navigate-to-preference-tab/navigate-to-preference-tab.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; import { observer } from "mobx-react"; -import type { PreferenceTab } from "../preference-items/preference-item-injection-token"; import type { IComputedValue } from "mobx"; import preferenceTabIsActiveInjectable from "./navigate-to-preference-tab/preference-tab-is-active.injectable"; import React from "react"; +import type { PreferenceTab } from "@lensapp/preferences"; interface Dependencies { navigateToTab: (tabId: string) => void; diff --git a/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx b/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx index 8d54e69d09..b1e3ce9aa0 100644 --- a/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx +++ b/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx @@ -5,7 +5,6 @@ import { Tabs } from "../../../../renderer/components/tabs"; import React from "react"; import type { Composite } from "../../../../common/utils/composite/get-composite/get-composite"; -import type { PreferenceItemTypes } from "../preference-items/preference-item-injection-token"; import { Map } from "../../../../renderer/components/map/map"; import { withInjectables } from "@ogre-tools/injectable-react"; import type { IComputedValue } from "mobx"; @@ -16,6 +15,7 @@ import { compositeHasDescendant } from "../../../../common/utils/composite/compo import type { PreferenceTabsRoot } from "../preference-items/preference-tab-root"; import { Icon } from "../../../../renderer/components/icon"; import { checkThatAllDiscriminablesAreExhausted } from "../../../../common/utils/composable-responsibilities/discriminable/discriminable"; +import type { PreferenceItemTypes } from "@lensapp/preferences"; interface Dependencies { composite: IComputedValue>; diff --git a/src/features/preferences/renderer/preferences.tsx b/src/features/preferences/renderer/preferences.tsx index 7a53b9d221..e4f71c3062 100644 --- a/src/features/preferences/renderer/preferences.tsx +++ b/src/features/preferences/renderer/preferences.tsx @@ -10,13 +10,13 @@ import { withInjectables } from "@ogre-tools/injectable-react"; import closePreferencesInjectable from "./close-preferences/close-preferences.injectable"; import currentPreferenceTabCompositeInjectable from "./preference-items/current-preference-tab-composite.injectable"; import type { Composite } from "../../../common/utils/composite/get-composite/get-composite"; -import type { PreferenceItemTypes, PreferenceTab } from "./preference-items/preference-item-injection-token"; import type { IComputedValue } from "mobx"; import { Map } from "../../../renderer/components/map/map"; import { observer } from "mobx-react"; import { PreferencesNavigation } from "./preference-navigation/preferences-navigation"; import Gutter from "../../../renderer/components/gutter/gutter"; import { checkThatAllDiscriminablesAreExhausted } from "../../../common/utils/composable-responsibilities/discriminable/discriminable"; +import type { PreferenceTab, PreferenceItemTypes } from "@lensapp/preferences"; interface Dependencies { closePreferences: () => void;