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

Made filters work for all reports.

Browse Source
This commit is contained in:
Mike Cao
2025-06-29 23:57:11 -07:00
parent ea83afbc13
commit 8b64029409
46 changed files with 328 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/queries/sql/sessions/getWebsiteSessions.ts
View File

@@ -15,7 +15,7 @@ export async function getWebsiteSessions(
async function relationalQuery(websiteId: string, filters: QueryFilters, pageParams: PageParams) {
const { pagedRawQuery, parseFilters } = prisma;
const { search } = pageParams;
const { filterQuery, params } = await parseFilters(websiteId, {
const { filterQuery, filterParams } = await parseFilters(websiteId, {
...filters,
});
@@ -68,14 +68,14 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
session.city
order by max(website_event.created_at) desc
`,
{ ...params, search: `%${search}%` },
{ ...filterParams, search: `%${search}%` },
pageParams,
);
}
async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {
const { pagedQuery, parseFilters, getDateStringSQL } = clickhouse;
const { params, dateQuery, filterQuery } = await parseFilters(websiteId, filters);
const { filterParams, dateQuery, filterQuery } = await parseFilters(websiteId, filters);
const { search } = pageParams;
return pagedQuery(
@@ -113,7 +113,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
group by session_id, website_id, hostname, browser, os, device, screen, language, country, region, city
order by lastAt desc
`,
{ ...params, search },
{ ...filterParams, search },
pageParams,
);
}