From fdff10a3bd42d44264f82ffeee420a0101185f09 Mon Sep 17 00:00:00 2001 From: Juho Heikka Date: Wed, 5 Apr 2023 13:08:16 +0300 Subject: [PATCH] Add node details metrics injection token. Signed-off-by: Juho Heikka --- .../src/features/metrics/metrics-feature.ts | 15 ++++++++-- ...able.tsx => metrics-details-component.tsx} | 18 +----------- .../node-details-metrics.injectable.tsx | 29 +++++++++++++++++++ packages/metrics/index.ts | 4 +++ 4 files changed, 46 insertions(+), 20 deletions(-) rename packages/core/src/renderer/components/+nodes/{metrics-details-component.injectable.tsx => metrics-details-component.tsx} (56%) create mode 100644 packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/metrics/node-details-metrics.injectable.tsx diff --git a/packages/core/src/features/metrics/metrics-feature.ts b/packages/core/src/features/metrics/metrics-feature.ts index 73bdad50e4..3fb88fc900 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, podDetailsContainerMetricsInjectionToken, podDetailsMetricsInjectionToken } from "@k8slens/metrics"; +import { clusterOverviewUIBlockInjectionToken, deploymentDetailsMetricsInjectionToken, nodeDetailsMetricsInjectionToken, podDetailsContainerMetricsInjectionToken, podDetailsMetricsInjectionToken } 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 { NodeMetricsDetailsComponent } from "../../renderer/components/+nodes/metrics-details-component"; 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"; @@ -53,8 +54,6 @@ const deploymentDetailsMetricsInjectable = getInjectable({ injectionToken: deploymentDetailsMetricsInjectionToken, }); -console.log(deploymentDetailsMetricsInjectable); - const podDetailsContainerMetricsInjectable = getInjectable({ id: "pod-details-container-metrics-injectable", instantiate: () => ({ @@ -64,6 +63,15 @@ const podDetailsContainerMetricsInjectable = getInjectable({ injectionToken: podDetailsContainerMetricsInjectionToken, }); +const nodeDetailsMetricsInjectable = getInjectable({ + id: "node-details-metrics-injectable", + instantiate: () => ({ + id: "node-details-metrics", + Component: NodeMetricsDetailsComponent, + }), + injectionToken: nodeDetailsMetricsInjectionToken, +}); + export const metricsFeature = getFeature({ id: "core-metrics-feature", @@ -74,5 +82,6 @@ export const metricsFeature = getFeature({ di.register(podDetailsMetricsInjectable); di.register(podDetailsContainerMetricsInjectable); di.register(deploymentDetailsMetricsInjectable); + di.register(nodeDetailsMetricsInjectable); }, }); diff --git a/packages/core/src/renderer/components/+nodes/metrics-details-component.injectable.tsx b/packages/core/src/renderer/components/+nodes/metrics-details-component.tsx similarity index 56% rename from packages/core/src/renderer/components/+nodes/metrics-details-component.injectable.tsx rename to packages/core/src/renderer/components/+nodes/metrics-details-component.tsx index 9a8d593d74..c6eb33367f 100644 --- a/packages/core/src/renderer/components/+nodes/metrics-details-component.injectable.tsx +++ b/packages/core/src/renderer/components/+nodes/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 { Node } from "../../../common/k8s-api/endpoints"; import type { ClusterMetricData } from "../../../common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.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 nodeMetricsInjectable from "./metrics.injectable"; import { NodeCharts } from "./node-charts"; @@ -38,21 +34,9 @@ const NonInjectedNodeMetricsDetailsComponent = ({ ); -const NodeMetricsDetailsComponent = withInjectables>(NonInjectedNodeMetricsDetailsComponent, { +export const NodeMetricsDetailsComponent = withInjectables>(NonInjectedNodeMetricsDetailsComponent, { getProps: (di, props) => ({ metrics: di.inject(nodeMetricsInjectable, props.object), ...props, }), }); - -const nodeMetricsDetailsComponentInjectable = getInjectable({ - id: "node-metrics-details-component", - instantiate: (di) => ({ - Component: NodeMetricsDetailsComponent, - enabled: di.inject(metricsDetailsComponentEnabledInjectable, ClusterMetricsResourceType.Node), - orderNumber: -1, - }), - injectionToken: kubeObjectDetailItemInjectionToken, -}); - -export default nodeMetricsDetailsComponentInjectable; diff --git a/packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/metrics/node-details-metrics.injectable.tsx b/packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/metrics/node-details-metrics.injectable.tsx new file mode 100644 index 0000000000..a9f236c6c2 --- /dev/null +++ b/packages/core/src/renderer/components/kube-object-details/kube-object-detail-items/metrics/node-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 { nodeDetailsMetricsInjectionToken } 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 nodeMetricsInjectable = getInjectable({ + id: "node-details-metrics", + instantiate: (di) => { + const nodeMetrics = di.injectMany(nodeDetailsMetricsInjectionToken); + const first = nodeMetrics[0]; + + const Component = first?.Component ?? EmptyMetrics; + + return { + Component, + enabled: di.inject(metricsDetailsComponentEnabledInjectable, ClusterMetricsResourceType.Node), + orderNumber: -1, + }; + }, + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export default nodeMetricsInjectable; diff --git a/packages/metrics/index.ts b/packages/metrics/index.ts index c9527eec48..9703c7b097 100644 --- a/packages/metrics/index.ts +++ b/packages/metrics/index.ts @@ -33,6 +33,10 @@ export const deploymentDetailsMetricsInjectionToken = getInjectionToken({ + id: "node-details-metrics-injection-token", +}); + export interface PodDetailsContainerMetricsComponentProps { container: any; pod: any;