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

Fixed event search. Removed session time from profile.

Browse source
This commit is contained in:
Mike Cao 2024-08-11 23:14:02 -07:00
parent 1e52eeb0f0
commit 78728b8706
5 changed files with 37 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/queries/analytics/events/getWebsiteEvents.ts
View file

@ -14,10 +14,12 @@ export function getWebsiteEvents(
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('website_event', { where }, pageParams);
@ -47,7 +49,12 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters, pagePar
where website_id = {websiteId:UUID}
${dateQuery}
${filterQuery}
${query ? `and (positionCaseInsensitive(event_name, {query:String}) > 0)` : ''}
${
query
? `and (positionCaseInsensitive(event_name, {query:String}) > 0
or positionCaseInsensitive(url_path, {query:String}) > 0)`
: ''
}
order by created_at desc
`,
{ ...params, query },

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

@ -14,12 +14,10 @@ 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);
@ -28,7 +26,6 @@ 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(
`
@ -52,14 +49,22 @@ 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
`,
params,
pageParams,
).then((result: any) => ({
...result,
visits: Number(result.visits),
}));
).then((result: any) => {
return {
...result,
data: result.data.map((row: any) => {
return {
...row,
createdAt: row.firstAt,
visits: Number(row.visits),
views: Number(row.views),
};
}),
};
});
}