Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Fix metrics bar not updating on compare mode switch

AymanAlSuleihifbf03d65636c
diff --git a/src/app/api/websites/[websiteId]/stats/route.ts b/src/app/api/websites/[websiteId]/stats/route.ts
index 07c8b9699..09d691f1c 100644
--- a/src/app/api/websites/[websiteId]/stats/route.ts
+++ b/src/app/api/websites/[websiteId]/stats/route.ts
@@ -12,6 +12,7 @@ export async function GET(
) {
const schema = z.object({
...dateRangeParams,
+ compare: z.enum(['prev', 'yoy']).optional(),
...filterParams,
});
@@ -31,7 +32,11 @@ export async function GET(
const data = await getWebsiteStats(websiteId, filters);
- const { startDate, endDate } = getCompareDate('prev', filters.startDate, filters.endDate);
+ const { startDate, endDate } = getCompareDate(
+ filters.compare || 'prev',
+ filters.startDate,
+ filters.endDate,
+ );
const comparison = await getWebsiteStats(websiteId, {
...filters,
diff --git a/src/components/hooks/queries/useWebsiteStatsQuery.ts b/src/components/hooks/queries/useWebsiteStatsQuery.ts
index e9a0c48ca..69bae09f6 100644
--- a/src/components/hooks/queries/useWebsiteStatsQuery.ts
+++ b/src/components/hooks/queries/useWebsiteStatsQuery.ts
@@ -1,5 +1,6 @@
import type { UseQueryOptions } from '@tanstack/react-query';
import { useDateParameters } from '@/components/hooks/useDateParameters';
+import { useDateRange } from '@/components/hooks/useDateRange';
import { useApi } from '../useApi';
import { useFilterParameters } from '../useFilterParameters';
@@ -24,12 +25,16 @@ export function useWebsiteStatsQuery(
) {
const { get, useQuery } = useApi();
const { startAt, endAt, unit, timezone } = useDateParameters();
+ const { compare } = useDateRange();
const filters = useFilterParameters();
return useQuery<WebsiteStatsData>({
- queryKey: ['websites:stats', { websiteId, startAt, endAt, unit, timezone, ...filters }],
+ queryKey: [
+ 'websites:stats',
+ { websiteId, startAt, endAt, unit, timezone, compare, ...filters },
+ ],
queryFn: () =>
- get(`/websites/${websiteId}/stats`, { startAt, endAt, unit, timezone, ...filters }),
+ get(`/websites/${websiteId}/stats`, { startAt, endAt, unit, timezone, compare, ...filters }),
enabled: !!websiteId,
...options,
});