m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-14 21:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed queries.

Browse Source
This commit is contained in:
Mike Cao 2024-08-19 10:53:31 -07:00
parent e98bc3bd74
commit 8d92509f71
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.module.css
View File

@ -12,7 +12,11 @@
.time { .time {
color: var(--font-color200); color: var(--font-color200);
width: 120px; width: 150px;
}
.value {
white-space: nowrap;
} }
.header { .header {

2
src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
View File

@ -42,7 +42,7 @@ export function SessionActivity({
</StatusLight> </StatusLight>
</div> </div>
<Icon>{eventName ? <Icons.Bolt /> : <Icons.Eye />}</Icon> <Icon>{eventName ? <Icons.Bolt /> : <Icons.Eye />}</Icon>
<div>{eventName || urlPath}</div> <div className={styles.value}>{eventName || urlPath}</div>
</div> </div>
</> </>
); );

3
src/queries/analytics/events/getWebsiteEvents.ts
View File

@ -17,12 +17,11 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, pagePar
const { query } = pageParams; const { query } = pageParams;
const where = { const where = {
...filters,
id: websiteId, id: websiteId,
...prisma.getSearchParameters(query, [{ eventName: 'contains' }, { urlPath: 'contains' }]), ...prisma.getSearchParameters(query, [{ eventName: 'contains' }, { urlPath: 'contains' }]),
}; };
return pagedQuery('website_event', { where }, pageParams); return pagedQuery('WebsiteEvent', { where }, pageParams);
} }
async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) { async function clickhouseQuery(websiteId: string, filters: QueryFilters, pageParams?: PageParams) {

10
src/queries/analytics/getWebsiteStats.ts
View File

@ -22,9 +22,13 @@ async function relationalQuery(
{ pageviews: number; visitors: number; visits: number; bounces: number; totaltime: number }[] { pageviews: number; visitors: number; visits: number; bounces: number; totaltime: number }[]
> { > {
const { getTimestampDiffSQL, parseFilters, rawQuery } = prisma; const { getTimestampDiffSQL, parseFilters, rawQuery } = prisma;
const { filterQuery, joinSession, params } = await parseFilters(websiteId, { const { filterQuery, joinSession, params } = await parseFilters(
websiteId,
{
...filters, ...filters,
}); },
{ joinSession: true },
);
return rawQuery( return rawQuery(
` `
@ -34,7 +38,7 @@ async function relationalQuery(
count(distinct t.visit_id) as "visits", count(distinct t.visit_id) as "visits",
count(distinct t.country) as "countries", count(distinct t.country) as "countries",
sum(case when t.c = 1 then 1 else 0 end) as "bounces", sum(case when t.c = 1 then 1 else 0 end) as "bounces",
sum(${getTimestampDiffSQL('t.min_time', 't.max_time')}) as "totaltime", sum(${getTimestampDiffSQL('t.min_time', 't.max_time')}) as "totaltime"
from ( from (
select select
website_event.session_id, website_event.session_id,