Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Merge remote-tracking branch 'origin/dev' into dev

Mike Cao2e67e27b2ffc
diff --cc src/lib/clickhouse.ts
index 233a78bf1,bcb02d0d0..fb5e12272
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@@ -88,9 -88,13 +88,13 @@@ function mapFilter(column: string, oper
}
function getFilterQuery(filters: Record<string, any>, options: QueryOptions = {}) {
- const query = filtersToArray(filters, options).reduce((arr, { name, column, operator }) => {
+ const query = filtersObjectToArray(filters, options).reduce((arr, { name, column, operator }) => {
if (column) {
- arr.push(`and ${mapFilter(column, operator, name)}`);
+ if (name === 'eventType') {
+ arr.push(`and ${mapFilter(column, operator, name, 'UInt32')}`);
+ } else {
+ arr.push(`and ${mapFilter(column, operator, name)}`);
+ }
if (name === 'referrer') {
arr.push(`and referrer_domain != hostname`);