github/umami
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Made filters work for all reports.

Browse Source
This commit is contained in:
Mike Cao
2025-06-29 23:57:11 -07:00
parent ea83afbc13
commit 8b64029409
46 changed files with 328 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/queries/sql/events/getEventMetrics.ts
View File

@@ -22,7 +22,7 @@ export async function getEventMetrics(
async function relationalQuery(websiteId: string, filters: QueryFilters) {
const { timezone = 'utc', unit = 'day' } = filters;
const { rawQuery, getDateSQL, parseFilters } = prisma;
const { filterQuery, joinSession, params } = await parseFilters(websiteId, {
const { filterQuery, joinSession, filterParams } = await parseFilters(websiteId, {
...filters,
eventType: EVENT_TYPE.customEvent,
});
@@ -42,7 +42,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
group by 1, 2
order by 2
`,
params,
filterParams,
);
}
@@ -52,7 +52,7 @@ async function clickhouseQuery(
): Promise<{ x: string; t: string; y: number }[]> {
const { timezone = 'UTC', unit = 'day' } = filters;
const { rawQuery, getDateSQL, parseFilters } = clickhouse;
const { filterQuery, params } = await parseFilters(websiteId, {
const { filterQuery, filterParams } = await parseFilters(websiteId, {
...filters,
eventType: EVENT_TYPE.customEvent,
});
@@ -92,5 +92,5 @@ async function clickhouseQuery(
`;
}
return rawQuery(sql, params);
return rawQuery(sql, filterParams);
}