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

Fix metrics.

Browse Source
This commit is contained in:
Brian Cao
2023-03-31 14:53:48 -07:00
parent 2172dddd1c
commit d2687b6580
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/clickhouse.ts
View File

@@ -104,7 +104,7 @@ function getEventDataFilterQuery(
return query.join('\n');
}
function getFilterQuery(filters = {}, params = {}) {
function getFilterQuery(filters = {}, params = {}, field: string) {
const query = Object.keys(filters).reduce((arr, key) => {
const filter = filters[key];
@@ -112,6 +112,10 @@ function getFilterQuery(filters = {}, params = {}) {
return arr;
}
if (key === field) {
return arr;
}
switch (key) {
case 'url':
arr.push(`and url_path = {${key}:String}`);
@@ -157,7 +161,7 @@ function getFilterQuery(filters = {}, params = {}) {
return query.join('\n');
}
function parseFilters(filters: any = {}, params: any = {}) {
function parseFilters(filters: any = {}, params: any = {}, field?: string) {
const {
domain,
url,
@@ -184,7 +188,7 @@ function parseFilters(filters: any = {}, params: any = {}) {
sessionFilters,
eventFilters,
event: { eventName },
filterQuery: getFilterQuery(filters, params),
filterQuery: getFilterQuery(filters, params, field),
};
}