diff --git a/packages/core/src/features/metrics/metrics-feature.ts b/packages/core/src/features/metrics/metrics-feature.ts index e062a71919..a5391295a7 100644 --- a/packages/core/src/features/metrics/metrics-feature.ts +++ b/packages/core/src/features/metrics/metrics-feature.ts @@ -3,13 +3,14 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getFeature } from "@k8slens/feature-core"; -import { clusterOverviewUIBlockInjectionToken, deploymentDetailsMetricsInjectionToken, jobDetailsMetricsInjectionToken, namespaceDetailsMetricsInjectionToken, nodeDetailsMetricsInjectionToken, persistentVolumeClaimDetailsMetricsInjectionToken, podDetailsContainerMetricsInjectionToken, podDetailsMetricsInjectionToken, replicaSetDetailsMetricsInjectionToken, statefulSetDetailsMetricsInjectionToken } from "@k8slens/metrics"; +import { clusterOverviewUIBlockInjectionToken, daemonSetDetailsMetricsInjectionToken, deploymentDetailsMetricsInjectionToken, jobDetailsMetricsInjectionToken, 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 { DaemonSetMetricsDetailsComponent } from "../../renderer/components/+workloads-daemonsets/metrics-details-component"; import { DeploymentMetricsDetailsComponent } from "../../renderer/components/+workloads-deployments/metrics-details-component"; import { JobMetricsDetailsComponent } from "../../renderer/components/+workloads-jobs/metrics-details-component"; import { PodDetailsContainerMetrics } from "../../renderer/components/+workloads-pods/pod-details-container-metrics"; @@ -122,7 +123,14 @@ const jobDetailsMetricsInjectable = getInjectable({ injectionToken: jobDetailsMetricsInjectionToken, }); -console.log(jobDetailsMetricsInjectable); +const daemonSetDetailsMetricsInjectable = getInjectable({ + id: "daemon-set-details-metrics-injectable", + instantiate: () => ({ + id: "daemon-set-details-metrics", + Component: DaemonSetMetricsDetailsComponent, + }), + injectionToken: daemonSetDetailsMetricsInjectionToken, +}); export const metricsFeature = getFeature({ id: "core-metrics-feature", @@ -140,5 +148,6 @@ export const metricsFeature = getFeature({ di.register(statefulSetDetailsMetricsInjectable); di.register(namespaceDetailsMetricsInjectable); di.register(jobDetailsMetricsInjectable); + di.register(daemonSetDetailsMetricsInjectable); }, }); diff --git a/packages/core/src/renderer/components/+workloads-daemonsets/metrics-details-component.injectable.tsx b/packages/core/src/renderer/components/+workloads-daemonsets/metrics-details-component.tsx similarity index 55% rename from packages/core/src/renderer/components/+workloads-daemonsets/metrics-details-component.injectable.tsx rename to packages/core/src/renderer/components/+workloads-daemonsets/metrics-details-component.tsx index 3975308f46..777e716609 100644 --- a/packages/core/src/renderer/components/+workloads-daemonsets/metrics-details-component.injectable.tsx +++ b/packages/core/src/renderer/components/+workloads-daemonsets/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 { DaemonSet } from "../../../common/k8s-api/endpoints"; import type { DaemonSetPodMetricData } from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-daemon-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 daemonSetMetricsInjectable from "./metrics.injectable"; @@ -33,21 +29,9 @@ const NonInjectedDaemonSetMetricsDetailsComponent = ({ ); -const DaemonSetMetricsDetailsComponent = withInjectables>(NonInjectedDaemonSetMetricsDetailsComponent, { +export const DaemonSetMetricsDetailsComponent = withInjectables>(NonInjectedDaemonSetMetricsDetailsComponent, { getProps: (di, props) => ({ metrics: di.inject(daemonSetMetricsInjectable, props.object), ...props, }), }); - -const daemonSetMetricsDetailsComponentInjectable = getInjectable({ - id: "daemon-set-metrics-details-component", - instantiate: (di) => ({ - Component: DaemonSetMetricsDetailsComponent, - enabled: di.inject(metricsDetailsComponentEnabledInjectable, ClusterMetricsResourceType.DaemonSet), - orderNumber: -1, - }), - injectionToken: kubeObjectDetailItemInjectionToken, -}); - -export default daemonSetMetricsDetailsComponentInjectable; diff --git a/packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/metrics/daemon-set-details-metrics.injectable.ts b/packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/metrics/daemon-set-details-metrics.injectable.ts new file mode 100644 index 0000000000..539443e2cf --- /dev/null +++ b/packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/metrics/daemon-set-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 { daemonSetDetailsMetricsInjectionToken } 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 daemonSetMetricsInjectable = getInjectable({ + id: "daemon-set-details-metrics", + instantiate: (di) => { + const getMetricsKubeObjectDetailItem = di.inject(getMetricsKubeObjectDetailItemInjectable); + + return getMetricsKubeObjectDetailItem( + daemonSetDetailsMetricsInjectionToken, + ClusterMetricsResourceType.DaemonSet, + ); + }, + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export default daemonSetMetricsInjectable; diff --git a/packages/metrics/index.ts b/packages/metrics/index.ts index ff6c0f8fd8..7bc5261fdd 100644 --- a/packages/metrics/index.ts +++ b/packages/metrics/index.ts @@ -58,6 +58,10 @@ export const jobDetailsMetricsInjectionToken = getInjectionToken({ + id: "daemon-set-details-metrics-injection-token", +}); + export interface PodDetailsContainerMetricsComponentProps { container: any; pod: any;