mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Consolidate name of function
Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
This commit is contained in:
parent
638ea2e12e
commit
c96f562c69
@ -3,9 +3,9 @@
|
|||||||
* 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 type { Composite } from "../get-composite";
|
import type { Composite } from "../get-composite";
|
||||||
import { normalizeComposite } from "../normalize-composite/normalize-composite";
|
import { getCompositeNormalization } from "../get-composite-normalization/get-composite-normalization";
|
||||||
|
|
||||||
export const findComposite =
|
export const findComposite =
|
||||||
(path: string) =>
|
(path: string) =>
|
||||||
<T>(composite: Composite<T>): Composite<T> | undefined =>
|
<T>(composite: Composite<T>): Composite<T> | undefined =>
|
||||||
new Map(normalizeComposite(composite)).get(path);
|
new Map(getCompositeNormalization(composite)).get(path);
|
||||||
|
|||||||
@ -2,10 +2,10 @@
|
|||||||
* Copyright (c) OpenLens Authors. All rights reserved.
|
* Copyright (c) OpenLens Authors. All rights reserved.
|
||||||
* 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 { normalizeComposite } from "./normalize-composite";
|
import { getCompositeNormalization } from "./get-composite-normalization";
|
||||||
import getComposite from "../get-composite";
|
import getComposite from "../get-composite";
|
||||||
|
|
||||||
describe("normalize-composite", () => {
|
describe("get-composite-normalization", () => {
|
||||||
it("given a composite, flattens it to path and composite", () => {
|
it("given a composite, flattens it to path and composite", () => {
|
||||||
const someRootItem = {
|
const someRootItem = {
|
||||||
id: "some-root-id",
|
id: "some-root-id",
|
||||||
@ -28,7 +28,7 @@ describe("normalize-composite", () => {
|
|||||||
source: items,
|
source: items,
|
||||||
});
|
});
|
||||||
|
|
||||||
const actual = normalizeComposite(composite);
|
const actual = getCompositeNormalization(composite);
|
||||||
|
|
||||||
expect(actual).toEqual([
|
expect(actual).toEqual([
|
||||||
["some-root-id", expect.objectContaining({ value: someRootItem })],
|
["some-root-id", expect.objectContaining({ value: someRootItem })],
|
||||||
@ -4,7 +4,7 @@
|
|||||||
*/
|
*/
|
||||||
import type { Composite } from "../get-composite";
|
import type { Composite } from "../get-composite";
|
||||||
|
|
||||||
export const normalizeComposite = <T>(composite: Composite<T>) => {
|
export const getCompositeNormalization = <T>(composite: Composite<T>) => {
|
||||||
const _normalizeComposite = <T>(
|
const _normalizeComposite = <T>(
|
||||||
composite: Composite<T>,
|
composite: Composite<T>,
|
||||||
previousPath: string[] = [],
|
previousPath: string[] = [],
|
||||||
@ -5,8 +5,8 @@
|
|||||||
import { pipeline } from "@ogre-tools/fp";
|
import { pipeline } from "@ogre-tools/fp";
|
||||||
import { map } from "lodash/fp";
|
import { map } from "lodash/fp";
|
||||||
import type { Composite } from "../get-composite";
|
import type { Composite } from "../get-composite";
|
||||||
import { normalizeComposite } from "../normalize-composite/normalize-composite";
|
import { getCompositeNormalization } from "../get-composite-normalization/get-composite-normalization";
|
||||||
|
|
||||||
export const getCompositePaths = (
|
export const getCompositePaths = (
|
||||||
composite: Composite<unknown>,
|
composite: Composite<unknown>,
|
||||||
): string[] => pipeline(composite, normalizeComposite, map(([path]) => path));
|
): string[] => pipeline(composite, getCompositeNormalization, map(([path]) => path));
|
||||||
|
|||||||
@ -8,7 +8,7 @@ import type { PreferenceTab, PreferenceTypes } from "./preference-item-injection
|
|||||||
import type { Composite } from "../../../application-menu/main/menu-items/get-composite/get-composite";
|
import type { Composite } from "../../../application-menu/main/menu-items/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";
|
||||||
import { normalizeComposite } from "../../../application-menu/main/menu-items/get-composite/normalize-composite/normalize-composite";
|
import { getCompositeNormalization } from "../../../application-menu/main/menu-items/get-composite/get-composite-normalization/get-composite-normalization";
|
||||||
import preferencesCompositeInjectable from "./preferences-composite.injectable";
|
import preferencesCompositeInjectable from "./preferences-composite.injectable";
|
||||||
import type { PreferenceTabsRoot } from "./preference-tab-root";
|
import type { PreferenceTabsRoot } from "./preference-tab-root";
|
||||||
import currentPreferenceTabIdInjectable from "./current-preference-tab-id.injectable";
|
import currentPreferenceTabIdInjectable from "./current-preference-tab-id.injectable";
|
||||||
@ -24,7 +24,7 @@ const currentPreferenceTabCompositeInjectable = getInjectable({
|
|||||||
const tabId = currentTabId.get();
|
const tabId = currentTabId.get();
|
||||||
|
|
||||||
const tabComposites = pipeline(
|
const tabComposites = pipeline(
|
||||||
normalizeComposite(preferencesComposite.get()),
|
getCompositeNormalization(preferencesComposite.get()),
|
||||||
map(([, composite]) => composite),
|
map(([, composite]) => composite),
|
||||||
filter(isPreferenceTab),
|
filter(isPreferenceTab),
|
||||||
filter(hasMatchingPathId(tabId)),
|
filter(hasMatchingPathId(tabId)),
|
||||||
|
|||||||
@ -66,7 +66,7 @@ import { Namespace } from "../../../common/k8s-api/endpoints";
|
|||||||
import { overrideFsWithFakes } from "../../../test-utils/override-fs-with-fakes";
|
import { overrideFsWithFakes } from "../../../test-utils/override-fs-with-fakes";
|
||||||
import applicationMenuItemCompositeInjectable from "../../../features/application-menu/main/application-menu-item-composite.injectable";
|
import applicationMenuItemCompositeInjectable from "../../../features/application-menu/main/application-menu-item-composite.injectable";
|
||||||
import { getCompositePaths } from "../../../features/application-menu/main/menu-items/get-composite/get-composite-paths/get-composite-paths";
|
import { getCompositePaths } from "../../../features/application-menu/main/menu-items/get-composite/get-composite-paths/get-composite-paths";
|
||||||
import { normalizeComposite } from "../../../features/application-menu/main/menu-items/get-composite/normalize-composite/normalize-composite";
|
import { getCompositeNormalization } from "../../../features/application-menu/main/menu-items/get-composite/get-composite-normalization/get-composite-normalization";
|
||||||
import type { ClickableMenuItem } from "../../../features/application-menu/main/menu-items/application-menu-item-injection-token";
|
import type { ClickableMenuItem } from "../../../features/application-menu/main/menu-items/application-menu-item-injection-token";
|
||||||
import type { Composite } from "../../../features/application-menu/main/menu-items/get-composite/get-composite";
|
import type { Composite } from "../../../features/application-menu/main/menu-items/get-composite/get-composite";
|
||||||
import { getSingleElement } from "./discovery-of-html-elements";
|
import { getSingleElement } from "./discovery-of-html-elements";
|
||||||
@ -359,7 +359,7 @@ export const getApplicationBuilder = () => {
|
|||||||
applicationMenuItemCompositeInjectable,
|
applicationMenuItemCompositeInjectable,
|
||||||
).get();
|
).get();
|
||||||
|
|
||||||
const clickableMenuItems = normalizeComposite(composite).filter(isClickableMenuItem);
|
const clickableMenuItems = getCompositeNormalization(composite).filter(isClickableMenuItem);
|
||||||
const clickableMenuItemMap = new Map(clickableMenuItems);
|
const clickableMenuItemMap = new Map(clickableMenuItems);
|
||||||
// TODO: find out why this any!? The typing of above map is strict, so why map.get() isn't?
|
// TODO: find out why this any!? The typing of above map is strict, so why map.get() isn't?
|
||||||
const clickableMenuItem = clickableMenuItemMap.get(path);
|
const clickableMenuItem = clickableMenuItemMap.get(path);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user