From 4b3b9f1ee1898a872b593fdf3cd1dba1dc55ef73 Mon Sep 17 00:00:00 2001 From: Francis Cao Date: Wed, 12 Feb 2025 09:51:45 -0800 Subject: [PATCH] change referrers table from views to visitors --- src/components/metrics/ReferrersTable.tsx | 2 +- src/queries/sql/pageviews/getPageviewMetrics.ts | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/components/metrics/ReferrersTable.tsx b/src/components/metrics/ReferrersTable.tsx index 142f361b..db40a617 100644 --- a/src/components/metrics/ReferrersTable.tsx +++ b/src/components/metrics/ReferrersTable.tsx @@ -87,7 +87,7 @@ export function ReferrersTable({ allowFilter, ...props }: ReferrersTableProps) { {...props} title={formatMessage(labels.referrers)} type="referrer" - metric={formatMessage(labels.views)} + metric={formatMessage(labels.visitors)} dataFilter={view === 'grouped' ? groupedFilter : undefined} renderLabel={renderLink} > diff --git a/src/queries/sql/pageviews/getPageviewMetrics.ts b/src/queries/sql/pageviews/getPageviewMetrics.ts index f7604298..344a5e94 100644 --- a/src/queries/sql/pageviews/getPageviewMetrics.ts +++ b/src/queries/sql/pageviews/getPageviewMetrics.ts @@ -62,7 +62,8 @@ async function relationalQuery( return rawQuery( ` - select ${column} x, count(*) y + select ${column} x, + ${column === 'referrer_domain' ? 'count(distinct session_id)' : 'count(*)'} as y from website_event ${joinSession} ${entryExitQuery} @@ -119,7 +120,8 @@ async function clickhouseQuery( } sql = ` - select ${column} x, count(*) y + select ${column} x, + ${column === 'referrer_domain' ? 'uniq(session_id)' : 'count(*)'} as y from website_event ${entryExitQuery} where website_id = {websiteId:UUID} @@ -133,13 +135,13 @@ async function clickhouseQuery( `; } else { let groupByQuery = ''; + let columnQuery = `arrayJoin(${column})`; if (column === 'referrer_domain') { excludeDomain = `and t != hostname and hostname != ''`; + columnQuery = `session_id s, arrayJoin(${column})`; } - let columnQuery = `arrayJoin(${column})`; - if (type === 'entry') { columnQuery = `visit_id x, argMinMerge(entry_url)`; } @@ -154,7 +156,7 @@ async function clickhouseQuery( sql = ` select g.t as x, - count(*) as y + ${column === 'referrer_domain' ? 'uniq(s)' : 'count(*)'} as y from ( select ${columnQuery} as t from website_event_stats_hourly website_event