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

finish expanded queries and ui.

Browse source
This commit is contained in:
Francis Cao 2025-08-07 09:47:18 -07:00
parent 0a0c1f27c6
commit 38f251ead5
12 changed files with 119 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/queries/sql/sessions/getWebsiteSessions.ts
View file

@ -20,7 +20,13 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
search: search ? `%${search}%` : undefined,
});
const searchQuery = search ? `and session.distinct_id ilike {{search}}` : '';
const searchQuery = search
? `and (distinct_id ilike {{search}}
or city ilike {{search}}
or browser ilike {{search}}
or os ilike {{search}}
or device ilike {{search}})`
: '';
return pagedRawQuery(
`
@ -74,7 +80,13 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
websiteId,
});
const searchQuery = search ? `and positionCaseInsensitive(distinct_id, {search:String}) > 0` : '';
const searchQuery = search
? `and ((positionCaseInsensitive(distinct_id, {search:String}) > 0)
or (positionCaseInsensitive(city, {search:String}) > 0)
or (positionCaseInsensitive(browser, {search:String}) > 0)
or (positionCaseInsensitive(os, {search:String}) > 0)
or (positionCaseInsensitive(device, {search:String}) > 0))`
: '';
let sql = '';