watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-10 23:57:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Updated events page.

Browse source
This commit is contained in:
Mike Cao 2024-08-07 22:39:36 -07:00
parent 3a97bfe11c
commit c6b8114945
13 changed files with 122 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/queries/analytics/sessions/getWebsiteSessions.ts
View file

@ -14,10 +14,12 @@ export async function getWebsiteSessions(
async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams: PageParams) {
const { pagedQuery } = prisma;
const { query } = pageParams;
const where = {
...filters,
id: websiteId,
...prisma.getSearchParameters(query, [{ eventName: 'contains' }, { urlPath: 'contains' }]),
};
return pagedQuery('session', { where }, pageParams);
@ -26,6 +28,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
const { pagedQuery, parseFilters } = clickhouse;
const { params, dateQuery, filterQuery } = await parseFilters(websiteId, filters);
const { query } = pageParams;
return pagedQuery(
`
@ -49,6 +52,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
where website_id = {websiteId:UUID}
${dateQuery}
${filterQuery}
${query ? `and (positionCaseInsensitive(event_name, {query:String}) > 0)` : ''}
group by session_id, website_id, hostname, browser, os, device, screen, language, country, subdivision1, city
order by lastAt desc
`,