From 033987063134ed94eeef7e9f2233e342896456de Mon Sep 17 00:00:00 2001 From: Juho Heikka Date: Wed, 5 Apr 2023 14:47:46 +0300 Subject: [PATCH] Add job details metrics injection token. Signed-off-by: Juho Heikka --- .../src/features/metrics/metrics-feature.ts | 15 +++++++++++- ...able.tsx => metrics-details-component.tsx} | 17 +------------ .../metrics/job-details-metrics.injectable.ts | 24 +++++++++++++++++++ packages/metrics/index.ts | 4 ++++ 4 files changed, 43 insertions(+), 17 deletions(-) rename packages/core/src/renderer/components/+workloads-jobs/{metrics-details-component.injectable.tsx => metrics-details-component.tsx} (54%) create mode 100644 packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/metrics/job-details-metrics.injectable.ts diff --git a/packages/core/src/features/metrics/metrics-feature.ts b/packages/core/src/features/metrics/metrics-feature.ts index 838bcb6652..e062a71919 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, namespaceDetailsMetricsInjectionToken, nodeDetailsMetricsInjectionToken, persistentVolumeClaimDetailsMetricsInjectionToken, podDetailsContainerMetricsInjectionToken, podDetailsMetricsInjectionToken, replicaSetDetailsMetricsInjectionToken, statefulSetDetailsMetricsInjectionToken } from "@k8slens/metrics"; +import { clusterOverviewUIBlockInjectionToken, 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"; @@ -11,6 +11,7 @@ import { NamespaceMetricsDetailsComponent } from "../../renderer/components/+nam 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"; +import { JobMetricsDetailsComponent } from "../../renderer/components/+workloads-jobs/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"; @@ -112,6 +113,17 @@ const namespaceDetailsMetricsInjectable = getInjectable({ injectionToken: namespaceDetailsMetricsInjectionToken, }); +const jobDetailsMetricsInjectable = getInjectable({ + id: "job-details-metrics-injectable", + instantiate: () => ({ + id: "job-details-metrics", + Component: JobMetricsDetailsComponent, + }), + injectionToken: jobDetailsMetricsInjectionToken, +}); + +console.log(jobDetailsMetricsInjectable); + export const metricsFeature = getFeature({ id: "core-metrics-feature", @@ -127,5 +139,6 @@ export const metricsFeature = getFeature({ di.register(persistentVolumeClaimDetailsMetricsInjectable); di.register(statefulSetDetailsMetricsInjectable); di.register(namespaceDetailsMetricsInjectable); + di.register(jobDetailsMetricsInjectable); }, }); diff --git a/packages/core/src/renderer/components/+workloads-jobs/metrics-details-component.injectable.tsx b/packages/core/src/renderer/components/+workloads-jobs/metrics-details-component.tsx similarity index 54% rename from packages/core/src/renderer/components/+workloads-jobs/metrics-details-component.injectable.tsx rename to packages/core/src/renderer/components/+workloads-jobs/metrics-details-component.tsx index 479086c17c..6588359fc5 100644 --- a/packages/core/src/renderer/components/+workloads-jobs/metrics-details-component.injectable.tsx +++ b/packages/core/src/renderer/components/+workloads-jobs/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 { Job } from "../../../common/k8s-api/endpoints"; import type { JobPodMetricData } from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-jobs.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 jobMetricsInjectable from "./metrics.injectable"; @@ -32,21 +28,10 @@ const NonInjectedJobMetricsDetailsComponent = ({ ); -const JobMetricsDetailsComponent = withInjectables>(NonInjectedJobMetricsDetailsComponent, { +export const JobMetricsDetailsComponent = withInjectables>(NonInjectedJobMetricsDetailsComponent, { getProps: (di, props) => ({ metrics: di.inject(jobMetricsInjectable, props.object), ...props, }), }); -const jobMetricsDetailsComponentInjectable = getInjectable({ - id: "job-metrics-details-component", - instantiate: (di) => ({ - Component: JobMetricsDetailsComponent, - enabled: di.inject(metricsDetailsComponentEnabledInjectable, ClusterMetricsResourceType.Job), - orderNumber: -1, - }), - injectionToken: kubeObjectDetailItemInjectionToken, -}); - -export default jobMetricsDetailsComponentInjectable; diff --git a/packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/metrics/job-details-metrics.injectable.ts b/packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/metrics/job-details-metrics.injectable.ts new file mode 100644 index 0000000000..53a4e5e31f --- /dev/null +++ b/packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/metrics/job-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 { jobDetailsMetricsInjectionToken } 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 jobMetricsInjectable = getInjectable({ + id: "job-details-metrics", + instantiate: (di) => { + const getMetricsKubeObjectDetailItem = di.inject(getMetricsKubeObjectDetailItemInjectable); + + return getMetricsKubeObjectDetailItem( + jobDetailsMetricsInjectionToken, + ClusterMetricsResourceType.Job, + ); + }, + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export default jobMetricsInjectable; diff --git a/packages/metrics/index.ts b/packages/metrics/index.ts index f184dff12b..ff6c0f8fd8 100644 --- a/packages/metrics/index.ts +++ b/packages/metrics/index.ts @@ -54,6 +54,10 @@ export const namespaceDetailsMetricsInjectionToken = getInjectionToken({ + id: "job-details-metrics-injection-token", +}); + export interface PodDetailsContainerMetricsComponentProps { container: any; pod: any;