diff --git a/src/features/helm-charts/child-features/preferences/renderer/helm-charts-preference-item.injectable.ts b/src/features/helm-charts/child-features/preferences/renderer/helm-charts-preference-block.injectable.ts similarity index 76% rename from src/features/helm-charts/child-features/preferences/renderer/helm-charts-preference-item.injectable.ts rename to src/features/helm-charts/child-features/preferences/renderer/helm-charts-preference-block.injectable.ts index a9263c2792..e9beba4eb9 100644 --- a/src/features/helm-charts/child-features/preferences/renderer/helm-charts-preference-item.injectable.ts +++ b/src/features/helm-charts/child-features/preferences/renderer/helm-charts-preference-block.injectable.ts @@ -6,11 +6,11 @@ import { getInjectable } from "@ogre-tools/injectable"; import { HelmCharts } from "./helm-charts"; import { preferenceItemInjectionToken } from "../../../../preferences/renderer/preference-items/preference-item-injection-token"; -const helmChartsPreferenceItemInjectable = getInjectable({ - id: "helm-charts-preference-item", +const helmChartsPreferenceBlockInjectable = getInjectable({ + id: "helm-charts-preference-block", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "helm-charts", parentId: "kubernetes-page", orderNumber: 30, @@ -20,4 +20,4 @@ const helmChartsPreferenceItemInjectable = getInjectable({ injectionToken: preferenceItemInjectionToken, }); -export default helmChartsPreferenceItemInjectable; +export default helmChartsPreferenceBlockInjectable; diff --git a/src/features/preferences/closing-preferences.test.tsx b/src/features/preferences/closing-preferences.test.tsx index 0d0b3aeffd..035dc1c5be 100644 --- a/src/features/preferences/closing-preferences.test.tsx +++ b/src/features/preferences/closing-preferences.test.tsx @@ -277,7 +277,7 @@ const testPreferenceItemInjectable = getInjectable({ id: "test-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "test-item", parentId: "some-test-tab-id" as const, Component: () =>
irrelevant
, diff --git a/src/features/preferences/hiding-of-empty-branches.test.tsx b/src/features/preferences/hiding-of-empty-branches.test.tsx index 2e483d6134..1e9e630216 100644 --- a/src/features/preferences/hiding-of-empty-branches.test.tsx +++ b/src/features/preferences/hiding-of-empty-branches.test.tsx @@ -116,7 +116,7 @@ describe("preferences - hiding-of-empty-branches, given in preferences page", () id: "some-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "some-preference-item-id", parentId: "some-tab-id" as const, testId: "some-preference-item", @@ -169,7 +169,7 @@ describe("preferences - hiding-of-empty-branches, given in preferences page", () id: "some-other-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "some-other-preference-item-id", parentId: "some-other-tab-id" as const, testId: "some-other-preference-item", diff --git a/src/features/preferences/renderer/compliance-for-legacy-extension-api/extension-preference-item.tsx b/src/features/preferences/renderer/compliance-for-legacy-extension-api/extension-preference-block.tsx similarity index 90% rename from src/features/preferences/renderer/compliance-for-legacy-extension-api/extension-preference-item.tsx rename to src/features/preferences/renderer/compliance-for-legacy-extension-api/extension-preference-block.tsx index 65018b4db3..c2648e5993 100644 --- a/src/features/preferences/renderer/compliance-for-legacy-extension-api/extension-preference-item.tsx +++ b/src/features/preferences/renderer/compliance-for-legacy-extension-api/extension-preference-block.tsx @@ -10,7 +10,7 @@ export interface ExtensionSettingsProps { registration: AppPreferenceRegistration; } -export function ExtensionPreferenceItem({ registration }: ExtensionSettingsProps) { +export function ExtensionPreferenceBlock({ registration }: ExtensionSettingsProps) { const { title, id, 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 d5adcd6f68..65bc7b99f2 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 @@ -8,7 +8,7 @@ import type { LensRendererExtension } from "../../../../extensions/lens-renderer 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 { ExtensionPreferenceItem } from "./extension-preference-item"; +import { ExtensionPreferenceBlock } from "./extension-preference-block"; import { computed } from "mobx"; import { HorizontalLine } from "../horizontal-line/horizontal-line"; @@ -117,7 +117,7 @@ const registratorForPreferenceItemsInjectable = getInjectable({ id: itemId, instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: itemId, // Note: Legacy extensions considered telemetry as magic string, and so does this code @@ -130,7 +130,7 @@ const registratorForPreferenceItemsInjectable = getInjectable({ orderNumber: i * 10, Component: () => ( - + ), childSeparator: HorizontalLine, diff --git a/src/features/preferences/renderer/preference-items/application/extension-install-registry/extension-install-registry-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/application/extension-install-registry/extension-install-registry-preference-block.injectable.ts similarity index 79% rename from src/features/preferences/renderer/preference-items/application/extension-install-registry/extension-install-registry-preference-item.injectable.ts rename to src/features/preferences/renderer/preference-items/application/extension-install-registry/extension-install-registry-preference-block.injectable.ts index 3184f2e666..edda55f3de 100644 --- a/src/features/preferences/renderer/preference-items/application/extension-install-registry/extension-install-registry-preference-item.injectable.ts +++ b/src/features/preferences/renderer/preference-items/application/extension-install-registry/extension-install-registry-preference-block.injectable.ts @@ -6,11 +6,11 @@ import { getInjectable } from "@ogre-tools/injectable"; import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { ExtensionInstallRegistry } from "./extension-install-registry"; -const extensionInstallRegistryPreferenceItemInjectable = getInjectable({ +const extensionInstallRegistryPreferenceBlockInjectable = getInjectable({ id: "extension-install-registry-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "extension-install-registry", parentId: "application-page", orderNumber: 20, @@ -20,4 +20,4 @@ const extensionInstallRegistryPreferenceItemInjectable = getInjectable({ injectionToken: preferenceItemInjectionToken, }); -export default extensionInstallRegistryPreferenceItemInjectable; +export default extensionInstallRegistryPreferenceBlockInjectable; diff --git a/src/features/preferences/renderer/preference-items/application/start-up/start-up-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/application/start-up/start-up-preference-block.injectable.ts similarity index 80% rename from src/features/preferences/renderer/preference-items/application/start-up/start-up-preference-item.injectable.ts rename to src/features/preferences/renderer/preference-items/application/start-up/start-up-preference-block.injectable.ts index 045477f28c..2db579bf6e 100644 --- a/src/features/preferences/renderer/preference-items/application/start-up/start-up-preference-item.injectable.ts +++ b/src/features/preferences/renderer/preference-items/application/start-up/start-up-preference-block.injectable.ts @@ -6,11 +6,11 @@ import { getInjectable } from "@ogre-tools/injectable"; import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { StartUp } from "./start-up"; -const startUpPreferenceItemInjectable = getInjectable({ +const startUpPreferenceBlockInjectable = getInjectable({ id: "start-up-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "start-up", parentId: "application-page", orderNumber: 30, @@ -20,4 +20,4 @@ const startUpPreferenceItemInjectable = getInjectable({ injectionToken: preferenceItemInjectionToken, }); -export default startUpPreferenceItemInjectable; +export default startUpPreferenceBlockInjectable; diff --git a/src/features/preferences/renderer/preference-items/application/theme/theme-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/application/theme/theme-preference-block.injectable.ts similarity index 80% rename from src/features/preferences/renderer/preference-items/application/theme/theme-preference-item.injectable.ts rename to src/features/preferences/renderer/preference-items/application/theme/theme-preference-block.injectable.ts index b19c04dad3..285b068d62 100644 --- a/src/features/preferences/renderer/preference-items/application/theme/theme-preference-item.injectable.ts +++ b/src/features/preferences/renderer/preference-items/application/theme/theme-preference-block.injectable.ts @@ -6,11 +6,11 @@ import { getInjectable } from "@ogre-tools/injectable"; import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { Theme } from "./theme"; -const themePreferenceItemInjectable = getInjectable({ +const themePreferenceBlockInjectable = getInjectable({ id: "theme-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "theme", parentId: "application-page", orderNumber: 10, @@ -20,4 +20,4 @@ const themePreferenceItemInjectable = getInjectable({ injectionToken: preferenceItemInjectionToken, }); -export default themePreferenceItemInjectable; +export default themePreferenceBlockInjectable; diff --git a/src/features/preferences/renderer/preference-items/application/timezone/timezone-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/application/timezone/timezone-preference-block.injectable.ts similarity index 80% rename from src/features/preferences/renderer/preference-items/application/timezone/timezone-preference-item.injectable.ts rename to src/features/preferences/renderer/preference-items/application/timezone/timezone-preference-block.injectable.ts index f370771a71..5357341f9a 100644 --- a/src/features/preferences/renderer/preference-items/application/timezone/timezone-preference-item.injectable.ts +++ b/src/features/preferences/renderer/preference-items/application/timezone/timezone-preference-block.injectable.ts @@ -6,11 +6,11 @@ import { getInjectable } from "@ogre-tools/injectable"; import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { Timezone } from "./timezone"; -const timezonePreferenceItemInjectable = getInjectable({ +const timezonePreferenceBlockInjectable = getInjectable({ id: "timezone-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "timezone", parentId: "application-page", orderNumber: 60, @@ -20,4 +20,4 @@ const timezonePreferenceItemInjectable = getInjectable({ injectionToken: preferenceItemInjectionToken, }); -export default timezonePreferenceItemInjectable; +export default timezonePreferenceBlockInjectable; diff --git a/src/features/preferences/renderer/preference-items/application/update-channel/update-channel-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/application/update-channel/update-channel-preference-block.injectable.ts similarity index 79% rename from src/features/preferences/renderer/preference-items/application/update-channel/update-channel-preference-item.injectable.ts rename to src/features/preferences/renderer/preference-items/application/update-channel/update-channel-preference-block.injectable.ts index c210fb5092..5896ed5b75 100644 --- a/src/features/preferences/renderer/preference-items/application/update-channel/update-channel-preference-item.injectable.ts +++ b/src/features/preferences/renderer/preference-items/application/update-channel/update-channel-preference-block.injectable.ts @@ -6,11 +6,11 @@ import { getInjectable } from "@ogre-tools/injectable"; import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { UpdateChannel } from "./update-channel"; -const updateChannelPreferenceItemInjectable = getInjectable({ +const updateChannelPreferenceBlockInjectable = getInjectable({ id: "update-channel-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "update-channel", parentId: "application-page", orderNumber: 50, @@ -20,4 +20,4 @@ const updateChannelPreferenceItemInjectable = getInjectable({ injectionToken: preferenceItemInjectionToken, }); -export default updateChannelPreferenceItemInjectable; +export default updateChannelPreferenceBlockInjectable; diff --git a/src/features/preferences/renderer/preference-items/editor/editor-font-family/editor-font-family-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/editor/editor-font-family/editor-font-family-preference-block.injectable.ts similarity index 79% rename from src/features/preferences/renderer/preference-items/editor/editor-font-family/editor-font-family-preference-item.injectable.ts rename to src/features/preferences/renderer/preference-items/editor/editor-font-family/editor-font-family-preference-block.injectable.ts index 49ab2fe491..6db49581f7 100644 --- a/src/features/preferences/renderer/preference-items/editor/editor-font-family/editor-font-family-preference-item.injectable.ts +++ b/src/features/preferences/renderer/preference-items/editor/editor-font-family/editor-font-family-preference-block.injectable.ts @@ -6,11 +6,11 @@ import { getInjectable } from "@ogre-tools/injectable"; import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { EditorFontFamily } from "./editor-font-family"; -const editorFontFamilyPreferenceItemInjectable = getInjectable({ +const editorFontFamilyPreferenceBlockInjectable = getInjectable({ id: "editor-font-family-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "editor-font-family", parentId: "editor-page", orderNumber: 50, @@ -20,4 +20,4 @@ const editorFontFamilyPreferenceItemInjectable = getInjectable({ injectionToken: preferenceItemInjectionToken, }); -export default editorFontFamilyPreferenceItemInjectable; +export default editorFontFamilyPreferenceBlockInjectable; diff --git a/src/features/preferences/renderer/preference-items/editor/editor-font-size/editor-font-size-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/editor/editor-font-size/editor-font-size-preference-block.injectable.ts similarity index 79% rename from src/features/preferences/renderer/preference-items/editor/editor-font-size/editor-font-size-preference-item.injectable.ts rename to src/features/preferences/renderer/preference-items/editor/editor-font-size/editor-font-size-preference-block.injectable.ts index ec2d485dc1..c61250cbda 100644 --- a/src/features/preferences/renderer/preference-items/editor/editor-font-size/editor-font-size-preference-item.injectable.ts +++ b/src/features/preferences/renderer/preference-items/editor/editor-font-size/editor-font-size-preference-block.injectable.ts @@ -6,11 +6,11 @@ import { getInjectable } from "@ogre-tools/injectable"; import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { EditorFontSize } from "./editor-font-size"; -const editorFontSizePreferenceItemInjectable = getInjectable({ +const editorFontSizePreferenceBlockInjectable = getInjectable({ id: "editor-font-size-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "editor-font-size", parentId: "editor-page", orderNumber: 40, @@ -20,4 +20,4 @@ const editorFontSizePreferenceItemInjectable = getInjectable({ injectionToken: preferenceItemInjectionToken, }); -export default editorFontSizePreferenceItemInjectable; +export default editorFontSizePreferenceBlockInjectable; diff --git a/src/features/preferences/renderer/preference-items/editor/line-numbers/line-numbers-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/editor/line-numbers/line-numbers-preference-block.injectable.ts similarity index 79% rename from src/features/preferences/renderer/preference-items/editor/line-numbers/line-numbers-preference-item.injectable.ts rename to src/features/preferences/renderer/preference-items/editor/line-numbers/line-numbers-preference-block.injectable.ts index e09ca37c89..104e0db62a 100644 --- a/src/features/preferences/renderer/preference-items/editor/line-numbers/line-numbers-preference-item.injectable.ts +++ b/src/features/preferences/renderer/preference-items/editor/line-numbers/line-numbers-preference-block.injectable.ts @@ -6,11 +6,11 @@ import { getInjectable } from "@ogre-tools/injectable"; import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { LineNumbers } from "./line-numbers"; -const lineNumbersPreferenceItemInjectable = getInjectable({ +const lineNumbersPreferenceBlockInjectable = getInjectable({ id: "line-numbers-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "line-numbers", parentId: "editor-page", orderNumber: 20, @@ -20,4 +20,4 @@ const lineNumbersPreferenceItemInjectable = getInjectable({ injectionToken: preferenceItemInjectionToken, }); -export default lineNumbersPreferenceItemInjectable; +export default lineNumbersPreferenceBlockInjectable; diff --git a/src/features/preferences/renderer/preference-items/editor/minimap/minimap-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/editor/minimap/minimap-preference-block.injectable.ts similarity index 80% rename from src/features/preferences/renderer/preference-items/editor/minimap/minimap-preference-item.injectable.ts rename to src/features/preferences/renderer/preference-items/editor/minimap/minimap-preference-block.injectable.ts index eec03c92a6..90d34aba7e 100644 --- a/src/features/preferences/renderer/preference-items/editor/minimap/minimap-preference-item.injectable.ts +++ b/src/features/preferences/renderer/preference-items/editor/minimap/minimap-preference-block.injectable.ts @@ -6,11 +6,11 @@ import { getInjectable } from "@ogre-tools/injectable"; import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { Minimap } from "./minimap"; -const minimapPreferenceItemInjectable = getInjectable({ +const minimapPreferenceBlockInjectable = getInjectable({ id: "minimap-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "minimap", parentId: "editor-page", orderNumber: 10, @@ -20,4 +20,4 @@ const minimapPreferenceItemInjectable = getInjectable({ injectionToken: preferenceItemInjectionToken, }); -export default minimapPreferenceItemInjectable; +export default minimapPreferenceBlockInjectable; diff --git a/src/features/preferences/renderer/preference-items/editor/tab-size/tab-size-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/editor/tab-size/tab-size-preference-block.injectable.ts similarity index 80% rename from src/features/preferences/renderer/preference-items/editor/tab-size/tab-size-preference-item.injectable.ts rename to src/features/preferences/renderer/preference-items/editor/tab-size/tab-size-preference-block.injectable.ts index f8b179bbfc..11bcae8440 100644 --- a/src/features/preferences/renderer/preference-items/editor/tab-size/tab-size-preference-item.injectable.ts +++ b/src/features/preferences/renderer/preference-items/editor/tab-size/tab-size-preference-block.injectable.ts @@ -6,11 +6,11 @@ import { getInjectable } from "@ogre-tools/injectable"; import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { TabSize } from "./tab-size"; -const tabSizePreferenceItemInjectable = getInjectable({ +const tabSizePreferenceBlockInjectable = getInjectable({ id: "tab-size-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "tab-size", parentId: "editor-page", orderNumber: 30, @@ -20,4 +20,4 @@ const tabSizePreferenceItemInjectable = getInjectable({ injectionToken: preferenceItemInjectionToken, }); -export default tabSizePreferenceItemInjectable; +export default tabSizePreferenceBlockInjectable; diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync-preference-block.injectable.ts similarity index 79% rename from src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync-preference-item.injectable.ts rename to src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync-preference-block.injectable.ts index 5aa40f4334..ec4556c1b9 100644 --- a/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync-preference-item.injectable.ts +++ b/src/features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync-preference-block.injectable.ts @@ -6,11 +6,11 @@ import { getInjectable } from "@ogre-tools/injectable"; import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { KubeconfigSync } from "./kubeconfig-sync"; -const kubeconfigSyncPreferenceItemInjectable = getInjectable({ +const kubeconfigSyncPreferenceBlockInjectable = getInjectable({ id: "kubeconfig-sync-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "kubeconfig-sync", parentId: "kubernetes-page", orderNumber: 20, @@ -20,4 +20,4 @@ const kubeconfigSyncPreferenceItemInjectable = getInjectable({ injectionToken: preferenceItemInjectionToken, }); -export default kubeconfigSyncPreferenceItemInjectable; +export default kubeconfigSyncPreferenceBlockInjectable; diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-binary-download/kubectl-binary-download-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-binary-download/kubectl-binary-download-preference-block.injectable.ts similarity index 79% rename from src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-binary-download/kubectl-binary-download-preference-item.injectable.ts rename to src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-binary-download/kubectl-binary-download-preference-block.injectable.ts index 12a0717bd7..7c37c0cf23 100644 --- a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-binary-download/kubectl-binary-download-preference-item.injectable.ts +++ b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-binary-download/kubectl-binary-download-preference-block.injectable.ts @@ -6,11 +6,11 @@ import { getInjectable } from "@ogre-tools/injectable"; import { preferenceItemInjectionToken } from "../../../preference-item-injection-token"; import { KubectlBinaryDownload } from "./kubectl-binary-download"; -const kubectlBinaryDownloadPreferenceItemInjectable = getInjectable({ +const kubectlBinaryDownloadPreferenceBlockInjectable = getInjectable({ id: "kubectl-binary-download-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "kubectl-binary-download", parentId: "kubectl", orderNumber: 10, @@ -20,4 +20,4 @@ const kubectlBinaryDownloadPreferenceItemInjectable = getInjectable({ injectionToken: preferenceItemInjectionToken, }); -export default kubectlBinaryDownloadPreferenceItemInjectable; +export default kubectlBinaryDownloadPreferenceBlockInjectable; diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-directory-for-binaries/kubectl-directory-for-binaries-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-directory-for-binaries/kubectl-directory-for-binaries-preference-block.injectable.ts similarity index 78% rename from src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-directory-for-binaries/kubectl-directory-for-binaries-preference-item.injectable.ts rename to src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-directory-for-binaries/kubectl-directory-for-binaries-preference-block.injectable.ts index b33d64545f..f820821358 100644 --- a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-directory-for-binaries/kubectl-directory-for-binaries-preference-item.injectable.ts +++ b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-directory-for-binaries/kubectl-directory-for-binaries-preference-block.injectable.ts @@ -6,11 +6,11 @@ import { getInjectable } from "@ogre-tools/injectable"; import { preferenceItemInjectionToken } from "../../../preference-item-injection-token"; import { KubectlDirectoryForBinaries } from "./kubectl-directory-for-binaries"; -const kubectlDirectoryForBinariesPreferenceItemInjectable = getInjectable({ +const kubectlDirectoryForBinariesPreferenceBlockInjectable = getInjectable({ id: "kubectl-directory-for-binaries-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "kubectl-directory-for-binaries", parentId: "kubectl", orderNumber: 30, @@ -20,4 +20,4 @@ const kubectlDirectoryForBinariesPreferenceItemInjectable = getInjectable({ injectionToken: preferenceItemInjectionToken, }); -export default kubectlDirectoryForBinariesPreferenceItemInjectable; +export default kubectlDirectoryForBinariesPreferenceBlockInjectable; diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-download-mirror/kubectl-download-mirror-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-download-mirror/kubectl-download-mirror-preference-block.injectable.ts similarity index 79% rename from src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-download-mirror/kubectl-download-mirror-preference-item.injectable.ts rename to src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-download-mirror/kubectl-download-mirror-preference-block.injectable.ts index 5dde5413be..86776ab330 100644 --- a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-download-mirror/kubectl-download-mirror-preference-item.injectable.ts +++ b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-download-mirror/kubectl-download-mirror-preference-block.injectable.ts @@ -6,11 +6,11 @@ import { getInjectable } from "@ogre-tools/injectable"; import { preferenceItemInjectionToken } from "../../../preference-item-injection-token"; import { KubectlDownloadMirror } from "./kubectl-download-mirror"; -const kubectlDownloadMirrorPreferenceItemInjectable = getInjectable({ +const kubectlDownloadMirrorPreferenceBlockInjectable = getInjectable({ id: "kubectl-download-mirror-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "kubectl-download-mirror", parentId: "kubectl", orderNumber: 20, @@ -20,4 +20,4 @@ const kubectlDownloadMirrorPreferenceItemInjectable = getInjectable({ injectionToken: preferenceItemInjectionToken, }); -export default kubectlDownloadMirrorPreferenceItemInjectable; +export default kubectlDownloadMirrorPreferenceBlockInjectable; 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 3e8c2483c6..41a7c73e8e 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 @@ -20,7 +20,7 @@ const kubectlGroupPreferenceItemInjectable = getInjectable({ id: "kubectl-group-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "kubectl", parentId: "kubernetes-page", orderNumber: 10, diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-path-to-binary/kubectl-path-to-binary-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-path-to-binary/kubectl-path-to-binary-preference-block.injectable.ts similarity index 79% rename from src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-path-to-binary/kubectl-path-to-binary-preference-item.injectable.ts rename to src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-path-to-binary/kubectl-path-to-binary-preference-block.injectable.ts index 8a25e89e3b..a87f8fd749 100644 --- a/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-path-to-binary/kubectl-path-to-binary-preference-item.injectable.ts +++ b/src/features/preferences/renderer/preference-items/kubernetes/kubectl/kubectl-path-to-binary/kubectl-path-to-binary-preference-block.injectable.ts @@ -6,11 +6,11 @@ import { getInjectable } from "@ogre-tools/injectable"; import { preferenceItemInjectionToken } from "../../../preference-item-injection-token"; import { KubectlPathToBinary } from "./kubectl-path-to-binary"; -const kubectlPathToBinaryPreferenceItemInjectable = getInjectable({ +const kubectlPathToBinaryPreferenceBlockInjectable = getInjectable({ id: "kubectl-path-to-binary-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "kubectl-path-to-binary", parentId: "kubectl", orderNumber: 40, @@ -20,4 +20,4 @@ const kubectlPathToBinaryPreferenceItemInjectable = getInjectable({ injectionToken: preferenceItemInjectionToken, }); -export default kubectlPathToBinaryPreferenceItemInjectable; +export default kubectlPathToBinaryPreferenceBlockInjectable; 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 index 1bdcdf358d..44aad314b1 100644 --- a/src/features/preferences/renderer/preference-items/preference-item-injection-token.ts +++ b/src/features/preferences/renderer/preference-items/preference-item-injection-token.ts @@ -40,17 +40,17 @@ export interface PreferencePage { Component: PreferenceItemComponent; } -export interface PreferenceItem { - kind: "item"; +export interface PreferenceBlock { + kind: "block"; id: string; parentId: string; orderNumber: number; isShown?: IComputedValue | boolean; childSeparator?: () => React.ReactElement; - Component: PreferenceItemComponent; + Component: PreferenceItemComponent; } -export type PreferenceTypes = PreferenceTabGroup | PreferenceTab | PreferenceItem | PreferencePage; +export type PreferenceTypes = PreferenceTabGroup | PreferenceTab | PreferenceBlock | PreferencePage; export const preferenceItemInjectionToken = getInjectionToken({ id: "preference-item-injection-token", diff --git a/src/features/preferences/renderer/preference-items/proxy/allow-untrusted-certificates/allow-untrusted-certificates-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/proxy/allow-untrusted-certificates/allow-untrusted-certificates-preference-block.injectable.ts similarity index 78% rename from src/features/preferences/renderer/preference-items/proxy/allow-untrusted-certificates/allow-untrusted-certificates-preference-item.injectable.ts rename to src/features/preferences/renderer/preference-items/proxy/allow-untrusted-certificates/allow-untrusted-certificates-preference-block.injectable.ts index a145bc240d..a423327535 100644 --- a/src/features/preferences/renderer/preference-items/proxy/allow-untrusted-certificates/allow-untrusted-certificates-preference-item.injectable.ts +++ b/src/features/preferences/renderer/preference-items/proxy/allow-untrusted-certificates/allow-untrusted-certificates-preference-block.injectable.ts @@ -6,11 +6,11 @@ import { getInjectable } from "@ogre-tools/injectable"; import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { AllowUntrustedCertificates } from "./allow-untrusted-certificates"; -const allowUntrustedCertificatesPreferenceItemInjectable = getInjectable({ +const allowUntrustedCertificatesPreferenceBlockInjectable = getInjectable({ id: "allow-untrusted-certificates-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "allow-untrusted-certificates", parentId: "proxy-page", orderNumber: 20, @@ -20,4 +20,4 @@ const allowUntrustedCertificatesPreferenceItemInjectable = getInjectable({ injectionToken: preferenceItemInjectionToken, }); -export default allowUntrustedCertificatesPreferenceItemInjectable; +export default allowUntrustedCertificatesPreferenceBlockInjectable; diff --git a/src/features/preferences/renderer/preference-items/proxy/http-proxy-url/http-proxy-url-preference-item.injectable.ts b/src/features/preferences/renderer/preference-items/proxy/http-proxy-url/http-proxy-url-preference-block.injectable.ts similarity index 79% rename from src/features/preferences/renderer/preference-items/proxy/http-proxy-url/http-proxy-url-preference-item.injectable.ts rename to src/features/preferences/renderer/preference-items/proxy/http-proxy-url/http-proxy-url-preference-block.injectable.ts index bb43ceb470..1405c4bf6b 100644 --- a/src/features/preferences/renderer/preference-items/proxy/http-proxy-url/http-proxy-url-preference-item.injectable.ts +++ b/src/features/preferences/renderer/preference-items/proxy/http-proxy-url/http-proxy-url-preference-block.injectable.ts @@ -6,11 +6,11 @@ import { getInjectable } from "@ogre-tools/injectable"; import { preferenceItemInjectionToken } from "../../preference-item-injection-token"; import { HttpProxyUrl } from "./http-proxy-url"; -const httpProxyUrlPreferenceItemInjectable = getInjectable({ +const httpProxyUrlPreferenceBlockInjectable = getInjectable({ id: "http-proxy-url-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "http-proxy-url", parentId: "proxy-page", orderNumber: 10, @@ -20,4 +20,4 @@ const httpProxyUrlPreferenceItemInjectable = getInjectable({ injectionToken: preferenceItemInjectionToken, }); -export default httpProxyUrlPreferenceItemInjectable; +export default httpProxyUrlPreferenceBlockInjectable; 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 c432c43542..fb627ab93c 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 @@ -14,7 +14,7 @@ const automaticErrorReportingPreferenceItemInjectable = getInjectable({ const sentryDnsUrl = di.inject(sentryDataSourceNameInjectable); return { - kind: "item" as const, + kind: "block" as const, id: "automatic-error-reporting", parentId: "telemetry-page", orderNumber: 20, 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 61dcc3dd40..d5783cdd6d 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 @@ -10,7 +10,7 @@ const copyPasteFromTerminalPreferenceItemInjectable = getInjectable({ id: "copy-paste-from-terminal-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "copy-paste-from-terminal-preference-item", parentId: "terminal-page", orderNumber: 20, 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 2bd43d2471..0416afaa74 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 @@ -10,7 +10,7 @@ const terminalFontFamilyPreferenceItemInjectable = getInjectable({ id: "terminal-font-family-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "terminal-font-family-preference-item", parentId: "terminal-page", orderNumber: 50, 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 644151e32e..f2d778575f 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 @@ -10,7 +10,7 @@ const terminalFontSizePreferenceItemInjectable = getInjectable({ id: "terminal-font-size-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "terminal-font-size-preference-item", parentId: "terminal-page", orderNumber: 40, 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 ef0cd88fa7..26c5ae8f3f 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 @@ -10,7 +10,7 @@ const terminalShellPathPreferenceItemInjectable = getInjectable({ id: "terminal-shell-path-preference-item", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "terminal-shell-path", parentId: "terminal-page", orderNumber: 10, 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 d292be0747..dd26ce8c9a 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 @@ -10,7 +10,7 @@ const terminalThemePreferenceItemInjectable = getInjectable({ id: "terminal-theme", instantiate: () => ({ - kind: "item" as const, + kind: "block" as const, id: "terminal-theme", parentId: "terminal-page", orderNumber: 30, diff --git a/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx b/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx index 4d2e549309..cb2bf50af3 100644 --- a/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx +++ b/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx @@ -52,7 +52,7 @@ const toNavigationHierarchy = (composite: Composite( - (composite) => composite.value.kind === "item", + (composite) => composite.value.kind === "block", ); const emptyRender = <>; diff --git a/src/features/preferences/renderer/preferences.tsx b/src/features/preferences/renderer/preferences.tsx index 5fcf6a87e8..61a4933dfd 100644 --- a/src/features/preferences/renderer/preferences.tsx +++ b/src/features/preferences/renderer/preferences.tsx @@ -53,7 +53,7 @@ const toPreferenceItemHierarchy = (composite: Composite) => { const value = composite.value; switch (value.kind) { - case "item": { + case "block": { const Component = value.Component; return ( diff --git a/src/renderer/components/+preferences/extensions.tsx b/src/renderer/components/+preferences/extensions.tsx index 9f396a6507..adc38fbe9b 100644 --- a/src/renderer/components/+preferences/extensions.tsx +++ b/src/renderer/components/+preferences/extensions.tsx @@ -9,7 +9,7 @@ import { observer } from "mobx-react"; import React from "react"; import type { RegisteredAppPreference } from "./app-preferences/app-preference-registration"; import extensionPreferencesModelInjectable from "./extension-preference-model.injectable"; -import { ExtensionPreferenceItem } from "../../../features/preferences/renderer/compliance-for-legacy-extension-api/extension-preference-item"; +import { ExtensionPreferenceBlock } from "../../../features/preferences/renderer/compliance-for-legacy-extension-api/extension-preference-block"; interface Dependencies { model: IComputedValue<{ @@ -36,7 +36,7 @@ const NonInjectedExtensions = ({ model }: Dependencies) => { )} {preferenceItems.map((preferenceItem, index) => ( -