From 69324ff555f468cc2089291ed4f72ec8a8b3491f Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Thu, 1 Jun 2023 10:50:08 -0400 Subject: [PATCH] chore: Fix build after rebase with master Signed-off-by: Sebastian Malton --- open-lens/src/main/index.ts | 5 +---- open-lens/src/renderer/index.ts | 4 ---- packages/core/package.json | 8 ++++---- .../custom-resource-definitions.injectable.ts | 20 +++++++------------ ...navigate-to-custom-resources.injectable.ts | 1 + ...debar-and-tab-navigation-for-core.test.tsx | 2 +- ...items-originating-from-extensions.test.tsx | 2 +- ...roups-sidebar-items-computed.injectable.ts | 4 ++-- .../selected-groups-url-param.injectable.ts | 2 +- 9 files changed, 18 insertions(+), 30 deletions(-) diff --git a/open-lens/src/main/index.ts b/open-lens/src/main/index.ts index b0c9ae9514..be4f4afd4e 100644 --- a/open-lens/src/main/index.ts +++ b/open-lens/src/main/index.ts @@ -25,12 +25,9 @@ registerMobX(di); runInAction(() => { registerLensCore(di, environment); - registerFeature(di, - loggerFeature, - ); - registerFeature( di, + loggerFeature, applicationFeature, applicationFeatureForElectronMain, messagingFeatureForMain, diff --git a/open-lens/src/renderer/index.ts b/open-lens/src/renderer/index.ts index 9988d20d9f..08c41c0829 100644 --- a/open-lens/src/renderer/index.ts +++ b/open-lens/src/renderer/index.ts @@ -45,10 +45,6 @@ runInAction(() => { registerFeature( di, loggerFeature, - ); - - registerFeature( - di, applicationFeature, messagingFeatureForRenderer, keyboardShortcutsFeature, diff --git a/packages/core/package.json b/packages/core/package.json index dff011e32a..140abbf5f7 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -20,12 +20,12 @@ "exports": { "./package.json": "./package.json", "./main": { - "default": "./static/build/library/main.js", - "types": "./static/build/main/src/library.d.ts" + "types": "./static/build/main/src/library.d.ts", + "default": "./static/build/library/main.js" }, "./renderer": { - "default": "./static/build/library/renderer.js", - "types": "./static/build/library/src/renderer/library.d.ts" + "types": "./static/build/library/src/renderer/library.d.ts", + "default": "./static/build/library/renderer.js" }, "./styles": "./static/build/library/renderer.css", "./template.html": "./src/renderer/template.html", diff --git a/packages/core/src/common/front-end-routing/routes/cluster/custom-resources/custom-resource-definitions.injectable.ts b/packages/core/src/common/front-end-routing/routes/cluster/custom-resources/custom-resource-definitions.injectable.ts index 74251a6499..8b9a494128 100644 --- a/packages/core/src/common/front-end-routing/routes/cluster/custom-resources/custom-resource-definitions.injectable.ts +++ b/packages/core/src/common/front-end-routing/routes/cluster/custom-resources/custom-resource-definitions.injectable.ts @@ -2,23 +2,17 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getInjectable } from "@ogre-tools/injectable"; import { shouldShowResourceInjectionToken } from "../../../../../features/cluster/showing-kube-resources/common/allowed-resources-injection-token"; -import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token"; +import { getFrontEndRouteInjectable } from "../../../front-end-route-injection-token"; -const customResourceDefinitionsRouteInjectable = getInjectable({ +const customResourceDefinitionsRouteInjectable = getFrontEndRouteInjectable({ id: "custom-resource-definitions-route", - - instantiate: (di) => ({ - path: "/crd/definitions", - clusterFrame: true, - isEnabled: di.inject(shouldShowResourceInjectionToken, { - group: "apiextensions.k8s.io", - apiName: "customresourcedefinitions", - }), + path: "/crd/definitions", + clusterFrame: true, + isEnabled: (di) => di.inject(shouldShowResourceInjectionToken, { + group: "apiextensions.k8s.io", + apiName: "customresourcedefinitions", }), - - injectionToken: frontEndRouteInjectionToken, }); export default customResourceDefinitionsRouteInjectable; diff --git a/packages/core/src/common/front-end-routing/routes/cluster/custom-resources/navigate-to-custom-resources.injectable.ts b/packages/core/src/common/front-end-routing/routes/cluster/custom-resources/navigate-to-custom-resources.injectable.ts index 825bd3caaf..28a293572a 100644 --- a/packages/core/src/common/front-end-routing/routes/cluster/custom-resources/navigate-to-custom-resources.injectable.ts +++ b/packages/core/src/common/front-end-routing/routes/cluster/custom-resources/navigate-to-custom-resources.injectable.ts @@ -3,6 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; +import type { NavigateToSpecificRoute } from "../../../navigate-to-route-injection-token"; import { navigateToRouteInjectionToken } from "../../../navigate-to-route-injection-token"; import customResourcesRouteInjectable from "./custom-resources-route.injectable"; diff --git a/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx b/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx index d05e0aee52..ca35e32a00 100644 --- a/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx +++ b/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx @@ -9,7 +9,7 @@ import type { RenderResult } from "@testing-library/react"; import { fireEvent } from "@testing-library/react"; import { routeSpecificComponentInjectionToken } from "../../renderer/routes/route-specific-component-injection-token"; import { sidebarItemInjectionToken } from "@k8slens/cluster-sidebar"; -import { computed, runInAction } from "mobx"; +import { runInAction } from "mobx"; import { noop } from "lodash/fp"; import routeIsActiveInjectable from "../../renderer/routes/route-is-active.injectable"; import { getFrontEndRouteInjectable } from "../../common/front-end-routing/front-end-route-injection-token"; diff --git a/packages/core/src/features/status-bar/status-bar-items-originating-from-extensions.test.tsx b/packages/core/src/features/status-bar/status-bar-items-originating-from-extensions.test.tsx index fb6ed459bd..117945328b 100644 --- a/packages/core/src/features/status-bar/status-bar-items-originating-from-extensions.test.tsx +++ b/packages/core/src/features/status-bar/status-bar-items-originating-from-extensions.test.tsx @@ -16,7 +16,7 @@ describe("status-bar-items-originating-from-extensions", () => { beforeEach(async () => { builder = getApplicationBuilder(); - await applicationBuilder.beforeWindowStart(({ windowDi }) => { + await builder.beforeWindowStart(({ windowDi }) => { windowDi.unoverride(getRandomIdInjectionToken); windowDi.permitSideEffects(getRandomIdInjectionToken); }); diff --git a/packages/core/src/renderer/components/custom-resource-definitions/groups-sidebar-items-computed.injectable.ts b/packages/core/src/renderer/components/custom-resource-definitions/groups-sidebar-items-computed.injectable.ts index 44f280cf4d..0c73cfee4c 100644 --- a/packages/core/src/renderer/components/custom-resource-definitions/groups-sidebar-items-computed.injectable.ts +++ b/packages/core/src/renderer/components/custom-resource-definitions/groups-sidebar-items-computed.injectable.ts @@ -29,7 +29,7 @@ const customResourceDefinitionGroupsSidebarItemsComputedInjectable = getInjectab const customResourceDefinitions = di.inject(customResourceDefinitionsInjectable); const navigateToCustomResources = di.inject(navigateToCustomResourcesInjectable); const customResourcesRoute = di.inject(customResourcesRouteInjectable); - const pathParameters = di.inject(routePathParametersInjectable, customResourcesRoute); + const pathParameters = di.inject(routePathParametersInjectable)(customResourcesRoute); const toCustomResourceGroupToSidebarItems = ([group, definitions]: [string, CustomResourceDefinition[]], index: number) => { const customResourceGroupSidebarItem = getInjectable({ @@ -78,7 +78,7 @@ const customResourceDefinitionGroupsSidebarItemsComputedInjectable = getInjectab const customResourceDefinitionGroups = ( iter.chain(customResourceDefinitions.get().values()) .map((crd) => [crd.getGroup(), crd] as const) - .toMap() + .groupIntoMap() ); return Array.from(customResourceDefinitionGroups.entries(), toCustomResourceGroupToSidebarItems) diff --git a/packages/core/src/renderer/components/custom-resource-definitions/selected-groups-url-param.injectable.ts b/packages/core/src/renderer/components/custom-resource-definitions/selected-groups-url-param.injectable.ts index 59558f7624..de29e65178 100644 --- a/packages/core/src/renderer/components/custom-resource-definitions/selected-groups-url-param.injectable.ts +++ b/packages/core/src/renderer/components/custom-resource-definitions/selected-groups-url-param.injectable.ts @@ -13,7 +13,7 @@ const selectedCustomResourceDefinitionGroupsUrlParamInjectable = getInjectable({ return createPageParam({ name: "groups", defaultValue: new Set(), - parse: (value: string[]) => new Set(value), + parse: (value) => new Set(value), stringify: (value) => Array.from(value), }); },