From d7f20dd3bffb042366efc44aa18f02443e3a491c Mon Sep 17 00:00:00 2001 From: Francis Cao Date: Tue, 4 Feb 2025 15:45:51 -0800 Subject: [PATCH] Revert "add none/direct back to referrers table" This reverts commit 10a31a7513529c06eb391b1ea0d40699749fbf97. --- next-env.d.ts | 2 +- src/components/common/FilterLink.tsx | 2 +- src/components/messages.ts | 1 - src/components/metrics/ReferrersTable.tsx | 2 +- src/queries/analytics/pageviews/getPageviewMetrics.ts | 5 +++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/next-env.d.ts b/next-env.d.ts index 725dd6f2..3cd7048e 100644 --- a/next-env.d.ts +++ b/next-env.d.ts @@ -3,4 +3,4 @@ /// // NOTE: This file should not be edited -// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information. +// see https://nextjs.org/docs/app/api-reference/config/typescript for more information. diff --git a/src/components/common/FilterLink.tsx b/src/components/common/FilterLink.tsx index 26ececda..ef278ed2 100644 --- a/src/components/common/FilterLink.tsx +++ b/src/components/common/FilterLink.tsx @@ -42,7 +42,7 @@ export function FilterLink({ {safeDecodeURIComponent(label || value)} )} - {value && ( + {externalUrl && ( diff --git a/src/components/messages.ts b/src/components/messages.ts index e58d77ad..688dd11d 100644 --- a/src/components/messages.ts +++ b/src/components/messages.ts @@ -113,7 +113,6 @@ export const labels = defineMessages({ filterRaw: { id: 'label.filter-raw', defaultMessage: 'Raw' }, views: { id: 'label.views', defaultMessage: 'Views' }, none: { id: 'label.none', defaultMessage: 'None' }, - directNone: { id: 'label.direct-none', defaultMessage: 'Direct / None' }, clearAll: { id: 'label.clear-all', defaultMessage: 'Clear all' }, property: { id: 'label.property', defaultMessage: 'Property' }, today: { id: 'label.today', defaultMessage: 'Today' }, diff --git a/src/components/metrics/ReferrersTable.tsx b/src/components/metrics/ReferrersTable.tsx index 5785915f..d83c4d12 100644 --- a/src/components/metrics/ReferrersTable.tsx +++ b/src/components/metrics/ReferrersTable.tsx @@ -12,7 +12,7 @@ export function ReferrersTable(props: MetricsTableProps) { id="referrer" value={referrer} externalUrl={`https://${referrer}`} - label={!referrer && formatMessage(labels.directNone)} + label={!referrer && formatMessage(labels.none)} > diff --git a/src/queries/analytics/pageviews/getPageviewMetrics.ts b/src/queries/analytics/pageviews/getPageviewMetrics.ts index f089d6e3..f734b1dd 100644 --- a/src/queries/analytics/pageviews/getPageviewMetrics.ts +++ b/src/queries/analytics/pageviews/getPageviewMetrics.ts @@ -34,7 +34,8 @@ async function relationalQuery( let entryExitQuery = ''; let excludeDomain = ''; if (column === 'referrer_domain') { - excludeDomain = `and website_event.referrer_domain != {{websiteDomain}}`; + excludeDomain = `and website_event.referrer_domain != {{websiteDomain}} + and website_event.referrer_domain is not null`; } if (type === 'entry' || type === 'exit') { @@ -96,7 +97,7 @@ async function clickhouseQuery( let entryExitQuery = ''; if (column === 'referrer_domain') { - excludeDomain = `and referrer_domain != {websiteDomain:String}`; + excludeDomain = `and referrer_domain != {websiteDomain:String} and referrer_domain != ''`; } if (type === 'entry' || type === 'exit') {