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

fix event type queries for pixels/links. remove hardcoded event types

Browse source
This commit is contained in:
Francis Cao 2025-10-01 12:29:31 -07:00
parent f86c21b25b
commit 1809959b99
14 changed files with 42 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/app/api/websites/[websiteId]/metrics/route.ts
View file

@ -1,7 +1,8 @@
import { canViewWebsite } from '@/permissions';
import { EVENT_COLUMNS, EVENT_TYPE, FILTER_COLUMNS, SESSION_COLUMNS } from '@/lib/constants';
import { EVENT_COLUMNS, EVENT_TYPE, SESSION_COLUMNS } from '@/lib/constants';
import { getQueryFilters, parseRequest } from '@/lib/request';
import { badRequest, json, unauthorized } from '@/lib/response';
import { dateRangeParams, filterParams, searchParams } from '@/lib/schema';
import { canViewWebsite } from '@/permissions';
import {
getChannelMetrics,
getEventMetrics,
@ -9,7 +10,6 @@ import {
getSessionMetrics,
} from '@/queries/sql';
import { z } from 'zod';
import { dateRangeParams, filterParams, searchParams } from '@/lib/schema';
export async function GET(
request: Request,
@ -50,13 +50,8 @@ export async function GET(
}
if (EVENT_COLUMNS.includes(type)) {
const column = FILTER_COLUMNS[type] || type;
if (column === 'event_name') {
filters.eventType = EVENT_TYPE.customEvent;
}
if (type === 'event') {
filters.eventType = EVENT_TYPE.customEvent;
return json(await getEventMetrics(websiteId, { type, limit, offset }, filters));
} else {
return json(await getPageviewMetrics(websiteId, { type, limit, offset }, filters));