watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-13 09:05:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

udpate constants and references to filter groups

Browse source
This commit is contained in:
Francis Cao 2025-06-24 11:09:36 -07:00
parent 5ffafc71fc
commit 657ae8ebdb
6 changed files with 39 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/lib/clickhouse.ts
View file

@ -105,6 +105,22 @@ function getFilterQuery(filters: QueryFilters = {}, options: QueryOptions = {})
return query.join('\n');
}
function getCohortQuery(filters: QueryFilters = {}, options: QueryOptions = {}) {
const query = filtersToArray(filters, options).reduce((arr, { name, column, operator }) => {
if (column) {
arr.push(`and ${mapFilter(column, operator, name)}`);
if (name === 'referrer') {
arr.push(`and referrer_domain != hostname`);
}
}
return arr;
}, []);
return query.join('\n');
}
function getDateQuery(filters: QueryFilters = {}) {
const { startDate, endDate, timezone } = filters;
@ -146,6 +162,7 @@ async function parseFilters(websiteId: string, filters: QueryFilters = {}, optio
websiteId,
startDate: maxDate(filters.startDate, new Date(website?.resetAt)),
},
cohortQuery: getCohortQuery(filters),
};
}