From 6bcba6d043b7e751b730cd64221ef5837eac3486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= <l.mierzwa@gmail.com>
Date: Mon, 31 Jan 2022 14:15:30 +0000
Subject: [PATCH] fix(ui): show navbar until we know there are no upstreams

---
 ui/src/Components/NavBar/index.test.tsx | 2 +-
 ui/src/Components/NavBar/index.tsx      | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ui/src/Components/NavBar/index.test.tsx b/ui/src/Components/NavBar/index.test.tsx
index 87e08d026..25e451fbd 100644
--- a/ui/src/Components/NavBar/index.test.tsx
+++ b/ui/src/Components/NavBar/index.test.tsx
@@ -89,7 +89,7 @@ describe("<NavBar />", () => {
       instances: [],
       clusters: {},
     });
-    alertStore.info.setTotalAlerts(15);
+    alertStore.info.setTimestamp("123");
     const tree = MountedNavbar();
     expect(tree.find("span.navbar-brand")).toHaveLength(0);
   });
diff --git a/ui/src/Components/NavBar/index.tsx b/ui/src/Components/NavBar/index.tsx
index 14ed86821..e32e3e7ba 100644
--- a/ui/src/Components/NavBar/index.tsx
+++ b/ui/src/Components/NavBar/index.tsx
@@ -117,20 +117,23 @@ const NavBar: FC<{
           } align-items-start`}
         >
           <span className="navbar-nav d-flex flex-row">
-            {alertStore.data.upstreams.instances.length === 0 ? null : (
+            {alertStore.info.timestamp !== "" &&
+            alertStore.data.upstreams.instances.length === 0 ? null : (
               <span className="navbar-brand p-0 my-0 mx-2 h1 d-none d-sm-block">
                 <OverviewModal alertStore={alertStore} />
               </span>
             )}
             <Fetcher alertStore={alertStore} settingsStore={settingsStore} />
           </span>
-          {alertStore.data.upstreams.instances.length === 0 ? null : (
+          {alertStore.info.timestamp !== "" &&
+          alertStore.data.upstreams.instances.length === 0 ? null : (
             <FilterInput
               alertStore={alertStore}
               settingsStore={settingsStore}
             />
           )}
-          {alertStore.data.upstreams.instances.length === 0 ? null : (
+          {alertStore.info.timestamp !== "" &&
+          alertStore.data.upstreams.instances.length === 0 ? null : (
             <ul className="navbar-nav flex-wrap flex-shrink-1 ms-1">
               <AppToasts alertStore={alertStore} />
               <SilenceModal