Added changes to load orphan visits and fixed tests

This commit is contained in:
Alejandro Celaya
2022-02-05 13:37:49 +01:00
parent 60929342fb
commit 8fbe6bb17d
10 changed files with 63 additions and 34 deletions

View File

@@ -56,15 +56,12 @@ export const Overview = (
<>
<Row>
<div className="col-lg-6 col-xl-3 mb-3">
<HighlightCard title="Visits" link={linkToNonOrphanVisits ? `/server/${serverId}/visits` : undefined}>
<HighlightCard title="Visits" link={linkToNonOrphanVisits && `/server/${serverId}/non-orphan-visits`}>
{loadingVisits ? 'Loading...' : prettify(visitsCount)}
</HighlightCard>
</div>
<div className="col-lg-6 col-xl-3 mb-3">
<HighlightCard
title="Orphan visits"
link={linkToOrphanVisits ? `/server/${serverId}/orphan-visits` : undefined}
>
<HighlightCard title="Orphan visits" link={linkToOrphanVisits && `/server/${serverId}/orphan-visits`}>
<ForServerVersion minVersion="2.6.0">
{loadingVisits ? 'Loading...' : prettify(orphanVisitsCount ?? 0)}
</ForServerVersion>

View File

@@ -7,10 +7,10 @@ import './HighlightCard.scss';
export interface HighlightCardProps {
title: string;
link?: string;
link?: string | false;
}
const buildExtraProps = (link?: string) => !link ? {} : { tag: Link, to: link };
const buildExtraProps = (link?: string | false) => !link ? {} : { tag: Link, to: link };
export const HighlightCard: FC<HighlightCardProps> = ({ children, title, link }) => (
<Card className="highlight-card" body {...buildExtraProps(link)}>