watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-14 17:45:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'dev' of https://github.com/umami-software/umami into analytics

Browse source
This commit is contained in:
Francis Cao 2025-05-08 10:34:51 -07:00
commit 5b144e0953
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/queries/sql/getRealtimeActivity.ts
View file

@ -32,7 +32,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
where website_event.website_id = {{websiteId::uuid}} where website_event.website_id = {{websiteId::uuid}}
${filterQuery} ${filterQuery}
${dateQuery} ${dateQuery}
order by website_event.created_at asc order by website_event.created_at desc
limit 100 limit 100
`, `,
params, params,
@ -59,7 +59,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters): Promis
where website_id = {websiteId:UUID} where website_id = {websiteId:UUID}
${filterQuery} ${filterQuery}
${dateQuery} ${dateQuery}
order by createdAt asc order by createdAt desc
limit 100 limit 100
`, `,
params, params,

2
src/queries/sql/getRealtimeData.ts
View file

@ -24,7 +24,7 @@ export async function getRealtimeData(
const uniques = new Set(); const uniques = new Set();
const { countries, urls, referrers, events } = activity.reduce( const { countries, urls, referrers, events } = activity.reverse().reduce(
( (
obj: { countries: any; urls: any; referrers: any; events: any }, obj: { countries: any; urls: any; referrers: any; events: any },
event: { event: {