Add namespace details metrics injection token.

Signed-off-by: Juho Heikka <juho.heikka@gmail.com>

packages/core/src/features/metrics/metrics-feature.ts

@@ -3,10 +3,11 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getFeature } from "@k8slens/feature-core";
-import { clusterOverviewUIBlockInjectionToken, deploymentDetailsMetricsInjectionToken, nodeDetailsMetricsInjectionToken, persistentVolumeClaimDetailsMetricsInjectionToken, podDetailsContainerMetricsInjectionToken, podDetailsMetricsInjectionToken, replicaSetDetailsMetricsInjectionToken, statefulSetDetailsMetricsInjectionToken } from "@k8slens/metrics";
+import { clusterOverviewUIBlockInjectionToken, deploymentDetailsMetricsInjectionToken, namespaceDetailsMetricsInjectionToken, nodeDetailsMetricsInjectionToken, persistentVolumeClaimDetailsMetricsInjectionToken, podDetailsContainerMetricsInjectionToken, podDetailsMetricsInjectionToken, replicaSetDetailsMetricsInjectionToken, statefulSetDetailsMetricsInjectionToken } from "@k8slens/metrics";
 import { getInjectable } from "@ogre-tools/injectable";
 import { ClusterMetrics } from "../../renderer/components/+cluster/cluster-metrics";
 import { ClusterPieCharts } from "../../renderer/components/+cluster/cluster-pie-charts";
+import { NamespaceMetricsDetailsComponent } from "../../renderer/components/+namespaces/metrics-details-component";
 import { NodeMetricsDetailsComponent } from "../../renderer/components/+nodes/metrics-details-component";
 import { PersistentVolumeClaimMetricsDetailsComponent } from "../../renderer/components/+storage-volume-claims/metrics-details-component";
 import { DeploymentMetricsDetailsComponent } from "../../renderer/components/+workloads-deployments/metrics-details-component";
@@ -102,6 +103,15 @@ const statefulSetDetailsMetricsInjectable = getInjectable({
   injectionToken: statefulSetDetailsMetricsInjectionToken,
 });
 
+const namespaceDetailsMetricsInjectable = getInjectable({
+  id: "namespace-details-metrics-injectable",
+  instantiate: () => ({
+    id: "namespace-details-metrics",
+    Component: NamespaceMetricsDetailsComponent,
+  }),
+  injectionToken: namespaceDetailsMetricsInjectionToken,
+});
+
 export const metricsFeature = getFeature({
   id: "core-metrics-feature",
 
@@ -116,5 +126,6 @@ export const metricsFeature = getFeature({
     di.register(replicaSetDetailsMetricsInjectable);
     di.register(persistentVolumeClaimDetailsMetricsInjectable);
     di.register(statefulSetDetailsMetricsInjectable);
+    di.register(namespaceDetailsMetricsInjectable);
   },
 });

packages/core/src/renderer/components/+namespaces/metrics-details-component.tsx

@@ -2,17 +2,13 @@
  * 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 type { IAsyncComputed } from "@ogre-tools/injectable-react";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import React from "react";
 import { PodCharts, podMetricTabs } from "../+workloads-pods/pod-charts";
-import { ClusterMetricsResourceType } from "../../../common/cluster-types";
 import type { Namespace } from "../../../common/k8s-api/endpoints";
 import type { PodMetricInNamespaceData } from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-in-namespace.injectable";
-import metricsDetailsComponentEnabledInjectable from "../../api/catalog/entity/metrics-details-component-enabled.injectable";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
-import { kubeObjectDetailItemInjectionToken } from "../kube-object-details/kube-object-detail-items/kube-object-detail-item-injection-token";
 import { ResourceMetrics } from "../resource-metrics";
 import namespaceMetricsInjectable from "./metrics.injectable";
 
@@ -33,21 +29,9 @@ const NonInjectedNamespaceMetricsDetailsComponent = ({
   </ResourceMetrics>
 );
 
-const NamespaceMetricsDetailsComponent = withInjectables<Dependencies, KubeObjectDetailsProps<Namespace>>(NonInjectedNamespaceMetricsDetailsComponent, {
+export const NamespaceMetricsDetailsComponent = withInjectables<Dependencies, KubeObjectDetailsProps<Namespace>>(NonInjectedNamespaceMetricsDetailsComponent, {
   getProps: (di, props) => ({
     metrics: di.inject(namespaceMetricsInjectable, props.object),
     ...props,
   }),
 });
-
-const namespaceMetricsDetailsComponentInjectable = getInjectable({
-  id: "namespace-metrics-details-component",
-  instantiate: (di) => ({
-    Component: NamespaceMetricsDetailsComponent,
-    enabled: di.inject(metricsDetailsComponentEnabledInjectable, ClusterMetricsResourceType.Namespace),
-    orderNumber: -1,
-  }),
-  injectionToken: kubeObjectDetailItemInjectionToken,
-});
-
-export default namespaceMetricsDetailsComponentInjectable;

packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/metrics/namespace-details-metrics.injectable.ts

@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { namespaceDetailsMetricsInjectionToken } from "@k8slens/metrics";
+import { getInjectable } from "@ogre-tools/injectable";
+import { ClusterMetricsResourceType } from "../../../../../common/cluster-types";
+import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token";
+import { getMetricsKubeObjectDetailItemInjectable } from "./getMetricsKubeObjectDetailItem.injectable";
+
+const namespaceMetricsInjectable = getInjectable({
+  id: "namespace-details-metrics",
+  instantiate: (di) => {
+    const getMetricsKubeObjectDetailItem = di.inject(getMetricsKubeObjectDetailItemInjectable);
+
+    return getMetricsKubeObjectDetailItem(
+      namespaceDetailsMetricsInjectionToken,
+      ClusterMetricsResourceType.Namespace,
+    );
+  },
+  injectionToken: kubeObjectDetailItemInjectionToken,
+});
+
+export default namespaceMetricsInjectable;

packages/metrics/index.ts

@@ -50,6 +50,10 @@ export const statefulSetDetailsMetricsInjectionToken = getInjectionToken<KubeObj
   id: "stateful-set-details-metrics-injection-token",
 });
 
+export const namespaceDetailsMetricsInjectionToken = getInjectionToken<KubeObjectDetailMetrics>({
+  id: "namespace-details-metrics-injection-token",
+});
+
 export interface PodDetailsContainerMetricsComponentProps {
   container: any;
   pod: any;