From 3fc552a4660f0ba1fdc9843c9519451270e70c68 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Fri, 8 Jan 2021 09:41:30 -0500 Subject: [PATCH] remove array desctructor of Object.values, which is brittle (#1854) Signed-off-by: Sebastian Malton --- .../components/+nodes/node-charts.tsx | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/renderer/components/+nodes/node-charts.tsx b/src/renderer/components/+nodes/node-charts.tsx index 5951b610e7..d6e048b910 100644 --- a/src/renderer/components/+nodes/node-charts.tsx +++ b/src/renderer/components/+nodes/node-charts.tsx @@ -7,6 +7,7 @@ import { IResourceMetricsValue, ResourceMetricsContext } from "../resource-metri import { observer } from "mobx-react"; import { ChartOptions, ChartPoint } from "chart.js"; import { themeStore } from "../../theme.store"; +import { mapValues } from "lodash"; type IContext = IResourceMetricsValue; @@ -15,26 +16,26 @@ export const NodeCharts = observer(() => { const id = object.getId(); const { chartCapacityColor } = themeStore.activeTheme.colors; - if (!metrics) return null; - if (isMetricsEmpty(metrics)) return ; + if (!metrics) { + return null; + } - const values = Object.values(metrics).map(metric => - normalizeMetrics(metric).data.result[0].values - ); - const [ + if (isMetricsEmpty(metrics)) { + return ; + } + + const { memoryUsage, memoryRequests, - _memoryLimits, // eslint-disable-line unused-imports/no-unused-vars-ts memoryCapacity, cpuUsage, cpuRequests, - _cpuLimits, // eslint-disable-line unused-imports/no-unused-vars-ts cpuCapacity, podUsage, podCapacity, fsSize, fsUsage - ] = values; + } = mapValues(metrics, metric => normalizeMetrics(metric).data.result[0].values); const datasets = [ // CPU