watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

clean-up useWebsite query params

Browse source
This commit is contained in:
Francis Cao 2025-10-07 09:07:34 -07:00
parent 0d67f1fdaa
commit d440a44d96
3 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/components/hooks/queries/useWebsiteMetricsQuery.ts
View file

@ -1,8 +1,8 @@
import { ReactQueryOptions } from '@/lib/types';
import { keepPreviousData } from '@tanstack/react-query'; import { keepPreviousData } from '@tanstack/react-query';
import { useApi } from '../useApi'; import { useApi } from '../useApi';
import { useFilterParameters } from '../useFilterParameters';
import { useDateParameters } from '../useDateParameters'; import { useDateParameters } from '../useDateParameters';
import { ReactQueryOptions } from '@/lib/types'; import { useFilterParameters } from '../useFilterParameters';
export type WebsiteMetricsData = { export type WebsiteMetricsData = {
x: string; x: string;
@ -15,7 +15,7 @@ export function useWebsiteMetricsQuery(
options?: ReactQueryOptions<WebsiteMetricsData>, options?: ReactQueryOptions<WebsiteMetricsData>,
) { ) {
const { get, useQuery } = useApi(); const { get, useQuery } = useApi();
const date = useDateParameters(); const { startAt, endAt, unit, timezone } = useDateParameters();
const filters = useFilterParameters(); const filters = useFilterParameters();
return useQuery<WebsiteMetricsData>({ return useQuery<WebsiteMetricsData>({
@ -23,14 +23,20 @@ export function useWebsiteMetricsQuery(
'websites:metrics', 'websites:metrics',
{ {
websiteId, websiteId,
...date, startAt,
endAt,
unit,
timezone,
...filters, ...filters,
...params, ...params,
}, },
], ],
queryFn: async () => queryFn: async () =>
get(`/websites/${websiteId}/metrics`, { get(`/websites/${websiteId}/metrics`, {
...date, startAt,
endAt,
unit,
timezone,
...filters, ...filters,
...params, ...params,
}), }),

17
src/components/hooks/queries/useWebsitePageviewsQuery.ts
View file

@ -13,12 +13,23 @@ export function useWebsitePageviewsQuery(
options?: ReactQueryOptions<WebsitePageviewsData>, options?: ReactQueryOptions<WebsitePageviewsData>,
) { ) {
const { get, useQuery } = useApi(); const { get, useQuery } = useApi();
const date = useDateParameters(); const { startAt, endAt, unit, timezone } = useDateParameters();
const queryParams = useFilterParameters(); const queryParams = useFilterParameters();
return useQuery<WebsitePageviewsData>({ return useQuery<WebsitePageviewsData>({
queryKey: ['websites:pageviews', { websiteId, compare, ...date, ...queryParams }], queryKey: [
queryFn: () => get(`/websites/${websiteId}/pageviews`, { compare, ...date, ...queryParams }), 'websites:pageviews',
{ websiteId, compare, startAt, endAt, unit, timezone, ...queryParams },
],
queryFn: () =>
get(`/websites/${websiteId}/pageviews`, {
compare,
startAt,
endAt,
unit,
timezone,
...queryParams,
}),
enabled: !!websiteId, enabled: !!websiteId,
...options, ...options,
}); });

7
src/components/hooks/queries/useWebsiteStatsQuery.ts
View file

@ -23,12 +23,13 @@ export function useWebsiteStatsQuery(
options?: UseQueryOptions<WebsiteStatsData, Error, WebsiteStatsData>, options?: UseQueryOptions<WebsiteStatsData, Error, WebsiteStatsData>,
) { ) {
const { get, useQuery } = useApi(); const { get, useQuery } = useApi();
const date = useDateParameters(); const { startAt, endAt, unit, timezone } = useDateParameters();
const filters = useFilterParameters(); const filters = useFilterParameters();
return useQuery<WebsiteStatsData>({ return useQuery<WebsiteStatsData>({
queryKey: ['websites:stats', { websiteId, ...date, ...filters }], queryKey: ['websites:stats', { websiteId, startAt, endAt, unit, timezone, ...filters }],
queryFn: () => get(`/websites/${websiteId}/stats`, { ...date, ...filters }), queryFn: () =>
get(`/websites/${websiteId}/stats`, { startAt, endAt, unit, timezone, ...filters }),
enabled: !!websiteId, enabled: !!websiteId,
...options, ...options,
}); });