mirror of
https://github.com/umami-software/umami.git
synced 2026-02-05 13:17:19 +01:00
Updated segment handling.
This commit is contained in:
parent
554c627a58
commit
fba7e12c36
13 changed files with 59 additions and 90 deletions
|
|
@ -2,7 +2,6 @@ import { keepPreviousData } from '@tanstack/react-query';
|
|||
import { useApi } from '../useApi';
|
||||
import { useFilterParameters } from '../useFilterParameters';
|
||||
import { useDateParameters } from '../useDateParameters';
|
||||
import { useSearchParams } from 'next/navigation';
|
||||
import { ReactQueryOptions } from '@/lib/types';
|
||||
|
||||
export type WebsiteMetricsData = {
|
||||
|
|
@ -18,7 +17,6 @@ export function useWebsiteMetricsQuery(
|
|||
const { get, useQuery } = useApi();
|
||||
const date = useDateParameters(websiteId);
|
||||
const filters = useFilterParameters();
|
||||
const searchParams = useSearchParams();
|
||||
|
||||
return useQuery<WebsiteMetricsData>({
|
||||
queryKey: [
|
||||
|
|
@ -34,7 +32,6 @@ export function useWebsiteMetricsQuery(
|
|||
get(`/websites/${websiteId}/metrics`, {
|
||||
...date,
|
||||
...filters,
|
||||
[searchParams.get('view')]: undefined,
|
||||
...params,
|
||||
}),
|
||||
enabled: !!websiteId,
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ export function useFilterParameters() {
|
|||
page,
|
||||
pageSize,
|
||||
search,
|
||||
segment,
|
||||
cohort,
|
||||
},
|
||||
} = useNavigation();
|
||||
|
||||
|
|
@ -41,6 +43,8 @@ export function useFilterParameters() {
|
|||
tag,
|
||||
hostname,
|
||||
search,
|
||||
segment,
|
||||
cohort,
|
||||
};
|
||||
}, [
|
||||
path,
|
||||
|
|
@ -60,5 +64,7 @@ export function useFilterParameters() {
|
|||
page,
|
||||
pageSize,
|
||||
search,
|
||||
segment,
|
||||
cohort,
|
||||
]);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue