diff --git a/src/features/application-menu/main/menu-items/composite/composite-has-descendant/composite-has-descendant.test.ts b/src/common/utils/composite/composite-has-descendant/composite-has-descendant.test.ts similarity index 100% rename from src/features/application-menu/main/menu-items/composite/composite-has-descendant/composite-has-descendant.test.ts rename to src/common/utils/composite/composite-has-descendant/composite-has-descendant.test.ts diff --git a/src/features/application-menu/main/menu-items/composite/composite-has-descendant/composite-has-descendant.ts b/src/common/utils/composite/composite-has-descendant/composite-has-descendant.ts similarity index 100% rename from src/features/application-menu/main/menu-items/composite/composite-has-descendant/composite-has-descendant.ts rename to src/common/utils/composite/composite-has-descendant/composite-has-descendant.ts diff --git a/src/features/application-menu/main/menu-items/composite/find-composite/find-composite.test.ts b/src/common/utils/composite/find-composite/find-composite.test.ts similarity index 100% rename from src/features/application-menu/main/menu-items/composite/find-composite/find-composite.test.ts rename to src/common/utils/composite/find-composite/find-composite.test.ts diff --git a/src/features/application-menu/main/menu-items/composite/find-composite/find-composite.ts b/src/common/utils/composite/find-composite/find-composite.ts similarity index 100% rename from src/features/application-menu/main/menu-items/composite/find-composite/find-composite.ts rename to src/common/utils/composite/find-composite/find-composite.ts diff --git a/src/features/application-menu/main/menu-items/composite/get-composite-normalization/get-composite-normalization.test.ts b/src/common/utils/composite/get-composite-normalization/get-composite-normalization.test.ts similarity index 100% rename from src/features/application-menu/main/menu-items/composite/get-composite-normalization/get-composite-normalization.test.ts rename to src/common/utils/composite/get-composite-normalization/get-composite-normalization.test.ts diff --git a/src/features/application-menu/main/menu-items/composite/get-composite-normalization/get-composite-normalization.ts b/src/common/utils/composite/get-composite-normalization/get-composite-normalization.ts similarity index 100% rename from src/features/application-menu/main/menu-items/composite/get-composite-normalization/get-composite-normalization.ts rename to src/common/utils/composite/get-composite-normalization/get-composite-normalization.ts diff --git a/src/features/application-menu/main/menu-items/composite/get-composite-paths/get-composite-paths.test.ts b/src/common/utils/composite/get-composite-paths/get-composite-paths.test.ts similarity index 100% rename from src/features/application-menu/main/menu-items/composite/get-composite-paths/get-composite-paths.test.ts rename to src/common/utils/composite/get-composite-paths/get-composite-paths.test.ts diff --git a/src/features/application-menu/main/menu-items/composite/get-composite-paths/get-composite-paths.ts b/src/common/utils/composite/get-composite-paths/get-composite-paths.ts similarity index 100% rename from src/features/application-menu/main/menu-items/composite/get-composite-paths/get-composite-paths.ts rename to src/common/utils/composite/get-composite-paths/get-composite-paths.ts diff --git a/src/features/application-menu/main/menu-items/composite/get-composite/get-composite.test.ts b/src/common/utils/composite/get-composite/get-composite.test.ts similarity index 100% rename from src/features/application-menu/main/menu-items/composite/get-composite/get-composite.test.ts rename to src/common/utils/composite/get-composite/get-composite.test.ts diff --git a/src/features/application-menu/main/menu-items/composite/get-composite/get-composite.ts b/src/common/utils/composite/get-composite/get-composite.ts similarity index 100% rename from src/features/application-menu/main/menu-items/composite/get-composite/get-composite.ts rename to src/common/utils/composite/get-composite/get-composite.ts diff --git a/src/features/application-menu/application-menu.test.ts b/src/features/application-menu/application-menu.test.ts index 8a0bd5f3a8..b355ee00c4 100644 --- a/src/features/application-menu/application-menu.test.ts +++ b/src/features/application-menu/application-menu.test.ts @@ -6,7 +6,7 @@ import type { ApplicationBuilder } from "../../renderer/components/test-utils/ge import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import populateApplicationMenuInjectable from "./main/populate-application-menu.injectable"; import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time"; -import { getCompositePaths } from "./main/menu-items/composite/get-composite-paths/get-composite-paths"; +import { getCompositePaths } from "../../common/utils/composite/get-composite-paths/get-composite-paths"; describe("application-menu", () => { let builder: ApplicationBuilder; diff --git a/src/features/application-menu/handling-of-orphan-application-menu-items.test.ts b/src/features/application-menu/handling-of-orphan-application-menu-items.test.ts index 4ec4373e95..6d0228041f 100644 --- a/src/features/application-menu/handling-of-orphan-application-menu-items.test.ts +++ b/src/features/application-menu/handling-of-orphan-application-menu-items.test.ts @@ -6,7 +6,7 @@ import type { ApplicationBuilder } from "../../renderer/components/test-utils/ge import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import populateApplicationMenuInjectable from "./main/populate-application-menu.injectable"; import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time"; -import { getCompositePaths } from "./main/menu-items/composite/get-composite-paths/get-composite-paths"; +import { getCompositePaths } from "../../common/utils/composite/get-composite-paths/get-composite-paths"; import { getInjectable } from "@ogre-tools/injectable"; import applicationMenuItemInjectionToken from "./main/menu-items/application-menu-item-injection-token"; import { runInAction } from "mobx"; 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 429ceaaea4..abf5609cc3 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 @@ -4,8 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import applicationMenuItemsInjectable from "./application-menu-items.injectable"; -import type { Composite } from "./menu-items/composite/get-composite/get-composite"; -import getComposite from "./menu-items/composite/get-composite/get-composite"; +import type { Composite } from "../../../common/utils/composite/get-composite/get-composite"; +import getComposite 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"; diff --git a/src/features/application-menu/main/populate-application-menu.injectable.ts b/src/features/application-menu/main/populate-application-menu.injectable.ts index a6b71e162d..a9ef99ae59 100644 --- a/src/features/application-menu/main/populate-application-menu.injectable.ts +++ b/src/features/application-menu/main/populate-application-menu.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { Menu } from "electron"; import type { MenuItemOpts } from "./application-menu-items.injectable"; -import type { Composite } from "./menu-items/composite/get-composite/get-composite"; +import type { Composite } from "../../../common/utils/composite/get-composite/get-composite"; import type { ApplicationMenuItemTypes } from "./menu-items/application-menu-item-injection-token"; import { pipeline } from "@ogre-tools/fp"; import { map, sortBy } from "lodash/fp"; 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 6ea3ef95d0..4addbdb4f3 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 @@ -5,10 +5,10 @@ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; import type { PreferenceTab, PreferenceTypes } from "./preference-item-injection-token"; -import type { Composite } from "../../../application-menu/main/menu-items/composite/get-composite/get-composite"; +import type { Composite } from "../../../../common/utils/composite/get-composite/get-composite"; import { filter, map } from "lodash/fp"; import { pipeline } from "@ogre-tools/fp"; -import { getCompositeNormalization } from "../../../application-menu/main/menu-items/composite/get-composite-normalization/get-composite-normalization"; +import { getCompositeNormalization } from "../../../../common/utils/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"; 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 732379eafa..5b58e3d84f 100644 --- a/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts +++ b/src/features/preferences/renderer/preference-items/preferences-composite.injectable.ts @@ -7,7 +7,7 @@ import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-f import { computed } from "mobx"; import type { PreferenceTypes } from "./preference-item-injection-token"; import { preferenceItemInjectionToken } from "./preference-item-injection-token"; -import getComposite from "../../../application-menu/main/menu-items/composite/get-composite/get-composite"; +import getComposite from "../../../../common/utils/composite/get-composite/get-composite"; import { filter } from "lodash/fp"; import { pipeline } from "@ogre-tools/fp"; import { preferenceTabsRoot } from "./preference-tab-root"; diff --git a/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx b/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx index 36ed56a671..4d2e549309 100644 --- a/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx +++ b/src/features/preferences/renderer/preference-navigation/preferences-navigation.tsx @@ -4,7 +4,7 @@ */ import { Tabs } from "../../../../renderer/components/tabs"; import React from "react"; -import type { Composite } from "../../../application-menu/main/menu-items/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 { Map } from "../../../../renderer/components/map/map"; import { withInjectables } from "@ogre-tools/injectable-react"; @@ -12,7 +12,7 @@ import type { IComputedValue } from "mobx"; import preferencesCompositeInjectable from "../preference-items/preferences-composite.injectable"; import { observer } from "mobx-react"; import { PreferencesNavigationTab } from "./preferences-navigation-tab"; -import { compositeHasDescendant } from "../../../application-menu/main/menu-items/composite/composite-has-descendant/composite-has-descendant"; +import { compositeHasDescendant } from "../../../../common/utils/composite/composite-has-descendant/composite-has-descendant"; import type { PreferenceTabsRoot } from "../preference-items/preference-tab-root"; import { Icon } from "../../../../renderer/components/icon"; diff --git a/src/features/preferences/renderer/preferences.tsx b/src/features/preferences/renderer/preferences.tsx index a9bb01106e..5fcf6a87e8 100644 --- a/src/features/preferences/renderer/preferences.tsx +++ b/src/features/preferences/renderer/preferences.tsx @@ -9,7 +9,7 @@ import { SettingLayout } from "../../../renderer/components/layout/setting-layou 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 "../../application-menu/main/menu-items/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 { IComputedValue } from "mobx"; import { Map } from "../../../renderer/components/map/map"; diff --git a/src/renderer/components/test-utils/get-application-builder.tsx b/src/renderer/components/test-utils/get-application-builder.tsx index 2de507b332..5ff6523b09 100644 --- a/src/renderer/components/test-utils/get-application-builder.tsx +++ b/src/renderer/components/test-utils/get-application-builder.tsx @@ -65,10 +65,10 @@ import namespaceApiInjectable from "../../../common/k8s-api/endpoints/namespace. 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/composite/get-composite-paths/get-composite-paths"; -import { getCompositeNormalization } from "../../../features/application-menu/main/menu-items/composite/get-composite-normalization/get-composite-normalization"; +import { getCompositePaths } from "../../../common/utils/composite/get-composite-paths/get-composite-paths"; +import { getCompositeNormalization } from "../../../common/utils/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/composite/get-composite/get-composite"; +import type { Composite } from "../../../common/utils/composite/get-composite/get-composite"; import { getSingleElement } from "./discovery-of-html-elements"; type Callback = (di: DiContainer) => void | Promise;