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

Refactor filter handling for queries.

Browse Source
This commit is contained in:
Mike Cao
2025-07-02 01:44:12 -07:00
parent 5b300f1ff5
commit ee6c68d27c
107 changed files with 731 additions and 835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/queries/sql/reports/getFunnel.ts
View File

@@ -126,7 +126,7 @@ async function clickhouseQuery(
steps,
windowMinutes,
);
const { filterQuery, filterParams: filterParams } = await parseFilters(websiteId, criteria);
const { filterQuery, queryParams } = await parseFilters(criteria);
function getFunnelQuery(
steps: { type: string; value: string }[],
@@ -136,7 +136,7 @@ async function clickhouseQuery(
levelQuery: string;
sumQuery: string;
stepFilterQuery: string;
params: { [key: string]: string };
params: Record<string, string>;
} {
return steps.reduce(
(pv, cv, i) => {
@@ -215,7 +215,7 @@ async function clickhouseQuery(
startDate,
endDate,
...params,
...filterParams,
...queryParams,
},
).then(formatResults(steps));
}