From c96f562c69218733608107dfb6c41eb28c85850c Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Wed, 19 Oct 2022 13:57:19 +0300 Subject: [PATCH] Consolidate name of function Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen --- .../get-composite/find-composite/find-composite.ts | 4 ++-- .../get-composite-normalization.test.ts} | 6 +++--- .../get-composite-normalization.ts} | 2 +- .../get-composite-paths/get-composite-paths.ts | 4 ++-- .../current-preference-tab-composite.injectable.ts | 4 ++-- .../components/test-utils/get-application-builder.tsx | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) rename src/features/application-menu/main/menu-items/get-composite/{normalize-composite/normalize-composite.test.ts => get-composite-normalization/get-composite-normalization.test.ts} (84%) rename src/features/application-menu/main/menu-items/get-composite/{normalize-composite/normalize-composite.ts => get-composite-normalization/get-composite-normalization.ts} (90%) diff --git a/src/features/application-menu/main/menu-items/get-composite/find-composite/find-composite.ts b/src/features/application-menu/main/menu-items/get-composite/find-composite/find-composite.ts index 048e7e6eb0..fbae187cc8 100644 --- a/src/features/application-menu/main/menu-items/get-composite/find-composite/find-composite.ts +++ b/src/features/application-menu/main/menu-items/get-composite/find-composite/find-composite.ts @@ -3,9 +3,9 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ 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 = (path: string) => (composite: Composite): Composite | undefined => - new Map(normalizeComposite(composite)).get(path); + new Map(getCompositeNormalization(composite)).get(path); diff --git a/src/features/application-menu/main/menu-items/get-composite/normalize-composite/normalize-composite.test.ts b/src/features/application-menu/main/menu-items/get-composite/get-composite-normalization/get-composite-normalization.test.ts similarity index 84% rename from src/features/application-menu/main/menu-items/get-composite/normalize-composite/normalize-composite.test.ts rename to src/features/application-menu/main/menu-items/get-composite/get-composite-normalization/get-composite-normalization.test.ts index a3b137b262..ccea34e963 100644 --- a/src/features/application-menu/main/menu-items/get-composite/normalize-composite/normalize-composite.test.ts +++ b/src/features/application-menu/main/menu-items/get-composite/get-composite-normalization/get-composite-normalization.test.ts @@ -2,10 +2,10 @@ * Copyright (c) OpenLens Authors. All rights reserved. * 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"; -describe("normalize-composite", () => { +describe("get-composite-normalization", () => { it("given a composite, flattens it to path and composite", () => { const someRootItem = { id: "some-root-id", @@ -28,7 +28,7 @@ describe("normalize-composite", () => { source: items, }); - const actual = normalizeComposite(composite); + const actual = getCompositeNormalization(composite); expect(actual).toEqual([ ["some-root-id", expect.objectContaining({ value: someRootItem })], diff --git a/src/features/application-menu/main/menu-items/get-composite/normalize-composite/normalize-composite.ts b/src/features/application-menu/main/menu-items/get-composite/get-composite-normalization/get-composite-normalization.ts similarity index 90% rename from src/features/application-menu/main/menu-items/get-composite/normalize-composite/normalize-composite.ts rename to src/features/application-menu/main/menu-items/get-composite/get-composite-normalization/get-composite-normalization.ts index 08411bad55..8920adf5fc 100644 --- a/src/features/application-menu/main/menu-items/get-composite/normalize-composite/normalize-composite.ts +++ b/src/features/application-menu/main/menu-items/get-composite/get-composite-normalization/get-composite-normalization.ts @@ -4,7 +4,7 @@ */ import type { Composite } from "../get-composite"; -export const normalizeComposite = (composite: Composite) => { +export const getCompositeNormalization = (composite: Composite) => { const _normalizeComposite = ( composite: Composite, previousPath: string[] = [], diff --git a/src/features/application-menu/main/menu-items/get-composite/get-composite-paths/get-composite-paths.ts b/src/features/application-menu/main/menu-items/get-composite/get-composite-paths/get-composite-paths.ts index 46abf49f46..814263943a 100644 --- a/src/features/application-menu/main/menu-items/get-composite/get-composite-paths/get-composite-paths.ts +++ b/src/features/application-menu/main/menu-items/get-composite/get-composite-paths/get-composite-paths.ts @@ -5,8 +5,8 @@ import { pipeline } from "@ogre-tools/fp"; import { map } from "lodash/fp"; 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 = ( composite: Composite, -): string[] => pipeline(composite, normalizeComposite, map(([path]) => path)); +): string[] => pipeline(composite, getCompositeNormalization, map(([path]) => path)); 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 3464bff636..9d0b217d0c 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 @@ -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 { filter, map } from "lodash/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 type { PreferenceTabsRoot } from "./preference-tab-root"; import currentPreferenceTabIdInjectable from "./current-preference-tab-id.injectable"; @@ -24,7 +24,7 @@ const currentPreferenceTabCompositeInjectable = getInjectable({ const tabId = currentTabId.get(); const tabComposites = pipeline( - normalizeComposite(preferencesComposite.get()), + getCompositeNormalization(preferencesComposite.get()), map(([, composite]) => composite), filter(isPreferenceTab), filter(hasMatchingPathId(tabId)), diff --git a/src/renderer/components/test-utils/get-application-builder.tsx b/src/renderer/components/test-utils/get-application-builder.tsx index f4d06dfe9d..3fcc4ca229 100644 --- a/src/renderer/components/test-utils/get-application-builder.tsx +++ b/src/renderer/components/test-utils/get-application-builder.tsx @@ -66,7 +66,7 @@ import { Namespace } from "../../../common/k8s-api/endpoints"; import { overrideFsWithFakes } from "../../../test-utils/override-fs-with-fakes"; 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 { 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 { Composite } from "../../../features/application-menu/main/menu-items/get-composite/get-composite"; import { getSingleElement } from "./discovery-of-html-elements"; @@ -359,7 +359,7 @@ export const getApplicationBuilder = () => { applicationMenuItemCompositeInjectable, ).get(); - const clickableMenuItems = normalizeComposite(composite).filter(isClickableMenuItem); + const clickableMenuItems = getCompositeNormalization(composite).filter(isClickableMenuItem); const clickableMenuItemMap = new Map(clickableMenuItems); // TODO: find out why this any!? The typing of above map is strict, so why map.get() isn't? const clickableMenuItem = clickableMenuItemMap.get(path);