watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-23 14:05:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed chart rendering when using date nav buttons.

Browse source
This commit is contained in:
Mike Cao 2025-06-12 23:07:25 -07:00
parent 1649992654
commit 7b5591a3ce
18 changed files with 177 additions and 320 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
View file

@ -1,4 +1,5 @@
import { useMemo } from 'react';
import { LoadingPanel } from '@/components/common/LoadingPanel';
import { PageviewsChart } from '@/components/metrics/PageviewsChart';
import { useWebsitePageviewsQuery } from '@/components/hooks/queries/useWebsitePageviewsQuery';
import { useDateRange } from '@/components/hooks';
@ -12,7 +13,7 @@ export function WebsiteChart({
}) {
const { dateRange, dateCompare } = useDateRange(websiteId);
const { startDate, endDate, unit, value } = dateRange;
const { data, isLoading } = useWebsitePageviewsQuery(
const { data, isLoading, error } = useWebsitePageviewsQuery(
websiteId,
compareMode ? dateCompare : undefined,
);
@ -46,13 +47,14 @@ export function WebsiteChart({
}, [data, startDate, endDate, unit]);
return (
<PageviewsChart
data={chartData}
minDate={startDate.toISOString()}
maxDate={endDate.toISOString()}
unit={unit}
isLoading={isLoading}
isAllTime={value === 'all'}
/>
<LoadingPanel isLoading={isLoading} error={error}>
<PageviewsChart
key={value}
data={chartData}
minDate={value === 'all' ? undefined : startDate}
maxDate={endDate}
unit={unit}
/>
</LoadingPanel>
);
}