watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-07 06:07:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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
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`);

2
src/lib/constants.ts
View file

@ -35,7 +35,7 @@ export const EVENT_COLUMNS = [
'query',
'event',
'tag',
'host',
'hostname',
];
export const SESSION_COLUMNS = [