diff --git a/src/renderer/components/+storage-volumes/legacy-store.ts b/src/renderer/components/+storage-volumes/legacy-store.ts deleted file mode 100644 index 68acd228fd..0000000000 --- a/src/renderer/components/+storage-volumes/legacy-store.ts +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import { asLegacyGlobalForExtensionApi } from "../../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api"; -import persistentVolumeStoreInjectable from "./store.injectable"; - -/** - * @deprecated use `di.inject(persistentVolumeStoreInjectable)` instead - */ -export const persistentVolumeStore = asLegacyGlobalForExtensionApi(persistentVolumeStoreInjectable); diff --git a/src/renderer/components/+storage-volumes/volume-details-list.tsx b/src/renderer/components/+storage-volumes/volume-details-list.tsx index e843e410ca..04aa71bcb6 100644 --- a/src/renderer/components/+storage-volumes/volume-details-list.tsx +++ b/src/renderer/components/+storage-volumes/volume-details-list.tsx @@ -16,8 +16,10 @@ import { Spinner } from "../spinner/spinner"; import { DrawerTitle } from "../drawer/drawer-title"; import { Table } from "../table/table"; import { TableHead } from "../table/table-head"; -import { persistentVolumeStore } from "./legacy-store"; import kebabCase from "lodash/kebabCase"; +import type { PersistentVolumeStore } from "./store"; +import { withInjectables } from "@ogre-tools/injectable-react"; +import persistentVolumeStoreInjectable from "./store.injectable"; export interface VolumeDetailsListProps { persistentVolumes: PersistentVolume[]; @@ -29,8 +31,12 @@ enum sortBy { capacity = "capacity", } +interface Dependencies { + persistentVolumeStore: PersistentVolumeStore; +} + @observer -export class VolumeDetailsList extends React.Component { +class NonInjectedVolumeDetailsList extends React.Component { private sortingCallbacks = { [sortBy.name]: (volume: PersistentVolume) => volume.getName(), [sortBy.capacity]: (volume: PersistentVolume) => volume.getCapacity(), @@ -60,7 +66,7 @@ export class VolumeDetailsList extends React.Component { }; render() { - const { persistentVolumes } = this.props; + const { persistentVolumes, persistentVolumeStore } = this.props; const virtual = persistentVolumes.length > 100; if (!persistentVolumes.length) { @@ -94,3 +100,10 @@ export class VolumeDetailsList extends React.Component { ); } } + +export const VolumeDetailsList = withInjectables(NonInjectedVolumeDetailsList, { + getProps: (di, props) => ({ + ...props, + persistentVolumeStore: di.inject(persistentVolumeStoreInjectable), + }), +});