mirror of
https://github.com/umami-software/umami.git
synced 2026-02-04 04:37:11 +01:00
Refactor part 2: Electric Boogaloo. Standardize way of passing filter parameters.
This commit is contained in:
parent
f26f1b0581
commit
cdf391d5c2
90 changed files with 867 additions and 709 deletions
|
|
@ -1,6 +1,7 @@
|
|||
import { UseQueryOptions } from '@tanstack/react-query';
|
||||
import { useApi } from '../useApi';
|
||||
import { useFilterParams } from '../useFilterParams';
|
||||
import { useFilterParameters } from '../useFilterParameters';
|
||||
import { useDateParameters } from '@/components/hooks/useDateParameters';
|
||||
|
||||
export interface WebsiteStatsData {
|
||||
pageviews: number;
|
||||
|
|
@ -8,7 +9,7 @@ export interface WebsiteStatsData {
|
|||
visits: number;
|
||||
bounces: number;
|
||||
totaltime: number;
|
||||
previous: {
|
||||
comparison: {
|
||||
pageviews: number;
|
||||
visitors: number;
|
||||
visits: number;
|
||||
|
|
@ -22,11 +23,12 @@ export function useWebsiteStatsQuery(
|
|||
options?: UseQueryOptions<WebsiteStatsData, Error, WebsiteStatsData>,
|
||||
) {
|
||||
const { get, useQuery } = useApi();
|
||||
const filterParams = useFilterParams(websiteId);
|
||||
const date = useDateParameters(websiteId);
|
||||
const filters = useFilterParameters();
|
||||
|
||||
return useQuery<WebsiteStatsData>({
|
||||
queryKey: ['websites:stats', { websiteId, ...filterParams }],
|
||||
queryFn: () => get(`/websites/${websiteId}/stats`, { ...filterParams }),
|
||||
queryKey: ['websites:stats', { websiteId, ...date, ...filters }],
|
||||
queryFn: () => get(`/websites/${websiteId}/stats`, { ...date, ...filters }),
|
||||
enabled: !!websiteId,
|
||||
...options,
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue