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

Implement react-basics styles. Fix queries.

Browse source
This commit is contained in:
Mike Cao 2022-12-08 23:43:43 -08:00
parent b57ecf33e6
commit 0a6ecfe3d2
59 changed files with 227 additions and 4336 deletions
Download patch file Download diff file Expand all files Collapse all files

7
queries/analytics/pageview/getPageviewMetrics.ts
View file

@ -63,7 +63,7 @@ async function clickhouseQuery(
const { startDate, endDate, column, filters = {} } = data;
const { rawQuery, parseFilters, getBetweenDates } = clickhouse;
const website = await cache.fetchWebsite(websiteId);
const params = [websiteId, website?.revId || 0];
const params = [websiteId, website?.revId || 0, EVENT_TYPE.pageView];
const { filterQuery } = parseFilters(filters, params);
return rawQuery(
@ -71,9 +71,8 @@ async function clickhouseQuery(
from event
where website_id = $1
and rev_id = $2
and event_type = ${EVENT_TYPE.pageView}
${column !== 'event_name' ? `and event_name = ''` : `and event_name != ''`}
and ${getBetweenDates('created_at', startDate, endDate)}n
and event_type = $3
and ${getBetweenDates('created_at', startDate, endDate)}
${filterQuery}
group by x
order by y desc`,