Add node 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, podDetailsContainerMetricsInjectionToken, podDetailsMetricsInjectionToken } from "@k8slens/metrics";
+import { clusterOverviewUIBlockInjectionToken, deploymentDetailsMetricsInjectionToken, nodeDetailsMetricsInjectionToken, podDetailsContainerMetricsInjectionToken, podDetailsMetricsInjectionToken } 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 { NodeMetricsDetailsComponent } from "../../renderer/components/+nodes/metrics-details-component";
 import { DeploymentMetricsDetailsComponent } from "../../renderer/components/+workloads-deployments/metrics-details-component";
 import { PodDetailsContainerMetrics } from "../../renderer/components/+workloads-pods/pod-details-container-metrics";
 import PodMetricsDetailsComponent from "../../renderer/components/+workloads-pods/pod-metrics-details-component";
@@ -53,8 +54,6 @@ const deploymentDetailsMetricsInjectable = getInjectable({
   injectionToken: deploymentDetailsMetricsInjectionToken,
 });
 
-console.log(deploymentDetailsMetricsInjectable);
-
 const podDetailsContainerMetricsInjectable = getInjectable({
   id: "pod-details-container-metrics-injectable",
   instantiate: () => ({
@@ -64,6 +63,15 @@ const podDetailsContainerMetricsInjectable = getInjectable({
   injectionToken: podDetailsContainerMetricsInjectionToken,
 });
 
+const nodeDetailsMetricsInjectable = getInjectable({
+  id: "node-details-metrics-injectable",
+  instantiate: () => ({
+    id: "node-details-metrics",
+    Component: NodeMetricsDetailsComponent,
+  }),
+  injectionToken: nodeDetailsMetricsInjectionToken,
+});
+
 export const metricsFeature = getFeature({
   id: "core-metrics-feature",
 
@@ -74,5 +82,6 @@ export const metricsFeature = getFeature({
     di.register(podDetailsMetricsInjectable);
     di.register(podDetailsContainerMetricsInjectable);
     di.register(deploymentDetailsMetricsInjectable);
+    di.register(nodeDetailsMetricsInjectable);
   },
 });

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

@@ -2,16 +2,12 @@
  * 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 { ClusterMetricsResourceType } from "../../../common/cluster-types";
 import type { Node } from "../../../common/k8s-api/endpoints";
 import type { ClusterMetricData } from "../../../common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.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 nodeMetricsInjectable from "./metrics.injectable";
 import { NodeCharts } from "./node-charts";
@@ -38,21 +34,9 @@ const NonInjectedNodeMetricsDetailsComponent = ({
   </ResourceMetrics>
 );
 
-const NodeMetricsDetailsComponent = withInjectables<Dependencies, KubeObjectDetailsProps<Node>>(NonInjectedNodeMetricsDetailsComponent, {
+export const NodeMetricsDetailsComponent = withInjectables<Dependencies, KubeObjectDetailsProps<Node>>(NonInjectedNodeMetricsDetailsComponent, {
   getProps: (di, props) => ({
     metrics: di.inject(nodeMetricsInjectable, props.object),
     ...props,
   }),
 });
-
-const nodeMetricsDetailsComponentInjectable = getInjectable({
-  id: "node-metrics-details-component",
-  instantiate: (di) => ({
-    Component: NodeMetricsDetailsComponent,
-    enabled: di.inject(metricsDetailsComponentEnabledInjectable, ClusterMetricsResourceType.Node),
-    orderNumber: -1,
-  }),
-  injectionToken: kubeObjectDetailItemInjectionToken,
-});
-
-export default nodeMetricsDetailsComponentInjectable;

packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/metrics/node-details-metrics.injectable.tsx

@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { nodeDetailsMetricsInjectionToken } from "@k8slens/metrics";
+import { getInjectable } from "@ogre-tools/injectable";
+import { ClusterMetricsResourceType } from "../../../../../common/cluster-types";
+import metricsDetailsComponentEnabledInjectable from "../../../../api/catalog/entity/metrics-details-component-enabled.injectable";
+import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token";
+import { EmptyMetrics } from "./empty-metrics";
+
+const nodeMetricsInjectable = getInjectable({
+  id: "node-details-metrics",
+  instantiate: (di) => {
+    const nodeMetrics = di.injectMany(nodeDetailsMetricsInjectionToken);
+    const first = nodeMetrics[0];
+
+    const Component = first?.Component ?? EmptyMetrics;
+
+    return {
+      Component,
+      enabled: di.inject(metricsDetailsComponentEnabledInjectable, ClusterMetricsResourceType.Node),
+      orderNumber: -1,
+    };
+  },
+  injectionToken: kubeObjectDetailItemInjectionToken,
+});
+
+export default nodeMetricsInjectable;

packages/metrics/index.ts

@@ -33,6 +33,10 @@ export const deploymentDetailsMetricsInjectionToken = getInjectionToken<KubeObje
   id: "deployment-details-metrics-injection-token",
 });
 
+export const nodeDetailsMetricsInjectionToken = getInjectionToken<KubeObjectDetailMetrics>({
+  id: "node-details-metrics-injection-token",
+});
+
 export interface PodDetailsContainerMetricsComponentProps {
   container: any;
   pod: any;