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: Extract an injectionToken

Browse Source 
Signed-off-by: Iku-turso <mikko.aspiala@gmail.com>
This commit is contained in:
Iku-turso 2023-04-25 15:52:35 +03:00 committed by Sebastian Malton
parent 0dae1594ba
commit db9a3675e1
7 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/src/renderer/components/drawer/drawer.tsx
View File

@ -16,7 +16,7 @@ import { Animate } from "../animate";
import { ResizeDirection, ResizeGrowthDirection, ResizeSide, ResizingAnchor } from "../resizing-anchor"; import { ResizeDirection, ResizeGrowthDirection, ResizeSide, ResizingAnchor } from "../resizing-anchor";
import drawerStorageInjectable, { defaultDrawerWidth } from "./drawer-storage/drawer-storage.injectable"; import drawerStorageInjectable, { defaultDrawerWidth } from "./drawer-storage/drawer-storage.injectable";
import { withInjectables } from "@ogre-tools/injectable-react"; import { withInjectables } from "@ogre-tools/injectable-react";
import { historyInjectable } from "@k8slens/routing"; import { historyInjectionToken } from "@k8slens/routing";
import type { History } from "history"; import type { History } from "history";
import type { StorageLayer } from "../../utils/storage-helper"; import type { StorageLayer } from "../../utils/storage-helper";
@ -251,7 +251,7 @@ class NonInjectedDrawer extends React.Component<DrawerProps & Dependencies & typ
export const Drawer = withInjectables<Dependencies, DrawerProps>(NonInjectedDrawer as React.ElementType<DrawerProps & Dependencies>, { export const Drawer = withInjectables<Dependencies, DrawerProps>(NonInjectedDrawer as React.ElementType<DrawerProps & Dependencies>, {
getProps: (di, props) => ({ getProps: (di, props) => ({
...props, ...props,
history: di.inject(historyInjectable), history: di.inject(historyInjectionToken),
drawerStorage: di.inject(drawerStorageInjectable), drawerStorage: di.inject(drawerStorageInjectable),
}), }),
}); });

4
packages/core/src/renderer/components/test-utils/get-application-builder.tsx
View File

@ -24,7 +24,6 @@ import navigateToHelmChartsInjectable from "../../../common/front-end-routing/ro
import hostedClusterInjectable from "../../cluster-frame-context/hosted-cluster.injectable"; import hostedClusterInjectable from "../../cluster-frame-context/hosted-cluster.injectable";
import { Cluster } from "../../../common/cluster/cluster"; import { Cluster } from "../../../common/cluster/cluster";
import type { NamespaceStore } from "../+namespaces/store"; import type { NamespaceStore } from "../+namespaces/store";
import { historyInjectable } from "@k8slens/routing";
import type { MinimalTrayMenuItem } from "../../../main/tray/electron-tray/electron-tray.injectable"; import type { MinimalTrayMenuItem } from "../../../main/tray/electron-tray/electron-tray.injectable";
import electronTrayInjectable from "../../../main/tray/electron-tray/electron-tray.injectable"; import electronTrayInjectable from "../../../main/tray/electron-tray/electron-tray.injectable";
import { getDiForUnitTesting as getRendererDi } from "../../getDiForUnitTesting"; import { getDiForUnitTesting as getRendererDi } from "../../getDiForUnitTesting";
@ -71,6 +70,7 @@ import { applicationFeature, startApplicationInjectionToken } from "@k8slens/app
import { testUsingFakeTime } from "../../../test-utils/use-fake-time"; import { testUsingFakeTime } from "../../../test-utils/use-fake-time";
import { sendMessageToChannelInjectionToken } from "@k8slens/messaging"; import { sendMessageToChannelInjectionToken } from "@k8slens/messaging";
import { getMessageBridgeFake } from "@k8slens/messaging-fake-bridge"; import { getMessageBridgeFake } from "@k8slens/messaging-fake-bridge";
import { historyInjectionToken } from "@k8slens/routing";
type MainDiCallback = (container: { mainDi: DiContainer }) => void | Promise<void>; type MainDiCallback = (container: { mainDi: DiContainer }) => void | Promise<void>;
type WindowDiCallback = (container: { windowDi: DiContainer }) => void | Promise<void>; type WindowDiCallback = (container: { windowDi: DiContainer }) => void | Promise<void>;
@ -292,7 +292,7 @@ export const getApplicationBuilder = () => {
await callback({ windowDi }); await callback({ windowDi });
} }
const history = windowDi.inject(historyInjectable); const history = windowDi.inject(historyInjectionToken);
const render = renderFor(windowDi); const render = renderFor(windowDi);

4
packages/core/src/renderer/frames/cluster-frame/cluster-frame.test.tsx
View File

@ -12,7 +12,7 @@ import { DiContextProvider } from "@ogre-tools/injectable-react";
import { Router } from "react-router"; import { Router } from "react-router";
import { DefaultProps } from "../../mui-base-theme"; import { DefaultProps } from "../../mui-base-theme";
import { ClusterFrame } from "./cluster-frame"; import { ClusterFrame } from "./cluster-frame";
import { historyInjectable } from "@k8slens/routing"; import { historyInjectionToken } from "@k8slens/routing";
import { computed } from "mobx"; import { computed } from "mobx";
import { Cluster } from "../../../common/cluster/cluster"; import { Cluster } from "../../../common/cluster/cluster";
import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable"; import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable";
@ -34,7 +34,7 @@ describe("<ClusterFrame />", () => {
di = getDiForUnitTesting(); di = getDiForUnitTesting();
render = () => testingLibraryRender(( render = () => testingLibraryRender((
<DiContextProvider value={{ di }}> <DiContextProvider value={{ di }}>
<Router history={di.inject(historyInjectable)}> <Router history={di.inject(historyInjectionToken)}>
{DefaultProps(ClusterFrame)} {DefaultProps(ClusterFrame)}
</Router> </Router>
</DiContextProvider> </DiContextProvider>

4
packages/core/src/renderer/frames/routing-react-application-hoc.injectable.tsx
View File

@ -4,7 +4,7 @@
*/ */
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
import { Router } from "react-router"; import { Router } from "react-router";
import { historyInjectable } from "@k8slens/routing"; import { historyInjectionToken } from "@k8slens/routing";
import React from "react"; import React from "react";
import { import {
@ -15,7 +15,7 @@ const routingReactApplicationHocInjectable = getInjectable({
id: "routing-react-application-hoc", id: "routing-react-application-hoc",
instantiate: (di) => { instantiate: (di) => {
const history = di.inject(historyInjectable); const history = di.inject(historyInjectionToken);
return ({ children }) => return ({ children }) =>
( (

4
packages/core/src/renderer/navigation/history.global-override-for-injectable.ts
View File

@ -5,6 +5,6 @@
import { createMemoryHistory } from "history"; import { createMemoryHistory } from "history";
import { getGlobalOverride } from "@k8slens/test-utils"; import { getGlobalOverride } from "@k8slens/test-utils";
import { historyInjectable } from "@k8slens/routing"; import { historyInjectionToken } from "@k8slens/routing";
export default getGlobalOverride(historyInjectable, () => createMemoryHistory()); export default getGlobalOverride(historyInjectionToken, () => createMemoryHistory());

2
packages/routing/index.ts
View File

@ -3,7 +3,7 @@
* Licensed under MIT License. See LICENSE in root directory for more information. * Licensed under MIT License. See LICENSE in root directory for more information.
*/ */
export { historyInjectable } from "./src/history.injectable"; export { historyInjectionToken } from "./src/history.injectable";
export { observableHistoryInjectable } from "./src/observable-history.injectable"; export { observableHistoryInjectable } from "./src/observable-history.injectable";
export { searchParamsOptions } from "./src/search-params"; export { searchParamsOptions } from "./src/search-params";
export { routingFeature } from "./src/feature"; export { routingFeature } from "./src/feature";

11
packages/routing/src/history.injectable.ts
View File

@ -2,11 +2,16 @@
* Copyright (c) OpenLens Authors. All rights reserved. * Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information. * Licensed under MIT License. See LICENSE in root directory for more information.
*/ */
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable, getInjectionToken } from "@ogre-tools/injectable";
import { createBrowserHistory } from "history";
import type { History } from "history"; import type { History } from "history";
import { createBrowserHistory } from "history";
export const historyInjectionToken = getInjectionToken<History>({
id: "history-injection-token",
});
export const historyInjectable = getInjectable({ export const historyInjectable = getInjectable({
id: "history", id: "history",
instantiate: (): History => createBrowserHistory(), instantiate: () => createBrowserHistory(),
injectionToken: historyInjectionToken,
}); });