Merge branch 'dev' of https://github.com/umami-software/umami into analytics
This commit is contained in:
@@ -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,
|
||||||
|
|||||||
@@ -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: {
|
||||||
|
|||||||
Reference in New Issue
Block a user