diff --git a/packages/core/src/features/metrics/metrics-feature.ts b/packages/core/src/features/metrics/metrics-feature.ts index 3fb88fc900..763f19e2d2 100644 --- a/packages/core/src/features/metrics/metrics-feature.ts +++ b/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, deploymentDetailsMetricsInjectionToken, nodeDetailsMetricsInjectionToken, podDetailsContainerMetricsInjectionToken, podDetailsMetricsInjectionToken } from "@k8slens/metrics"; +import { clusterOverviewUIBlockInjectionToken, deploymentDetailsMetricsInjectionToken, nodeDetailsMetricsInjectionToken, podDetailsContainerMetricsInjectionToken, podDetailsMetricsInjectionToken, replicaSetDetailsMetricsInjectionToken } 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"; @@ -11,6 +11,7 @@ import { NodeMetricsDetailsComponent } from "../../renderer/components/+nodes/me 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"; +import { ReplicaSetMetricsDetailsComponent } from "../../renderer/components/+workloads-replicasets/metrics-details-component"; const clusterPieChartsClusterOverviewInjectable = getInjectable({ id: "cluster-pie-charts-cluster-overview", @@ -72,6 +73,15 @@ const nodeDetailsMetricsInjectable = getInjectable({ injectionToken: nodeDetailsMetricsInjectionToken, }); +const replicaSetDetailsMetricsInjectable = getInjectable({ + id: "replica-set-details-metrics-injectable", + instantiate: () => ({ + id: "replica-set-details-metrics", + Component: ReplicaSetMetricsDetailsComponent, + }), + injectionToken: replicaSetDetailsMetricsInjectionToken, +}); + export const metricsFeature = getFeature({ id: "core-metrics-feature", @@ -83,5 +93,6 @@ export const metricsFeature = getFeature({ di.register(podDetailsContainerMetricsInjectable); di.register(deploymentDetailsMetricsInjectable); di.register(nodeDetailsMetricsInjectable); + di.register(replicaSetDetailsMetricsInjectable); }, }); diff --git a/packages/core/src/renderer/components/+workloads-replicasets/metrics-details-component.injectable.tsx b/packages/core/src/renderer/components/+workloads-replicasets/metrics-details-component.tsx similarity index 54% rename from packages/core/src/renderer/components/+workloads-replicasets/metrics-details-component.injectable.tsx rename to packages/core/src/renderer/components/+workloads-replicasets/metrics-details-component.tsx index 9c57bea78e..5b9ea8d99c 100644 --- a/packages/core/src/renderer/components/+workloads-replicasets/metrics-details-component.injectable.tsx +++ b/packages/core/src/renderer/components/+workloads-replicasets/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, 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 { ReplicaSet } from "../../../common/k8s-api/endpoints"; import type { ReplicaSetPodMetricData } from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-replica-sets.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 replicaSetMetricsInjectable from "./metrics.injectable"; @@ -32,21 +28,9 @@ const NonInjectedReplicaSetMetricsDetailsComponent = ({ ); -const ReplicaSetMetricsDetailsComponent = withInjectables>(NonInjectedReplicaSetMetricsDetailsComponent, { +export const ReplicaSetMetricsDetailsComponent = withInjectables>(NonInjectedReplicaSetMetricsDetailsComponent, { getProps: (di, props) => ({ metrics: di.inject(replicaSetMetricsInjectable, props.object), ...props, }), }); - -const replicaSetMetricsDetailsComponentInjectable = getInjectable({ - id: "replica-set-metrics-details-component", - instantiate: (di) => ({ - Component: ReplicaSetMetricsDetailsComponent, - enabled: di.inject(metricsDetailsComponentEnabledInjectable, ClusterMetricsResourceType.ReplicaSet), - orderNumber: -1, - }), - injectionToken: kubeObjectDetailItemInjectionToken, -}); - -export default replicaSetMetricsDetailsComponentInjectable; diff --git a/packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/metrics/replica-set-details-metrics.injectable.tsx b/packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/metrics/replica-set-details-metrics.injectable.tsx new file mode 100644 index 0000000000..374b9d5a30 --- /dev/null +++ b/packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/metrics/replica-set-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 { replicaSetDetailsMetricsInjectionToken } 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 replicaSetMetricsInjectable = getInjectable({ + id: "replicaSet-details-metrics", + instantiate: (di) => { + const replicaSetMetrics = di.injectMany(replicaSetDetailsMetricsInjectionToken); + const first = replicaSetMetrics[0]; + + const Component = first?.Component ?? EmptyMetrics; + + return { + Component, + enabled: di.inject(metricsDetailsComponentEnabledInjectable, ClusterMetricsResourceType.ReplicaSet), + orderNumber: -1, + }; + }, + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export default replicaSetMetricsInjectable; diff --git a/packages/metrics/index.ts b/packages/metrics/index.ts index 9703c7b097..058c418840 100644 --- a/packages/metrics/index.ts +++ b/packages/metrics/index.ts @@ -37,6 +37,10 @@ export const nodeDetailsMetricsInjectionToken = getInjectionToken({ + id: "replica-set-details-metrics-injection-token", +}); + export interface PodDetailsContainerMetricsComponentProps { container: any; pod: any;