Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
fix filter passthrough into event-data endpoints
Francis Caoba45972bd3e9
diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex d3ad08bc8..8be50f1de 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -364,8 +364,6 @@ importers:specifier: ^5.9.3version: 5.9.3- dist: {}-packages:'@ampproject/[email protected]':diff --git a/src/app/api/websites/[websiteId]/event-data/properties/route.ts b/src/app/api/websites/[websiteId]/event-data/properties/route.tsindex 0028d7477..c3b884ae7 100644--- a/src/app/api/websites/[websiteId]/event-data/properties/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/properties/route.ts@@ -3,15 +3,16 @@ import { getQueryFilters, parseRequest } from '@/lib/request';import { unauthorized, json } from '@/lib/response';import { canViewWebsite } from '@/permissions';import { getEventDataProperties } from '@/queries/sql';+import { dateRangeParams, filterParams } from '@/lib/schema';export async function GET(request: Request,{ params }: { params: Promise<{ websiteId: string }> },) {const schema = z.object({- startAt: z.coerce.number().int(),- endAt: z.coerce.number().int(),propertyName: z.string().optional(),+ ...dateRangeParams,+ ...filterParams,});const { auth, query, error } = await parseRequest(request, schema);diff --git a/src/app/api/websites/[websiteId]/event-data/values/route.ts b/src/app/api/websites/[websiteId]/event-data/values/route.tsindex 4966764b6..5cf406658 100644--- a/src/app/api/websites/[websiteId]/event-data/values/route.ts+++ b/src/app/api/websites/[websiteId]/event-data/values/route.ts@@ -3,16 +3,17 @@ import { getQueryFilters, parseRequest } from '@/lib/request';import { unauthorized, json } from '@/lib/response';import { canViewWebsite } from '@/permissions';import { getEventDataValues } from '@/queries/sql';+import { dateRangeParams, filterParams } from '@/lib/schema';export async function GET(request: Request,{ params }: { params: Promise<{ websiteId: string }> },) {const schema = z.object({- startAt: z.coerce.number().int(),- endAt: z.coerce.number().int(),eventName: z.string().optional(),propertyName: z.string().optional(),+ ...dateRangeParams,+ ...filterParams,});const { auth, query, error } = await parseRequest(request, schema);diff --git a/src/components/hooks/queries/useEventDataEventsQuery.ts b/src/components/hooks/queries/useEventDataEventsQuery.tsindex 2c91dece5..26a825e3c 100644--- a/src/components/hooks/queries/useEventDataEventsQuery.ts+++ b/src/components/hooks/queries/useEventDataEventsQuery.ts@@ -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,});diff --git a/src/components/hooks/queries/useEventDataPropertiesQuery.ts b/src/components/hooks/queries/useEventDataPropertiesQuery.tsindex 19a2eb61d..74dd58ef2 100644--- a/src/components/hooks/queries/useEventDataPropertiesQuery.ts+++ b/src/components/hooks/queries/useEventDataPropertiesQuery.ts@@ -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,});diff --git a/src/components/hooks/queries/useEventDataQuery.ts b/src/components/hooks/queries/useEventDataQuery.tsindex 7e6f66ec2..5e21081ac 100644--- a/src/components/hooks/queries/useEventDataQuery.ts+++ b/src/components/hooks/queries/useEventDataQuery.ts@@ -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,});diff --git a/src/components/hooks/queries/useEventDataValuesQuery.ts b/src/components/hooks/queries/useEventDataValuesQuery.tsindex de3b0590b..6394a1bb4 100644--- a/src/components/hooks/queries/useEventDataValuesQuery.ts+++ b/src/components/hooks/queries/useEventDataValuesQuery.ts@@ -1,7 +1,7 @@+import { ReactQueryOptions } from '@/lib/types';import { useApi } from '../useApi';-import { useFilterParameters } from '../useFilterParameters';import { useDateParameters } from '../useDateParameters';-import { ReactQueryOptions } from '@/lib/types';+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,diff --git a/src/queries/sql/events/getEventDataProperties.ts b/src/queries/sql/events/getEventDataProperties.tsindex 60b46bcce..7a618fd2e 100644--- a/src/queries/sql/events/getEventDataProperties.ts+++ b/src/queries/sql/events/getEventDataProperties.ts@@ -68,10 +68,15 @@ async function clickhouseQuery(event_name as eventName,data_key as propertyName,count(*) as total- from event_data website_event+ from event_data+ join website_event+ on website_event.event_id = event_data.event_id+ and website_event.website_id = event_data.website_id+ and website_event.website_id = {websiteId:UUID}+ and website_event.created_at between {startDate:DateTime64} and {endDate:DateTime64}${cohortQuery}- where website_id = {websiteId:UUID}- and created_at between {startDate:DateTime64} and {endDate:DateTime64}+ where event_data.website_id = {websiteId:UUID}+ and event_data.created_at between {startDate:DateTime64} and {endDate:DateTime64}${filterQuery}group by event_name, data_keyorder by 1, 3 descdiff --git a/src/queries/sql/events/getEventDataValues.ts b/src/queries/sql/events/getEventDataValues.tsindex bdfe7482e..0af938304 100644--- a/src/queries/sql/events/getEventDataValues.ts+++ b/src/queries/sql/events/getEventDataValues.ts@@ -75,12 +75,17 @@ async function clickhouseQuery(data_type = 4, toString(date_trunc('hour', date_value)),string_value) as "value",count(*) as "total"- from event_data website_event+ from event_data+ join website_event+ on website_event.event_id = event_data.event_id+ and website_event.website_id = event_data.website_id+ and website_event.website_id = {websiteId:UUID}+ and website_event.created_at between {startDate:DateTime64} and {endDate:DateTime64}${cohortQuery}- where website_id = {websiteId:UUID}- and created_at between {startDate:DateTime64} and {endDate:DateTime64}- and data_key = {propertyName:String}- and event_name = {eventName:String}+ where event_data.website_id = {websiteId:UUID}+ and event_data.created_at between {startDate:DateTime64} and {endDate:DateTime64}+ and event_data.data_key = {propertyName:String}+ and event_data.event_name = {eventName:String}${filterQuery}group by valueorder by 2 desc