watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-07 14:17:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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 { 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,
}),