From 888077d8f6a719b0aaa975a80dde626ffb1d8a6b Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Thu, 22 Dec 2022 10:49:32 -0500
Subject: [PATCH] Remove usages of legacy global configMapApi

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .../k8s-api/endpoints/legacy-globals.ts       |  6 ----
 .../details/volumes/variants/config-map.tsx   | 31 +++++++++++++++----
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/common/k8s-api/endpoints/legacy-globals.ts b/src/common/k8s-api/endpoints/legacy-globals.ts
index f8d89469d2..c8d0ad85cb 100644
--- a/src/common/k8s-api/endpoints/legacy-globals.ts
+++ b/src/common/k8s-api/endpoints/legacy-globals.ts
@@ -4,7 +4,6 @@
  */
 
 import { asLegacyGlobalForExtensionApi } from "../../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api";
-import configMapApiInjectable from "./config-map.api.injectable";
 import cronJobApiInjectable from "./cron-job.api.injectable";
 import jobApiInjectable from "./job.api.injectable";
 import podApiInjectable from "./pod.api.injectable";
@@ -29,8 +28,3 @@ export const cronJobApi = asLegacyGlobalForExtensionApi(cronJobApiInjectable);
  * @deprecated use `di.inject(jobApiInjectable)` instead
  */
 export const jobApi = asLegacyGlobalForExtensionApi(jobApiInjectable);
-
-/**
- * @deprecated use `di.inject(configMapApiInjectable)` instead
- */
-export const configMapApi = asLegacyGlobalForExtensionApi(configMapApiInjectable);
diff --git a/src/renderer/components/+workloads-pods/details/volumes/variants/config-map.tsx b/src/renderer/components/+workloads-pods/details/volumes/variants/config-map.tsx
index d4eb28c0e5..e59fed5633 100644
--- a/src/renderer/components/+workloads-pods/details/volumes/variants/config-map.tsx
+++ b/src/renderer/components/+workloads-pods/details/volumes/variants/config-map.tsx
@@ -3,18 +3,37 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
+import { withInjectables } from "@ogre-tools/injectable-react";
 import React from "react";
-import { configMapApi } from "../../../../../../common/k8s-api/endpoints";
-import type { VolumeVariantComponent } from "../variant-helpers";
+import type { ConfigMapApi } from "../../../../../../common/k8s-api/endpoints";
+import configMapApiInjectable from "../../../../../../common/k8s-api/endpoints/config-map.api.injectable";
+import type { PodVolumeVariantSpecificProps } from "../variant-helpers";
 import { LocalRef } from "../variant-helpers";
 
-export const ConfigMap: VolumeVariantComponent<"configMap"> = (
-  ({ pod, variant: { name }}) => (
+interface Dependencies {
+  configMapApi: ConfigMapApi;
+}
+
+const NonInjectedConfigMap = (props: PodVolumeVariantSpecificProps<"configMap"> & Dependencies) => {
+  const {
+    pod,
+    variant: { name },
+    configMapApi,
+  } = props;
+
+  return (
     <LocalRef
       pod={pod}
       title="Name"
       kubeRef={{ name }}
       api={configMapApi}
     />
-  )
-);
+  );
+};
+
+export const ConfigMap = withInjectables<Dependencies, PodVolumeVariantSpecificProps<"configMap">>(NonInjectedConfigMap, {
+  getProps: (di, props) => ({
+    ...props,
+    configMapApi: di.inject(configMapApiInjectable),
+  }),
+});