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

Migrate some functionality to Feature-module of "preferences"

Browse Source 
Co-authored-by: Janne Savolainen <janne.savolainen@live.fi>

Signed-off-by: Iku-turso <mikko.aspiala@gmail.com>
This commit is contained in:
Iku-turso 2022-11-08 13:53:20 +02:00
parent 5ae60e218c
commit 794ab63360
50 changed files with 62 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package.json
View File

@ -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",

2
src/features/application-update/child-features/preferences/renderer/update-channel/update-channel-preference-block.injectable.ts
View File

@ -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({

2
src/features/helm-charts/child-features/preferences/renderer/helm-charts-preference-block.injectable.ts
View File

@ -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",

2
src/features/preferences/closing-preferences.test.tsx
View File

@ -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;

2
src/features/preferences/hiding-of-empty-branches.test.tsx
View File

@ -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;

2
src/features/preferences/renderer/compliance-for-legacy-extension-api/registrator-for-preference-items.injectable.tsx
View File

@ -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",

6
src/features/preferences/renderer/preference-items/application/application-preference-page.injectable.tsx
View File

@ -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<PreferencePage> = ({ children, item }) => (
<PreferencePageComponent title="Application" id={item.id}>

2
src/features/preferences/renderer/preference-items/application/application-preference-tab.injectable.ts
View File

@ -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",

2
src/features/preferences/renderer/preference-items/application/extension-install-registry/extension-install-registry-preference-block.injectable.ts
View File

@ -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({

2
src/features/preferences/renderer/preference-items/application/start-up/start-up-preference-block.injectable.ts
View File

@ -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({

2
src/features/preferences/renderer/preference-items/application/theme/theme-preference-block.injectable.ts
View File

@ -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({

2
src/features/preferences/renderer/preference-items/application/timezone/timezone-preference-block.injectable.ts
View File

@ -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({

2
src/features/preferences/renderer/preference-items/current-preference-tab-composite.injectable.ts
View File

@ -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",

2
src/features/preferences/renderer/preference-items/editor/editor-font-family/editor-font-family-preference-block.injectable.ts
View File

@ -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({

2
src/features/preferences/renderer/preference-items/editor/editor-font-size/editor-font-size-preference-block.injectable.ts
View File

@ -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({

4
src/features/preferences/renderer/preference-items/editor/editor-preference-page.injectable.tsx
View File

@ -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<PreferencePage> = ({ children, item }) => (
<PreferencePageComponent title="Editor" id={item.id}>

2
src/features/preferences/renderer/preference-items/editor/editor-preference-tab.injectable.ts
View File

@ -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",

2
src/features/preferences/renderer/preference-items/editor/line-numbers/line-numbers-preference-block.injectable.ts
View File

@ -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({

2
src/features/preferences/renderer/preference-items/editor/minimap/minimap-preference-block.injectable.ts
View File

@ -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({

2
src/features/preferences/renderer/preference-items/editor/tab-size/tab-size-preference-block.injectable.ts
View File

@ -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({

2
src/features/preferences/renderer/preference-items/extensions-preference-tab-group.injectable.ts
View File

@ -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",

2
src/features/preferences/renderer/preference-items/general-preference-tab-group.injectable.ts
View File

@ -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",

2
src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync-preference-block.injectable.ts
View File

@ -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({

2
src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-binary-download/kubectl-binary-download-preference-block.injectable.ts
View File

@ -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({

2
src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-directory-for-binaries/kubectl-directory-for-binaries-preference-block.injectable.ts
View File

@ -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({

2
src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-download-mirror/kubectl-download-mirror-preference-block.injectable.ts
View File

@ -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({

4
src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-group-preference-item.injectable.tsx
View File

@ -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,

2
src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-path-to-binary/kubectl-path-to-binary-preference-block.injectable.ts
View File

@ -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({

4
src/features/preferences/renderer/preference-items/kubernetes/kubernetes-preference-page.injectable.tsx
View File

@ -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<PreferencePage> = ({ children, item }) => (
<PreferencePageComponent title="Kubernetes" id={item.id}>

2
src/features/preferences/renderer/preference-items/kubernetes/kubernetes-preference-tab.injectable.ts
View File

@ -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",

68
src/features/preferences/renderer/preference-items/preference-item-injection-token.ts
View File

@ -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<Composite<PreferenceItemTypes>, React.ReactElement> };
export type ChildrenAreMaybeSeparated =
& Partial<ChildrenAreSeparated>;
export type PreferenceItemComponent<T> = 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<T extends PreferenceItemTypes>
extends ChildrenAreMaybeSeparated {
Component: PreferenceItemComponent<T>;
}
export type PreferencePage =
& Discriminable<"page">
& ParentOfChildComposite
& ChildOfParentComposite
& MaybeShowable
& RenderableWithSiblings<PreferencePage>;
export type PreferenceBlock =
& Discriminable<"block">
& ParentOfChildComposite
& ChildOfParentComposite
& MaybeShowable
& RenderableWithSiblings<PreferenceBlock>;
export type PreferenceItemTypes = PreferenceTabGroup | PreferenceTab | PreferenceBlock | PreferencePage;
export const preferenceItemInjectionToken = getInjectionToken<PreferenceItemTypes>({
id: "preference-item-injection-token",
});

2
src/features/preferences/renderer/preference-items/preference-tab-root.tsx
View File

@ -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">

4
src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts
View File

@ -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",

2
src/features/preferences/renderer/preference-items/proxy/allow-untrusted-certificates/allow-untrusted-certificates-preference-block.injectable.ts
View File

@ -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({

2
src/features/preferences/renderer/preference-items/proxy/http-proxy-url/http-proxy-url-preference-block.injectable.ts
View File

@ -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({

4
src/features/preferences/renderer/preference-items/proxy/proxy-preference-page.injectable.tsx
View File

@ -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<PreferencePage> = ({ children, item }) => (
<PreferencePageComponent title="Proxy" id={item.id}>

2
src/features/preferences/renderer/preference-items/proxy/proxy-preference-tab.injectable.ts
View File

@ -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",

2
src/features/preferences/renderer/preference-items/telemetry/automatic-error-reporting/automatic-error-reporting-preference-item.injectable.ts
View File

@ -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",

4
src/features/preferences/renderer/preference-items/telemetry/telemetry-preference-page.injectable.tsx
View File

@ -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<PreferencePage> = ({ children, item }) => (
<PreferencePageComponent title="Telemetry" id={item.id}>

2
src/features/preferences/renderer/preference-items/telemetry/telemetry-preference-tab.injectable.ts
View File

@ -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",

2
src/features/preferences/renderer/preference-items/terminal/copy-paste-from-terminal/copy-paste-from-terminal-preference-item.injectable.ts
View File

@ -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({

2
src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-family-preference-item.injectable.ts
View File

@ -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({

2
src/features/preferences/renderer/preference-items/terminal/terminal-font-size/terminal-font-size-preference-item.injectable.ts
View File

@ -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({

4
src/features/preferences/renderer/preference-items/terminal/terminal-page-preference-item.injectable.tsx
View File

@ -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<PreferencePage> = ({ children, item }) => (
<PreferencePageComponent title="Terminal" id={item.id}>

2
src/features/preferences/renderer/preference-items/terminal/terminal-preference-tab.injectable.ts
View File

@ -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",

2
src/features/preferences/renderer/preference-items/terminal/terminal-shell-path/terminal-shell-path-preference-item.injectable.ts
View File

@ -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({

2
src/features/preferences/renderer/preference-items/terminal/terminal-theme/terminal-theme-preference-item.injectable.ts
View File

@ -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({

2
src/features/preferences/renderer/preference-navigation/preferences-navigation-tab.tsx
View File

@ -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;

2
src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx
View File

@ -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<Composite<PreferenceItemTypes | PreferenceTabsRoot>>;

2
src/features/preferences/renderer/preferences.tsx
View File

@ -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;