From b1416f5f794a254a69b0997f715fd3d39966a909 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Tue, 31 May 2022 16:26:01 -0400
Subject: [PATCH] Fix memoryUsage display for Nodes

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 src/renderer/components/+nodes/route.tsx | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/renderer/components/+nodes/route.tsx b/src/renderer/components/+nodes/route.tsx
index 782d4808e6..365658f18d 100644
--- a/src/renderer/components/+nodes/route.tsx
+++ b/src/renderer/components/+nodes/route.tsx
@@ -21,7 +21,6 @@ import { KubeObjectStatusIcon } from "../kube-object-status-icon";
 import { Badge } from "../badge/badge";
 import { eventStore } from "../+events/legacy-store";
 import { makeObservable, observable } from "mobx";
-import isEmpty from "lodash/isEmpty";
 import { KubeObjectAge } from "../kube-object/age";
 
 enum columnId {
@@ -48,7 +47,7 @@ interface UsageArgs {
 
 @observer
 export class NodesRoute extends React.Component {
-  @observable.ref metrics: Partial<NodeMetricData> = {};
+  @observable.ref metrics?: NodeMetricData;
   private metricsWatcher = interval(30, async () => this.metrics = await getMetricsForAllNodes());
 
   constructor(props: any) {
@@ -65,7 +64,9 @@ export class NodesRoute extends React.Component {
   }
 
   getLastMetricValues(node: Node, metricNames: string[]): number[] {
-    if (isEmpty(this.metrics)) {
+    const { metrics } = this;
+
+    if (!metrics) {
       return [];
     }
 
@@ -73,7 +74,7 @@ export class NodesRoute extends React.Component {
 
     return metricNames.map(metricName => {
       try {
-        const metric = this.metrics[metricName];
+        const metric = metrics[metricName];
         const result = metric?.data.result.find(({ metric: { node, instance, kubernetes_node }}) => (
           nodeName === node
           || nodeName === instance
@@ -124,7 +125,7 @@ export class NodesRoute extends React.Component {
     return this.renderUsage({
       node,
       title: "Memory",
-      metricNames: ["workloadMemoryUsage", "memoryAllocatableCapacity"],
+      metricNames: ["memoryUsage", "memoryAllocatableCapacity"],
       formatters: [
         ([usage, capacity]) => `${(usage * 100 / capacity).toFixed(2)}%`,
         ([usage]) => bytesToUnits(usage, { precision: 3 }),