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

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

Browse Source 
# Conflicts:
#	src/app/(main)/App.tsx
This commit is contained in:
Mike Cao
2025-08-07 05:16:07 -07:00
parent eb7b6978d3 0a0c1f27c6
commit 2e67e27b2f
27 changed files with 854 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/clickhouse.ts
View File

@@ -90,7 +90,11 @@ function mapFilter(column: string, operator: string, name: string, type: string
function getFilterQuery(filters: Record<string, any>, options: QueryOptions = {}) {
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`);