From 5e19ca17c4fb1ba4aa649007b9746eff1f923d12 Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Wed, 25 Nov 2020 18:03:12 +0200
Subject: [PATCH] tweak

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 src/renderer/components/app.tsx                | 18 ++++++++++--------
 .../components/cluster-icon/cluster-icon.tsx   |  4 +---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/renderer/components/app.tsx b/src/renderer/components/app.tsx
index c2cc1ae27d..59b95f776c 100755
--- a/src/renderer/components/app.tsx
+++ b/src/renderer/components/app.tsx
@@ -47,6 +47,7 @@ import { eventStore } from "./+events/event.store";
 import { reaction, computed } from "mobx";
 import { nodesStore } from "./+nodes/nodes.store";
 import { podsStore } from "./+workloads-pods/pods.store";
+import { sum } from "lodash";
 
 @observer
 export class App extends React.Component {
@@ -83,10 +84,13 @@ export class App extends React.Component {
       promises.push(nodesStore.loadAll());
     }
     await Promise.all(promises);
-
-    eventStore.subscribe();
-    nodesStore.subscribe();
-    podsStore.subscribe();
+    if (eventStore.isLoaded && podsStore.isLoaded) {
+      eventStore.subscribe();
+      podsStore.subscribe();
+    }
+    if (nodesStore.isLoaded) {
+      nodesStore.subscribe();
+    }
 
     reaction(() => this.warningsCount, (count) => {
       broadcastMessage(`cluster-warning-event-count:${cluster.id}`, count);
@@ -95,10 +99,8 @@ export class App extends React.Component {
 
   @computed
   get warningsCount() {
-    let warnings = 0;
-    nodesStore.items.forEach(node => {
-      warnings = warnings + node.getWarningConditions().length;
-    });
+    let warnings = sum(nodesStore.items
+      .map(node => node.getWarningConditions().length));
     warnings = warnings + eventStore.getWarnings().length;
 
     return warnings;
diff --git a/src/renderer/components/cluster-icon/cluster-icon.tsx b/src/renderer/components/cluster-icon/cluster-icon.tsx
index a66894c125..8ee7c79aaf 100644
--- a/src/renderer/components/cluster-icon/cluster-icon.tsx
+++ b/src/renderer/components/cluster-icon/cluster-icon.tsx
@@ -41,9 +41,7 @@ export class ClusterIcon extends React.Component<Props> {
 
   componentDidMount() {
     const subscriber = subscribeToBroadcast(this.eventCountBroadcast, (ev, eventCount) => {
-      if (eventCount != this.eventCount) {
-        this.eventCount = eventCount;
-      }
+      this.eventCount = eventCount;
     });
 
     disposeOnUnmount(this, [