m
/
umami
mirror of https://github.com/kremalicious/umami.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/umami-software/umami into dev

This commit is contained in:
Mike Cao 2024-02-17 10:18:40 -08:00
parent a9d46437f2 b76f4aa42d
commit cecdf49180
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/hooks/queries/useWebsitePageviews.ts
View File

@ -26,7 +26,7 @@ export function useWebsitePageviews(websiteId: string, options?: { [key: string]
};
return useQuery({
queryKey: ['websites:pageviews', params],
queryKey: ['websites:pageviews', { websiteId, ...params }],
queryFn: () => get(`/websites/${websiteId}/pageviews`, params),
...options,
});

2
src/components/hooks/queries/useWebsiteStats.ts
View File

@ -23,7 +23,7 @@ export function useWebsiteStats(websiteId: string, options?: { [key: string]: st
};
return useQuery({
queryKey: ['websites:stats', params],
queryKey: ['websites:stats', { websiteId, ...params }],
queryFn: () => get(`/websites/${websiteId}/stats`, params),
...options,
});

2
src/components/input/DateFilter.tsx
View File

@ -92,7 +92,7 @@ export function DateFilter({
const handleClose = () => setShowPicker(false);
const renderValue = (value: string) => {
const { unit } = parseDateValue(value);
const { unit } = parseDateValue(value) || {};
if (offset && unit === 'year') {
return formatDate(startDate, 'yyyy', locale);

2
src/lib/date.ts
View File

@ -260,7 +260,7 @@ export function getOffsetDateRange(dateRange: DateRange, increment: number) {
const change = num * increment;
const { add } = DATE_FUNCTIONS[unit];
const { unit: originalUnit } = parseDateValue(value);
const { unit: originalUnit } = parseDateValue(value) || {};
switch (originalUnit) {
case 'week':