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

Rename type for accuracy

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-10-24 15:14:32 +03:00
parent 5b916be7c0
commit a03a0e9352
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/features/application-menu/main/application-menu-item-composite.injectable.ts
View File

@ -5,6 +5,7 @@
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
import applicationMenuItemsInjectable from "./application-menu-items.injectable"; import applicationMenuItemsInjectable from "./application-menu-items.injectable";
import type { Composite } from "../../../common/utils/composite/get-composite/get-composite"; 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 { computed } from "mobx";
import { pipeline } from "@ogre-tools/fp"; import { pipeline } from "@ogre-tools/fp";
import type { ApplicationMenuItemTypes } from "./menu-items/application-menu-item-injection-token"; 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 { orderByOrderNumber } from "../../../common/utils/composable-responsibilities/orderable/orderable";
import logErrorInjectable from "../../../common/log-error.injectable"; import logErrorInjectable from "../../../common/log-error.injectable";
import { isShown } from "../../../common/utils/composable-responsibilities/showable/showable"; import { isShown } from "../../../common/utils/composable-responsibilities/showable/showable";
import { getCompositeFor } from "../../../common/utils/composite/get-composite/get-composite";
export type MenuItemRoot = Discriminable<"root"> & export type MenuItemRoot = Discriminable<"root"> &
RootComposite<"root"> & RootComposite<"root"> &

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

@ -4,7 +4,7 @@
*/ */
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
import { computed } from "mobx"; 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 type { Composite } from "../../../../common/utils/composite/get-composite/get-composite";
import { filter, map } from "lodash/fp"; import { filter, map } from "lodash/fp";
import { pipeline } from "@ogre-tools/fp"; import { pipeline } from "@ogre-tools/fp";
@ -40,7 +40,7 @@ const currentPreferenceTabCompositeInjectable = getInjectable({
}); });
const isPreferenceTab = ( const isPreferenceTab = (
composite: Composite<PreferenceTypes | PreferenceTabsRoot>, composite: Composite<PreferenceItemTypes | PreferenceTabsRoot>,
): composite is Composite<PreferenceTab> => composite.value.kind === "tab"; ): composite is Composite<PreferenceTab> => composite.value.kind === "tab";
const hasMatchingPathId = const hasMatchingPathId =

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

@ -3,7 +3,7 @@
* Licensed under MIT License. See LICENSE in root directory for more information. * Licensed under MIT License. See LICENSE in root directory for more information.
*/ */
import { getInjectable } from "@ogre-tools/injectable"; 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 { preferenceItemInjectionToken } from "../../preference-item-injection-token";
import Gutter from "../../../../../../renderer/components/gutter/gutter"; import Gutter from "../../../../../../renderer/components/gutter/gutter";
import React from "react"; import React from "react";
@ -13,7 +13,7 @@ const PreferenceItemGroup = ({
item, item,
}: { }: {
children: React.ReactElement; children: React.ReactElement;
item: PreferenceTypes; item: PreferenceItemTypes;
}) => <section id={item.id}>{children}</section>; }) => <section id={item.id}>{children}</section>;
const kubectlGroupPreferenceItemInjectable = getInjectable({ const kubectlGroupPreferenceItemInjectable = getInjectable({

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

@ -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"; import type { Composite } from "../../../../common/utils/composite/get-composite/get-composite";
export type ChildrenAreSeparated = export type ChildrenAreSeparated =
& { childSeparator: GetSeparator<Composite<PreferenceTypes>, React.ReactElement> }; & { childSeparator: GetSeparator<Composite<PreferenceItemTypes>, React.ReactElement> };
export type ChildrenAreMaybeSeparated = export type ChildrenAreMaybeSeparated =
& Partial<ChildrenAreSeparated>; & Partial<ChildrenAreSeparated>;
@ -41,7 +41,7 @@ export type PreferenceTabGroup =
& Orderable & Orderable
& { iconName? : string }; & { iconName? : string };
interface RenderableWithSiblings<T extends PreferenceTypes> interface RenderableWithSiblings<T extends PreferenceItemTypes>
extends ChildrenAreMaybeSeparated { extends ChildrenAreMaybeSeparated {
Component: PreferenceItemComponent<T>; Component: PreferenceItemComponent<T>;
} }
@ -60,9 +60,9 @@ export type PreferenceBlock =
& MaybeShowable & MaybeShowable
& RenderableWithSiblings<PreferenceBlock>; & 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", id: "preference-item-injection-token",
}); });

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

@ -5,7 +5,7 @@
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx"; import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx";
import { computed } from "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 { preferenceItemInjectionToken } from "./preference-item-injection-token";
import { pipeline } from "@ogre-tools/fp"; import { pipeline } from "@ogre-tools/fp";
import type { PreferenceTabsRoot } from "./preference-tab-root"; import type { PreferenceTabsRoot } from "./preference-tab-root";
@ -23,7 +23,7 @@ const preferencesCompositeInjectable = getInjectable({
const preferenceItems = computedInjectMany(preferenceItemInjectionToken); const preferenceItems = computedInjectMany(preferenceItemInjectionToken);
const logError = di.inject(logErrorInjectable); const logError = di.inject(logErrorInjectable);
const getComposite = getCompositeFor<PreferenceTypes | PreferenceTabsRoot>({ const getComposite = getCompositeFor<PreferenceItemTypes | PreferenceTabsRoot>({
getId: (x) => x.id, getId: (x) => x.id,
getParentId: (x) => x.parentId, getParentId: (x) => x.parentId,

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

@ -5,7 +5,7 @@
import { Tabs } from "../../../../renderer/components/tabs"; import { Tabs } from "../../../../renderer/components/tabs";
import React from "react"; import React from "react";
import type { Composite } from "../../../../common/utils/composite/get-composite/get-composite"; 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 { Map } from "../../../../renderer/components/map/map";
import { withInjectables } from "@ogre-tools/injectable-react"; import { withInjectables } from "@ogre-tools/injectable-react";
import type { IComputedValue } from "mobx"; import type { IComputedValue } from "mobx";
@ -18,7 +18,7 @@ import { Icon } from "../../../../renderer/components/icon";
import { checkThatAllDiscriminablesAreExhausted } from "../../../../common/utils/composable-responsibilities/discriminable/discriminable"; import { checkThatAllDiscriminablesAreExhausted } from "../../../../common/utils/composable-responsibilities/discriminable/discriminable";
interface Dependencies { interface Dependencies {
composite: IComputedValue<Composite<PreferenceTypes | PreferenceTabsRoot>>; composite: IComputedValue<Composite<PreferenceItemTypes | PreferenceTabsRoot>>;
} }
const NonInjectedPreferencesNavigation = observer(({ composite }: Dependencies) => ( 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; const value = composite.value;
switch (value.kind) { switch (value.kind) {
@ -80,7 +80,7 @@ const toNavigationHierarchy = (composite: Composite<PreferenceTypes | Preference
return ( return (
<Map <Map
// Note: stricter typing for composite children could maybe remove this curiosity. // 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} getSeparator={value.childSeparator}
> >
{toNavigationHierarchy} {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", (composite) => composite.value.kind === "block",
); );

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

@ -10,7 +10,7 @@ import { withInjectables } from "@ogre-tools/injectable-react";
import closePreferencesInjectable from "./close-preferences/close-preferences.injectable"; import closePreferencesInjectable from "./close-preferences/close-preferences.injectable";
import currentPreferenceTabCompositeInjectable from "./preference-items/current-preference-tab-composite.injectable"; import currentPreferenceTabCompositeInjectable from "./preference-items/current-preference-tab-composite.injectable";
import type { Composite } from "../../../common/utils/composite/get-composite/get-composite"; 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 type { IComputedValue } from "mobx";
import { Map } from "../../../renderer/components/map/map"; import { Map } from "../../../renderer/components/map/map";
import { observer } from "mobx-react"; 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; const value = composite.value;
switch (value.kind) { switch (value.kind) {