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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Mike Cao 2025-08-21 01:33:43 -07:00
commit 3a332b5947
40 changed files with 354 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/hooks/queries/useWebsiteCohortsQuery.ts
View file

@ -16,7 +16,7 @@ export function useWebsiteCohortsQuery(
return useQuery({
queryKey: ['website:cohorts', { websiteId, modified, ...filters, ...params }],
queryFn: pageParams => {
return get(`/websites/${websiteId}/cohorts`, { ...pageParams, ...filters, ...params });
return get(`/websites/${websiteId}/segments`, { ...pageParams, ...filters, ...params });
},
enabled: !!websiteId,
placeholderData: keepPreviousData,

3
src/components/hooks/queries/useWebsiteSegmentsQuery.ts
View file

@ -15,7 +15,8 @@ export function useWebsiteSegmentsQuery(
return useQuery({
queryKey: ['website:segments', { websiteId, modified, ...filters, ...params }],
queryFn: () => get(`/websites/${websiteId}/segments`, { ...filters, ...params }),
queryFn: pageParams =>
get(`/websites/${websiteId}/segments`, { ...pageParams, ...filters, ...params }),
enabled: !!websiteId,
placeholderData: keepPreviousData,
...options,