watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-10 07:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge remote-tracking branch 'origin/dev' into dev

Browse source 
# Conflicts:
#	src/queries/analytics/getWebsiteStats.ts
This commit is contained in:
Mike Cao 2024-08-19 10:55:39 -07:00
commit 07576bef61
11 changed files with 233 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/queries/analytics/events/getEventDataProperties.ts
View file

@ -24,14 +24,15 @@ async function relationalQuery(
return rawQuery(
`
select
event_name as "eventName",
data_key as "propertyName",
we.event_name as "eventName",
ed.data_key as "propertyName",
count(*) as "total"
from event_data
where website_id = {{websiteId::uuid}}
and created_at between {{startDate}} and {{endDate}}
from event_data ed
join website_event we on we.event_id = ed.website_event_id
where ed.website_id = {{websiteId::uuid}}
and ed.created_at between {{startDate}} and {{endDate}}
${filterQuery}
group by event_name, data_key
group by we.event_name, ed.data_key
order by 3 desc
limit 500
`,