github/karma
1
0
Fork 0
mirror of https://github.com/prymitive/karma synced 2026-05-21 04:33:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): show navbar until we know there are no upstreams

Browse Source
This commit is contained in:
Łukasz Mierzwa
2022-01-31 14:15:30 +00:00
committed by Łukasz Mierzwa
parent 8923316e43
commit 6bcba6d043
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ui/src/Components/NavBar/index.test.tsx
View File

@@ -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);
});

9
ui/src/Components/NavBar/index.tsx
View File

@@ -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