github/umami
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Updated insights report rendering.

Browse Source
This commit is contained in:
Mike Cao
2023-08-07 23:02:38 -07:00
parent c4bbcf37b7
commit 85c593416a
6 changed files with 64 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
queries/analytics/reports/getInsights.ts
View File

@@ -5,7 +5,7 @@ import { EVENT_TYPE } from 'lib/constants';
import { QueryFilters } from 'lib/types';
export async function getInsights(
...args: [websiteId: string, groups: { name: string; type: string }[], filters: QueryFilters]
...args: [websiteId: string, fields: { name: string; type?: string }[], filters: QueryFilters]
) {
return runQuery({
[PRISMA]: () => relationalQuery(...args),
@@ -15,7 +15,7 @@ export async function getInsights(
async function relationalQuery(
websiteId: string,
groups: { name: string; type: string }[],
fields: { name: string; type?: string }[],
filters: QueryFilters,
): Promise<
{
@@ -49,7 +49,7 @@ async function relationalQuery(
async function clickhouseQuery(
websiteId: string,
groups: { name: string; type: string }[],
fields: { name: string; type?: string }[],
filters: QueryFilters,
): Promise<
{
@@ -66,14 +66,14 @@ async function clickhouseQuery(
return rawQuery(
`
select
${parseFields(groups)}
${parseFields(fields)}
from website_event
where website_id = {websiteId:UUID}
and created_at between {startDate:DateTime} and {endDate:DateTime}
and event_type = {eventType:UInt32}
${filterQuery}
group by ${groups.map(({ name }) => name).join(',')}
order by 1 desc
group by ${fields.map(({ name }) => name).join(',')}
order by 1 desc, 2 desc
limit 500
`,
params,