From 0125f31db302f9ad4b7fd3ec52865ec370198669 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Thu, 22 Dec 2022 11:36:43 -0500 Subject: [PATCH] Remove unneeded index file Signed-off-by: Sebastian Malton --- src/extensions/renderer-api/navigation.ts | 2 +- src/features/preferences/closing-preferences.test.tsx | 2 +- src/renderer/components/+cluster/cluster-issues.tsx | 2 +- src/renderer/components/+custom-resources/crd-list.tsx | 2 +- src/renderer/components/input/search-input-url.tsx | 2 +- .../components/item-object-list/page-filters/list.tsx | 2 +- .../components/item-object-list/page-filters/store.ts | 2 +- .../kube-object-list-layout/kube-object-list-layout.tsx | 2 +- src/renderer/components/table/table.tsx | 2 +- src/renderer/navigation/index.ts | 8 -------- .../routes/extension-page-parameters.injectable.ts | 2 +- .../routes/get-extension-page-parameters.injectable.ts | 2 +- src/renderer/routes/page-registration.ts | 2 +- 13 files changed, 12 insertions(+), 20 deletions(-) delete mode 100644 src/renderer/navigation/index.ts diff --git a/src/extensions/renderer-api/navigation.ts b/src/extensions/renderer-api/navigation.ts index b2ea235ecc..ec7081c948 100644 --- a/src/extensions/renderer-api/navigation.ts +++ b/src/extensions/renderer-api/navigation.ts @@ -11,7 +11,7 @@ import isActiveRouteInjectable from "../../renderer/navigation/is-route-active.i import navigateInjectable from "../../renderer/navigation/navigate.injectable"; import { asLegacyGlobalFunctionForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api"; -export type { PageParamInit, PageParam } from "../../renderer/navigation"; +export type { PageParamInit, PageParam } from "../../renderer/navigation/page-param"; export type { URLParams } from "../../common/utils/buildUrl"; export const getDetailsUrl = asLegacyGlobalFunctionForExtensionApi(getDetailsUrlInjectable); diff --git a/src/features/preferences/closing-preferences.test.tsx b/src/features/preferences/closing-preferences.test.tsx index 7f979969aa..7d30400589 100644 --- a/src/features/preferences/closing-preferences.test.tsx +++ b/src/features/preferences/closing-preferences.test.tsx @@ -13,12 +13,12 @@ import { computed, runInAction } from "mobx"; import React from "react"; import { routeSpecificComponentInjectionToken } from "../../renderer/routes/route-specific-component-injection-token"; import observableHistoryInjectable from "../../renderer/navigation/observable-history.injectable"; -import { searchParamsOptions } from "../../renderer/navigation"; import { createMemoryHistory } from "history"; import { createObservableHistory } from "mobx-observable-history"; import navigateToFrontPageInjectable from "../../common/front-end-routing/navigate-to-front-page.injectable"; import { navigateToRouteInjectionToken } from "../../common/front-end-routing/navigate-to-route-injection-token"; import { preferenceItemInjectionToken } from "./renderer/preference-items/preference-item-injection-token"; +import { searchParamsOptions } from "../../renderer/navigation/search-params"; describe("preferences - closing-preferences", () => { let builder: ApplicationBuilder; diff --git a/src/renderer/components/+cluster/cluster-issues.tsx b/src/renderer/components/+cluster/cluster-issues.tsx index a574874d61..829d7c5c54 100644 --- a/src/renderer/components/+cluster/cluster-issues.tsx +++ b/src/renderer/components/+cluster/cluster-issues.tsx @@ -23,7 +23,7 @@ import type { EventStore } from "../+events/store"; import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.injectable"; import eventStoreInjectable from "../+events/store.injectable"; import nodeStoreInjectable from "../+nodes/store.injectable"; -import type { PageParam } from "../../navigation"; +import type { PageParam } from "../../navigation/page-param"; import type { ToggleKubeDetailsPane } from "../kube-detail-params/toggle-details.injectable"; import kubeSelectedUrlParamInjectable from "../kube-detail-params/kube-selected-url.injectable"; import toggleKubeDetailsPaneInjectable from "../kube-detail-params/toggle-details.injectable"; diff --git a/src/renderer/components/+custom-resources/crd-list.tsx b/src/renderer/components/+custom-resources/crd-list.tsx index a4c10e820d..bc88628fcd 100644 --- a/src/renderer/components/+custom-resources/crd-list.tsx +++ b/src/renderer/components/+custom-resources/crd-list.tsx @@ -16,7 +16,7 @@ import { Select } from "../select"; import { Icon } from "../icon"; import { KubeObjectAge } from "../kube-object/age"; import { TabLayout } from "../layout/tab-layout-2"; -import type { PageParam } from "../../navigation"; +import type { PageParam } from "../../navigation/page-param"; import type { CustomResourceDefinitionStore } from "./definition.store"; import { withInjectables } from "@ogre-tools/injectable-react"; import crdGroupsUrlParamInjectable from "./crd-groups-url-param.injectable"; diff --git a/src/renderer/components/input/search-input-url.tsx b/src/renderer/components/input/search-input-url.tsx index 101a343bbf..52df92aeaa 100644 --- a/src/renderer/components/input/search-input-url.tsx +++ b/src/renderer/components/input/search-input-url.tsx @@ -9,7 +9,7 @@ import { autorun, observable, makeObservable } from "mobx"; import { disposeOnUnmount, observer } from "mobx-react"; import type { InputProps } from "./input"; import { SearchInput } from "./search-input"; -import type { PageParam } from "../../navigation"; +import type { PageParam } from "../../navigation/page-param"; import { withInjectables } from "@ogre-tools/injectable-react"; import searchUrlPageParamInjectable from "./search-url-page-param.injectable"; diff --git a/src/renderer/components/item-object-list/page-filters/list.tsx b/src/renderer/components/item-object-list/page-filters/list.tsx index 357e43e714..58c4463b65 100644 --- a/src/renderer/components/item-object-list/page-filters/list.tsx +++ b/src/renderer/components/item-object-list/page-filters/list.tsx @@ -11,7 +11,7 @@ import { cssNames } from "../../../utils"; import type { Filter, PageFiltersStore } from "./store"; import { FilterIcon } from "../filter-icon"; import { Icon } from "../../icon"; -import type { PageParam } from "../../../navigation"; +import type { PageParam } from "../../../navigation/page-param"; import { withInjectables } from "@ogre-tools/injectable-react"; import pageFiltersStoreInjectable from "./store.injectable"; import searchUrlPageParamInjectable from "../../input/search-url-page-param.injectable"; diff --git a/src/renderer/components/item-object-list/page-filters/store.ts b/src/renderer/components/item-object-list/page-filters/store.ts index a4a8247582..d9a088f539 100644 --- a/src/renderer/components/item-object-list/page-filters/store.ts +++ b/src/renderer/components/item-object-list/page-filters/store.ts @@ -4,7 +4,7 @@ */ import { computed, observable, reaction, makeObservable, action } from "mobx"; -import type { PageParam } from "../../../navigation"; +import type { PageParam } from "../../../navigation/page-param"; import { autoBind } from "../../../utils"; export enum FilterType { diff --git a/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx b/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx index bd4fa3d81d..463bb8dd35 100644 --- a/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx +++ b/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx @@ -24,7 +24,7 @@ import clusterFrameContextForNamespacedResourcesInjectable from "../../cluster-f import type { SubscribableStore, SubscribeStores } from "../../kube-watch-api/kube-watch-api"; import type { KubeApi } from "../../../common/k8s-api/kube-api"; import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable"; -import type { PageParam } from "../../navigation"; +import type { PageParam } from "../../navigation/page-param"; import type { ToggleKubeDetailsPane } from "../kube-detail-params/toggle-details.injectable"; import kubeSelectedUrlParamInjectable from "../kube-detail-params/kube-selected-url.injectable"; import toggleKubeDetailsPaneInjectable from "../kube-detail-params/toggle-details.injectable"; diff --git a/src/renderer/components/table/table.tsx b/src/renderer/components/table/table.tsx index 201abd47c3..b35aae742c 100644 --- a/src/renderer/components/table/table.tsx +++ b/src/renderer/components/table/table.tsx @@ -14,7 +14,7 @@ import type { TableHeadElem } from "./table-head"; import { TableHead } from "./table-head"; import type { TableCellElem } from "./table-cell"; import { VirtualList } from "../virtual-list"; -import type { PageParam } from "../../navigation"; +import type { PageParam } from "../../navigation/page-param"; import { computed, makeObservable } from "mobx"; import { getSorted } from "./sorting"; import type { TableModel } from "./table-model/table-model"; diff --git a/src/renderer/navigation/index.ts b/src/renderer/navigation/index.ts deleted file mode 100644 index 86ca160a30..0000000000 --- a/src/renderer/navigation/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -export { searchParamsOptions } from "./search-params"; - -export * from "./page-param"; diff --git a/src/renderer/routes/extension-page-parameters.injectable.ts b/src/renderer/routes/extension-page-parameters.injectable.ts index 2c9fdb986b..ad6501cd35 100644 --- a/src/renderer/routes/extension-page-parameters.injectable.ts +++ b/src/renderer/routes/extension-page-parameters.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; import { pipeline } from "@ogre-tools/fp"; -import type { PageParamInit } from "../navigation"; +import type { PageParamInit } from "../navigation/page-param"; import type { LensRendererExtension } from "../../extensions/lens-renderer-extension"; import { map } from "lodash/fp"; import createPageParamInjectable from "../navigation/create-page-param.injectable"; diff --git a/src/renderer/routes/get-extension-page-parameters.injectable.ts b/src/renderer/routes/get-extension-page-parameters.injectable.ts index fec71c0095..f09da7cf15 100644 --- a/src/renderer/routes/get-extension-page-parameters.injectable.ts +++ b/src/renderer/routes/get-extension-page-parameters.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import type { PageParam } from "../navigation"; +import type { PageParam } from "../navigation/page-param"; import type { ExtensionPageParametersInstantiationParam } from "./extension-page-parameters.injectable"; import extensionPageParametersInjectable from "./extension-page-parameters.injectable"; diff --git a/src/renderer/routes/page-registration.ts b/src/renderer/routes/page-registration.ts index 4f9d60ecfe..3a8c2ee08a 100644 --- a/src/renderer/routes/page-registration.ts +++ b/src/renderer/routes/page-registration.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import type { IComputedValue } from "mobx"; -import type { PageParamInit, PageParam } from "../navigation"; +import type { PageParamInit, PageParam } from "../navigation/page-param"; // Extensions-api -> Custom page registration