From a03a0e9352e1c3f999b767be37bdd477cdec3ac4 Mon Sep 17 00:00:00 2001
From: Iku-turso <mikko.aspiala@gmail.com>
Date: Mon, 24 Oct 2022 15:14:32 +0300
Subject: [PATCH] Rename type for accuracy

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

Signed-off-by: Iku-turso <mikko.aspiala@gmail.com>
---
 .../main/application-menu-item-composite.injectable.ts |  2 +-
 .../current-preference-tab-composite.injectable.ts     |  4 ++--
 .../kubectl-group-preference-item.injectable.tsx       |  4 ++--
 .../preference-item-injection-token.ts                 |  8 ++++----
 .../preferences-composite.injectable.ts                |  4 ++--
 .../preference-navigation/preferences-navigation.tsx   | 10 +++++-----
 src/features/preferences/renderer/preferences.tsx      |  4 ++--
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/features/application-menu/main/application-menu-item-composite.injectable.ts b/src/features/application-menu/main/application-menu-item-composite.injectable.ts
index 8941500dbe..5068207478 100644
--- a/src/features/application-menu/main/application-menu-item-composite.injectable.ts
+++ b/src/features/application-menu/main/application-menu-item-composite.injectable.ts
@@ -5,6 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import applicationMenuItemsInjectable from "./application-menu-items.injectable";
 import type { Composite } from "../../../common/utils/composite/get-composite/get-composite";
+import { getCompositeFor } from "../../../common/utils/composite/get-composite/get-composite";
 import { computed } from "mobx";
 import { pipeline } from "@ogre-tools/fp";
 import type { ApplicationMenuItemTypes } from "./menu-items/application-menu-item-injection-token";
@@ -14,7 +15,6 @@ import type { Orderable } from "../../../common/utils/composable-responsibilitie
 import { orderByOrderNumber } from "../../../common/utils/composable-responsibilities/orderable/orderable";
 import logErrorInjectable from "../../../common/log-error.injectable";
 import { isShown } from "../../../common/utils/composable-responsibilities/showable/showable";
-import { getCompositeFor } from "../../../common/utils/composite/get-composite/get-composite";
 
 export type MenuItemRoot = Discriminable<"root"> &
   RootComposite<"root"> &
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 4addbdb4f3..5930aaa7e4 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,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import type { PreferenceTab, PreferenceTypes } from "./preference-item-injection-token";
+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";
@@ -40,7 +40,7 @@ const currentPreferenceTabCompositeInjectable = getInjectable({
 });
 
 const isPreferenceTab = (
-  composite: Composite<PreferenceTypes | PreferenceTabsRoot>,
+  composite: Composite<PreferenceItemTypes | PreferenceTabsRoot>,
 ): composite is Composite<PreferenceTab> => composite.value.kind === "tab";
 
 const hasMatchingPathId =
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 41a7c73e8e..190ce03eeb 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,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import type { PreferenceTypes } from "../../preference-item-injection-token";
+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";
@@ -13,7 +13,7 @@ const PreferenceItemGroup = ({
   item,
 }: {
   children: React.ReactElement;
-  item: PreferenceTypes;
+  item: PreferenceItemTypes;
 }) => <section id={item.id}>{children}</section>;
 
 const kubectlGroupPreferenceItemInjectable = getInjectable({
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 897bad90f8..38eb14aad8 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
@@ -13,7 +13,7 @@ import type { GetSeparator } from "../../../../common/utils/add-separator/add-se
 import type { Composite } from "../../../../common/utils/composite/get-composite/get-composite";
 
 export type ChildrenAreSeparated =
-  & { childSeparator: GetSeparator<Composite<PreferenceTypes>, React.ReactElement> };
+  & { childSeparator: GetSeparator<Composite<PreferenceItemTypes>, React.ReactElement> };
 
 export type ChildrenAreMaybeSeparated =
   & Partial<ChildrenAreSeparated>;
@@ -41,7 +41,7 @@ export type PreferenceTabGroup =
   & Orderable
   & { iconName? : string };
 
-interface RenderableWithSiblings<T extends PreferenceTypes>
+interface RenderableWithSiblings<T extends PreferenceItemTypes>
   extends ChildrenAreMaybeSeparated {
   Component: PreferenceItemComponent<T>;
 }
@@ -60,9 +60,9 @@ export type PreferenceBlock =
   & MaybeShowable
   & RenderableWithSiblings<PreferenceBlock>;
 
-export type PreferenceTypes = PreferenceTabGroup | PreferenceTab | PreferenceBlock | PreferencePage;
+export type PreferenceItemTypes = PreferenceTabGroup | PreferenceTab | PreferenceBlock | PreferencePage;
 
-export const preferenceItemInjectionToken = getInjectionToken<PreferenceTypes>({
+export const preferenceItemInjectionToken = getInjectionToken<PreferenceItemTypes>({
   id: "preference-item-injection-token",
 });
 
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 058fd7b980..45f64d6233 100644
--- a/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts
+++ b/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts
@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx";
 import { computed } from "mobx";
-import type { PreferenceTypes } from "./preference-item-injection-token";
+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";
@@ -23,7 +23,7 @@ const preferencesCompositeInjectable = getInjectable({
     const preferenceItems = computedInjectMany(preferenceItemInjectionToken);
     const logError = di.inject(logErrorInjectable);
 
-    const getComposite = getCompositeFor<PreferenceTypes | PreferenceTabsRoot>({
+    const getComposite = getCompositeFor<PreferenceItemTypes | PreferenceTabsRoot>({
       getId: (x) => x.id,
       getParentId: (x) => x.parentId,
 
diff --git a/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx b/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx
index 82d49e2e47..8a20ea0233 100644
--- a/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx
+++ b/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx
@@ -5,7 +5,7 @@
 import { Tabs } from "../../../../renderer/components/tabs";
 import React from "react";
 import type { Composite } from "../../../../common/utils/composite/get-composite/get-composite";
-import type { PreferenceTypes } from "../preference-items/preference-item-injection-token";
+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";
@@ -18,7 +18,7 @@ import { Icon } from "../../../../renderer/components/icon";
 import { checkThatAllDiscriminablesAreExhausted } from "../../../../common/utils/composable-responsibilities/discriminable/discriminable";
 
 interface Dependencies {
-  composite: IComputedValue<Composite<PreferenceTypes | PreferenceTabsRoot>>;
+  composite: IComputedValue<Composite<PreferenceItemTypes | PreferenceTabsRoot>>;
 }
 
 const NonInjectedPreferencesNavigation = observer(({ composite }: Dependencies) => (
@@ -37,7 +37,7 @@ export const PreferencesNavigation = withInjectables<Dependencies>(
   },
 );
 
-const toNavigationHierarchy = (composite: Composite<PreferenceTypes | PreferenceTabsRoot>) => {
+const toNavigationHierarchy = (composite: Composite<PreferenceItemTypes | PreferenceTabsRoot>) => {
   const value = composite.value;
 
   switch (value.kind) {
@@ -80,7 +80,7 @@ const toNavigationHierarchy = (composite: Composite<PreferenceTypes | Preference
       return (
         <Map
           // Note: stricter typing for composite children could maybe remove this curiosity.
-          items={composite.children.filter(hasContent) as Composite<PreferenceTypes>[]}
+          items={composite.children.filter(hasContent) as Composite<PreferenceItemTypes>[]}
           getSeparator={value.childSeparator}
         >
           {toNavigationHierarchy}
@@ -94,7 +94,7 @@ const toNavigationHierarchy = (composite: Composite<PreferenceTypes | Preference
   }
 };
 
-const hasContent = compositeHasDescendant<PreferenceTypes | PreferenceTabsRoot>(
+const hasContent = compositeHasDescendant<PreferenceItemTypes | PreferenceTabsRoot>(
   (composite) => composite.value.kind === "block",
 );
 
diff --git a/src/features/preferences/renderer/preferences.tsx b/src/features/preferences/renderer/preferences.tsx
index bd34209003..7a53b9d221 100644
--- a/src/features/preferences/renderer/preferences.tsx
+++ b/src/features/preferences/renderer/preferences.tsx
@@ -10,7 +10,7 @@ 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 { PreferenceTypes, PreferenceTab } from "./preference-items/preference-item-injection-token";
+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";
@@ -50,7 +50,7 @@ const NonInjectedPreferences = observer(
   },
 );
 
-const toPreferenceItemHierarchy = (composite: Composite<PreferenceTypes>) => {
+const toPreferenceItemHierarchy = (composite: Composite<PreferenceItemTypes>) => {
   const value = composite.value;
 
   switch (value.kind) {