diff --git a/packages/core/src/features/metrics/metrics-feature.ts b/packages/core/src/features/metrics/metrics-feature.ts index e9bbbfbdbc..838bcb6652 100644 --- a/packages/core/src/features/metrics/metrics-feature.ts +++ b/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); }, }); diff --git a/packages/core/src/renderer/components/+namespaces/metrics-details-component.injectable.tsx b/packages/core/src/renderer/components/+namespaces/metrics-details-component.tsx similarity index 55% rename from packages/core/src/renderer/components/+namespaces/metrics-details-component.injectable.tsx rename to packages/core/src/renderer/components/+namespaces/metrics-details-component.tsx index 026aace4f5..35590208f5 100644 --- a/packages/core/src/renderer/components/+namespaces/metrics-details-component.injectable.tsx +++ b/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 = ({ ); -const NamespaceMetricsDetailsComponent = withInjectables>(NonInjectedNamespaceMetricsDetailsComponent, { +export const NamespaceMetricsDetailsComponent = withInjectables>(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; diff --git a/packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/metrics/namespace-details-metrics.injectable.ts b/packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/metrics/namespace-details-metrics.injectable.ts new file mode 100644 index 0000000000..e9bf6377dd --- /dev/null +++ b/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; diff --git a/packages/metrics/index.ts b/packages/metrics/index.ts index 4593623a0c..f184dff12b 100644 --- a/packages/metrics/index.ts +++ b/packages/metrics/index.ts @@ -50,6 +50,10 @@ export const statefulSetDetailsMetricsInjectionToken = getInjectionToken({ + id: "namespace-details-metrics-injection-token", +}); + export interface PodDetailsContainerMetricsComponentProps { container: any; pod: any;