watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 12:47:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix filter passthrough into event-data endpoints

Browse source
This commit is contained in:
Francis Cao 2025-10-14 11:22:21 -07:00
parent 9fb38f6970
commit ba45972bd3
9 changed files with 72 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/components/hooks/queries/useEventDataEventsQuery.ts
View file

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

16
src/components/hooks/queries/useEventDataPropertiesQuery.ts
View file

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

16
src/components/hooks/queries/useEventDataQuery.ts
View file

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

15
src/components/hooks/queries/useEventDataValuesQuery.ts
View file

@ -1,7 +1,7 @@
import { useApi } from '../useApi';
import { useFilterParameters } from '../useFilterParameters';
import { useDateParameters } from '../useDateParameters';
import { ReactQueryOptions } from '@/lib/types';
import { useApi } from '../useApi';
import { useDateParameters } from '../useDateParameters';
import { useFilterParameters } from '../useFilterParameters';
export function useEventDataValuesQuery(
websiteId: string,
@ -10,17 +10,20 @@ export function useEventDataValuesQuery(
options?: ReactQueryOptions,
) {
const { get, useQuery } = useApi();
const date = useDateParameters();
const { startAt, endAt, unit, timezone } = useDateParameters();
const filters = useFilterParameters();
return useQuery<any>({
queryKey: [
'websites:event-data:values',
{ websiteId, eventName, propertyName, ...date, ...filters },
{ websiteId, eventName, propertyName, startAt, endAt, unit, timezone, ...filters },
],
queryFn: () =>
get(`/websites/${websiteId}/event-data/values`, {
...date,
startAt,
endAt,
unit,
timezone,
...filters,
eventName,
propertyName,