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.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
clean-up useWebsite query params
Francis Caod440a44d96e9
diff --git a/src/components/hooks/queries/useWebsiteMetricsQuery.ts b/src/components/hooks/queries/useWebsiteMetricsQuery.tsindex 8370db8eb..a5ec7ac99 100644--- a/src/components/hooks/queries/useWebsiteMetricsQuery.ts+++ b/src/components/hooks/queries/useWebsiteMetricsQuery.ts@@ -1,8 +1,8 @@+import { ReactQueryOptions } from '@/lib/types';import { keepPreviousData } from '@tanstack/react-query';import { useApi } from '../useApi';-import { useFilterParameters } from '../useFilterParameters';import { useDateParameters } from '../useDateParameters';-import { ReactQueryOptions } from '@/lib/types';+import { useFilterParameters } from '../useFilterParameters';export type WebsiteMetricsData = {x: string;@@ -15,7 +15,7 @@ export function useWebsiteMetricsQuery(options?: ReactQueryOptions<WebsiteMetricsData>,) {const { get, useQuery } = useApi();- const date = useDateParameters();+ const { startAt, endAt, unit, timezone } = useDateParameters();const filters = useFilterParameters();return useQuery<WebsiteMetricsData>({@@ -23,14 +23,20 @@ export function useWebsiteMetricsQuery('websites:metrics',{websiteId,- ...date,+ startAt,+ endAt,+ unit,+ timezone,...filters,...params,},],queryFn: async () =>get(`/websites/${websiteId}/metrics`, {- ...date,+ startAt,+ endAt,+ unit,+ timezone,...filters,...params,}),diff --git a/src/components/hooks/queries/useWebsitePageviewsQuery.ts b/src/components/hooks/queries/useWebsitePageviewsQuery.tsindex 5784cae8e..6f471bab0 100644--- a/src/components/hooks/queries/useWebsitePageviewsQuery.ts+++ b/src/components/hooks/queries/useWebsitePageviewsQuery.ts@@ -13,12 +13,23 @@ export function useWebsitePageviewsQuery(options?: ReactQueryOptions<WebsitePageviewsData>,) {const { get, useQuery } = useApi();- const date = useDateParameters();+ const { startAt, endAt, unit, timezone } = useDateParameters();const queryParams = useFilterParameters();return useQuery<WebsitePageviewsData>({- queryKey: ['websites:pageviews', { websiteId, compare, ...date, ...queryParams }],- queryFn: () => get(`/websites/${websiteId}/pageviews`, { compare, ...date, ...queryParams }),+ queryKey: [+ 'websites:pageviews',+ { websiteId, compare, startAt, endAt, unit, timezone, ...queryParams },+ ],+ queryFn: () =>+ get(`/websites/${websiteId}/pageviews`, {+ compare,+ startAt,+ endAt,+ unit,+ timezone,+ ...queryParams,+ }),enabled: !!websiteId,...options,});diff --git a/src/components/hooks/queries/useWebsiteStatsQuery.ts b/src/components/hooks/queries/useWebsiteStatsQuery.tsindex 98ae9d8ff..64304b1b9 100644--- a/src/components/hooks/queries/useWebsiteStatsQuery.ts+++ b/src/components/hooks/queries/useWebsiteStatsQuery.ts@@ -23,12 +23,13 @@ export function useWebsiteStatsQuery(options?: UseQueryOptions<WebsiteStatsData, Error, WebsiteStatsData>,) {const { get, useQuery } = useApi();- const date = useDateParameters();+ const { startAt, endAt, unit, timezone } = useDateParameters();const filters = useFilterParameters();return useQuery<WebsiteStatsData>({- queryKey: ['websites:stats', { websiteId, ...date, ...filters }],- queryFn: () => get(`/websites/${websiteId}/stats`, { ...date, ...filters }),+ queryKey: ['websites:stats', { websiteId, startAt, endAt, unit, timezone, ...filters }],+ queryFn: () =>+ get(`/websites/${websiteId}/stats`, { startAt, endAt, unit, timezone, ...filters }),enabled: !!websiteId,...options,});