hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

chore: Fix build after rebase with master

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2023-06-01 10:50:08 -04:00
parent 544d9e2686
commit 69324ff555
9 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
open-lens/src/main/index.ts
View File

@ -25,12 +25,9 @@ registerMobX(di);
runInAction(() => {
registerLensCore(di, environment);
registerFeature(di,
loggerFeature,
);
registerFeature(
di,
loggerFeature,
applicationFeature,
applicationFeatureForElectronMain,
messagingFeatureForMain,

4
open-lens/src/renderer/index.ts
View File

@ -45,10 +45,6 @@ runInAction(() => {
registerFeature(
di,
loggerFeature,
);
registerFeature(
di,
applicationFeature,
messagingFeatureForRenderer,
keyboardShortcutsFeature,

8
packages/core/package.json
View File

@ -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",

20
packages/core/src/common/front-end-routing/routes/cluster/custom-resources/custom-resource-definitions.injectable.ts
View File

@ -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;

1
packages/core/src/common/front-end-routing/routes/cluster/custom-resources/navigate-to-custom-resources.injectable.ts
View File

@ -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";

2
packages/core/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx
View File

@ -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";

2
packages/core/src/features/status-bar/status-bar-items-originating-from-extensions.test.tsx
View File

@ -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);
});

4
packages/core/src/renderer/components/custom-resource-definitions/groups-sidebar-items-computed.injectable.ts
View File

@ -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)

2
packages/core/src/renderer/components/custom-resource-definitions/selected-groups-url-param.injectable.ts
View File

@ -13,7 +13,7 @@ const selectedCustomResourceDefinitionGroupsUrlParamInjectable = getInjectable({
return createPageParam({
name: "groups",
defaultValue: new Set<string>(),
parse: (value: string[]) => new Set<string>(value),
parse: (value) => new Set<string>(value),
stringify: (value) => Array.from(value),
});
},