Add ingress details metrics injection token.

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

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

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getFeature } from "@k8slens/feature-core";
-import { clusterOverviewUIBlockInjectionToken, daemonSetDetailsMetricsInjectionToken, deploymentDetailsMetricsInjectionToken, jobDetailsMetricsInjectionToken, namespaceDetailsMetricsInjectionToken, nodeDetailsMetricsInjectionToken, persistentVolumeClaimDetailsMetricsInjectionToken, podDetailsContainerMetricsInjectionToken, podDetailsMetricsInjectionToken, replicaSetDetailsMetricsInjectionToken, statefulSetDetailsMetricsInjectionToken } from "@k8slens/metrics";
+import { clusterOverviewUIBlockInjectionToken, daemonSetDetailsMetricsInjectionToken, deploymentDetailsMetricsInjectionToken, jobDetailsMetricsInjectionToken, namespaceDetailsMetricsInjectionToken, ingressDetailsMetricsInjectionToken, 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";
@@ -17,6 +17,7 @@ import { PodDetailsContainerMetrics } from "../../renderer/components/+workloads
 import PodMetricsDetailsComponent from "../../renderer/components/+workloads-pods/pod-metrics-details-component";
 import { ReplicaSetMetricsDetailsComponent } from "../../renderer/components/+workloads-replicasets/metrics-details-component";
 import { StatefulSetMetricsDetailsComponent } from "../../renderer/components/+workloads-statefulsets/metrics-details-component";
+import { IngressMetricsDetailsComponent } from "../../renderer/components/+network-ingresses/metrics-details-component";
 
 const clusterPieChartsClusterOverviewInjectable = getInjectable({
   id: "cluster-pie-charts-cluster-overview",
@@ -132,6 +133,15 @@ const daemonSetDetailsMetricsInjectable = getInjectable({
   injectionToken: daemonSetDetailsMetricsInjectionToken,
 });
 
+const ingressDetailsMetricsInjectable = getInjectable({
+  id: "network-ingress-details-metrics-injectable",
+  instantiate: () => ({
+    id: "network-ingress-details-metrics",
+    Component: IngressMetricsDetailsComponent,
+  }),
+  injectionToken: ingressDetailsMetricsInjectionToken,
+});
+
 export const metricsFeature = getFeature({
   id: "core-metrics-feature",
 
@@ -149,5 +159,6 @@ export const metricsFeature = getFeature({
     di.register(namespaceDetailsMetricsInjectable);
     di.register(jobDetailsMetricsInjectable);
     di.register(daemonSetDetailsMetricsInjectable);
+    di.register(ingressDetailsMetricsInjectable);
   },
 });

packages/core/src/renderer/components/+network-ingresses/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 { Ingress } from "../../../common/k8s-api/endpoints";
 import type { IngressMetricData } from "../../../common/k8s-api/endpoints/metrics.api/request-ingress-metrics.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 { IngressCharts } from "./ingress-charts";
 import ingressMetricsInjectable from "./metrics.injectable";
@@ -36,21 +32,9 @@ const NonInjectedIngressMetricsDetailsComponent = ({
   </ResourceMetrics>
 );
 
-const IngressMetricsDetailsComponent = withInjectables<Dependencies, KubeObjectDetailsProps<Ingress>>(NonInjectedIngressMetricsDetailsComponent, {
+export const IngressMetricsDetailsComponent = withInjectables<Dependencies, KubeObjectDetailsProps<Ingress>>(NonInjectedIngressMetricsDetailsComponent, {
   getProps: (di, props) => ({
     metrics: di.inject(ingressMetricsInjectable, props.object),
     ...props,
   }),
 });
-
-const ingressMetricsDetailsComponentInjectable = getInjectable({
-  id: "ingress-metrics-details-component",
-  instantiate: (di) => ({
-    Component: IngressMetricsDetailsComponent,
-    enabled: di.inject(metricsDetailsComponentEnabledInjectable, ClusterMetricsResourceType.Ingress),
-    orderNumber: -1,
-  }),
-  injectionToken: kubeObjectDetailItemInjectionToken,
-});
-
-export default ingressMetricsDetailsComponentInjectable;

packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/metrics/ingress-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 { ingressDetailsMetricsInjectionToken } 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 ingressMetricsInjectable = getInjectable({
+  id: "ingress-details-metrics",
+  instantiate: (di) => {
+    const getMetricsKubeObjectDetailItem = di.inject(getMetricsKubeObjectDetailItemInjectable);
+
+    return getMetricsKubeObjectDetailItem(
+      ingressDetailsMetricsInjectionToken,
+      ClusterMetricsResourceType.Ingress,
+    );
+  },
+  injectionToken: kubeObjectDetailItemInjectionToken,
+});
+
+export default ingressMetricsInjectable;

packages/metrics/index.ts

@@ -62,6 +62,10 @@ export const daemonSetDetailsMetricsInjectionToken = getInjectionToken<KubeObjec
   id: "daemon-set-details-metrics-injection-token",
 });
 
+export const ingressDetailsMetricsInjectionToken = getInjectionToken<KubeObjectDetailMetrics>({
+  id: "ingress-details-metrics-injection-token",
+});
+
 export interface PodDetailsContainerMetricsComponentProps {
   container: any;
   pod: any;