watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-10 23:57:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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/reports/getGoal.ts
View file

@ -21,7 +21,7 @@ export async function getGoal(...args: [websiteId: string, criteria: GoalCriteri
async function relationalQuery(websiteId: string, criteria: GoalCriteria) {
const { type, value } = criteria;
const { rawQuery, parseFilters } = prisma;
const { filterQuery, dateQuery, params } = await parseFilters(websiteId, criteria);
const { filterQuery, dateQuery, filterParams } = await parseFilters(websiteId, criteria);
const isPage = type === 'page';
const column = isPage ? 'url_path' : 'event_name';
const eventType = isPage ? 1 : 2;
@ -43,14 +43,14 @@ async function relationalQuery(websiteId: string, criteria: GoalCriteria) {
${dateQuery}
${filterQuery}
`,
{ ...params, value },
{ ...filterParams, value },
);
}
async function clickhouseQuery(websiteId: string, criteria: GoalCriteria) {
const { type, value } = criteria;
const { rawQuery, parseFilters } = clickhouse;
const { filterQuery, dateQuery, params } = await parseFilters(websiteId, criteria);
const { filterQuery, dateQuery, filterParams } = await parseFilters(websiteId, criteria);
const isPage = type === 'page';
const column = isPage ? 'url_path' : 'event_name';
const eventType = isPage ? 1 : 2;
@ -71,6 +71,6 @@ async function clickhouseQuery(websiteId: string, criteria: GoalCriteria) {
${dateQuery}
${filterQuery}
`,
{ ...params, value },
{ ...filterParams, value },
).then(results => results?.[0]);
}