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 event/event-data endpoints. fix for expanded view for mobile

Browse source
This commit is contained in:
Francis Cao 2025-10-15 11:32:19 -07:00
parent 9df012084d
commit a2b1089e62
8 changed files with 47 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/components/hooks/queries/useWebsiteEventsQuery.ts
View file

@ -15,14 +15,20 @@ export function useWebsiteEventsQuery(
options?: ReactQueryOptions,
) {
const { get } = useApi();
const date = useDateParameters();
const { startAt, endAt, unit, timezone } = useDateParameters();
const filters = useFilterParameters();
return usePagedQuery({
queryKey: ['websites:events', { websiteId, ...date, ...filters, ...params }],
queryKey: [
'websites:events',
{ websiteId, startAt, endAt, unit, timezone, ...filters, ...params },
],
queryFn: pageParams =>
get(`/websites/${websiteId}/events`, {
...date,
startAt,
endAt,
unit,
timezone,
...filters,
...pageParams,
eventType: EVENT_TYPES[params.view],

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

@ -5,12 +5,13 @@ import { ReactQueryOptions } from '@/lib/types';
export function useWebsiteEventsSeriesQuery(websiteId: string, options?: ReactQueryOptions) {
const { get, useQuery } = useApi();
const date = useDateParameters();
const { startAt, endAt, unit, timezone } = useDateParameters();
const filters = useFilterParameters();
return useQuery({
queryKey: ['websites:events:series', { websiteId, ...date, ...filters }],
queryFn: () => get(`/websites/${websiteId}/events/series`, { ...date, ...filters }),
queryKey: ['websites:events:series', { websiteId, startAt, endAt, unit, timezone, ...filters }],
queryFn: () =>
get(`/websites/${websiteId}/events/series`, { startAt, endAt, unit, timezone, ...filters }),
enabled: !!websiteId,
...options,
});