From b15c6a4dfc7fdebf2c0cc140da192c33b0d06b5c Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Tue, 3 Jan 2023 11:26:10 -0500 Subject: [PATCH] Remove last usages of legacy global showDetails Signed-off-by: Sebastian Malton --- .../+storage-volumes/volume-details-list.tsx | 7 +++++-- .../components/+workloads-pods/pod-details-list.tsx | 7 +++++-- src/renderer/components/kube-detail-params/index.ts | 12 ------------ 3 files changed, 10 insertions(+), 16 deletions(-) delete mode 100644 src/renderer/components/kube-detail-params/index.ts diff --git a/src/renderer/components/+storage-volumes/volume-details-list.tsx b/src/renderer/components/+storage-volumes/volume-details-list.tsx index 04aa71bcb6..ebc471a933 100644 --- a/src/renderer/components/+storage-volumes/volume-details-list.tsx +++ b/src/renderer/components/+storage-volumes/volume-details-list.tsx @@ -10,7 +10,6 @@ import { observer } from "mobx-react"; import type { PersistentVolume } from "../../../common/k8s-api/endpoints/persistent-volume.api"; import { TableRow } from "../table/table-row"; import { cssNames, prevDefault } from "../../utils"; -import { showDetails } from "../kube-detail-params"; import { TableCell } from "../table/table-cell"; import { Spinner } from "../spinner/spinner"; import { DrawerTitle } from "../drawer/drawer-title"; @@ -20,6 +19,8 @@ import kebabCase from "lodash/kebabCase"; import type { PersistentVolumeStore } from "./store"; import { withInjectables } from "@ogre-tools/injectable-react"; import persistentVolumeStoreInjectable from "./store.injectable"; +import type { ShowDetails } from "../kube-detail-params/show-details.injectable"; +import showDetailsInjectable from "../kube-detail-params/show-details.injectable"; export interface VolumeDetailsListProps { persistentVolumes: PersistentVolume[]; @@ -33,6 +34,7 @@ enum sortBy { interface Dependencies { persistentVolumeStore: PersistentVolumeStore; + showDetails: ShowDetails; } @observer @@ -44,7 +46,7 @@ class NonInjectedVolumeDetailsList extends React.Component { - const { persistentVolumes } = this.props; + const { persistentVolumes, showDetails } = this.props; const volume = persistentVolumes.find(volume => volume.getId() === uid); if (!volume) { @@ -105,5 +107,6 @@ export const VolumeDetailsList = withInjectables ({ ...props, persistentVolumeStore: di.inject(persistentVolumeStoreInjectable), + showDetails: di.inject(showDetailsInjectable), }), }); diff --git a/src/renderer/components/+workloads-pods/pod-details-list.tsx b/src/renderer/components/+workloads-pods/pod-details-list.tsx index dc08d42fd0..37e8dab23f 100644 --- a/src/renderer/components/+workloads-pods/pod-details-list.tsx +++ b/src/renderer/components/+workloads-pods/pod-details-list.tsx @@ -17,10 +17,11 @@ import { Table, TableCell, TableHead, TableRow } from "../table"; import { Spinner } from "../spinner"; import { DrawerTitle } from "../drawer"; import { KubeObjectStatusIcon } from "../kube-object-status-icon"; -import { showDetails } from "../kube-detail-params"; import type { PodStore } from "./store"; import { withInjectables } from "@ogre-tools/injectable-react"; import podStoreInjectable from "./store.injectable"; +import type { ShowDetails } from "../kube-detail-params/show-details.injectable"; +import showDetailsInjectable from "../kube-detail-params/show-details.injectable"; enum sortBy { name = "name", @@ -39,6 +40,7 @@ export interface PodDetailsListProps { interface Dependencies { podStore: PodStore; + showDetails: ShowDetails; } @observer @@ -113,7 +115,7 @@ class NonInjectedPodDetailsList extends React.Component pod.getId() == uid); if (!pod) { @@ -208,5 +210,6 @@ export const PodDetailsList = withInjectables getProps: (di, props) => ({ ...props, podStore: di.inject(podStoreInjectable), + showDetails: di.inject(showDetailsInjectable), }), }); diff --git a/src/renderer/components/kube-detail-params/index.ts b/src/renderer/components/kube-detail-params/index.ts deleted file mode 100644 index b88de9f4af..0000000000 --- a/src/renderer/components/kube-detail-params/index.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 { asLegacyGlobalFunctionForExtensionApi } from "../../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api"; -import showDetailsInjectable from "./show-details.injectable"; - -/** - * @deprecated use `di.inject(showDetailsInjectable)` instead - */ -export const showDetails = asLegacyGlobalFunctionForExtensionApi(showDetailsInjectable);