A platform for community discussion. Free, open, simple.
FEATURE: Surface Direct traffic in the Top referrers dashboard card (#40470)
Alan Guo Xiang Tane2cd61fb86ba
diff --git a/app/models/concerns/reports/top_referrers_by_browser_pageviews.rb b/app/models/concerns/reports/top_referrers_by_browser_pageviews.rbindex 25ae84b599d..c666f23d93a 100644--- a/app/models/concerns/reports/top_referrers_by_browser_pageviews.rb+++ b/app/models/concerns/reports/top_referrers_by_browser_pageviews.rb@@ -11,7 +11,7 @@ module Reports::TopReferrersByBrowserPageviewsreport.labels = [{- property: :normalized_referrer,+ property: :referrer_label,type: :text,title: I18n.t("reports.top_referrers_by_browser_pageviews.labels.normalized_referrer"),},@@ -37,10 +37,11 @@ module Reports::TopReferrersByBrowserPageviewsFROM browser_pageview_referrer_daily_rollupsWHERE date >= :start_dateAND date < :end_date_exclusive- AND normalized_referrer IS NOT NULL- AND normalized_referrer <> :host_exact- AND normalized_referrer NOT LIKE :host_path_prefix ESCAPE '\\'- AND normalized_referrer NOT LIKE :host_query_prefix ESCAPE '\\'+ AND (normalized_referrer IS NULL OR (+ normalized_referrer <> :host_exact+ AND normalized_referrer NOT LIKE :host_path_prefix ESCAPE '\\'+ AND normalized_referrer NOT LIKE :host_query_prefix ESCAPE '\\'+ ))GROUP BY normalized_referrerHAVING SUM(#{count_expr}) > 0)@@ -48,7 +49,7 @@ module Reports::TopReferrersByBrowserPageviewsCASE WHEN total = 0 THEN 0ELSE ROUND((count::numeric / total) * 100)::integer END AS percentFROM ranked- ORDER BY count DESC, normalized_referrer ASC+ ORDER BY (normalized_referrer IS NULL) DESC, count DESC, normalized_referrer ASCLIMIT :limitSQL@@ -64,7 +65,14 @@ module Reports::TopReferrersByBrowserPageviewslimit: MAX_ROWS,).map do |row|- { normalized_referrer: row.normalized_referrer, count: row.count, percent: row.percent }+ {+ normalized_referrer: row.normalized_referrer,+ referrer_label:+ row.normalized_referrer ||+ I18n.t("reports.top_referrers_by_browser_pageviews.direct"),+ count: row.count,+ percent: row.percent,+ }endendenddiff --git a/config/locales/server.en.yml b/config/locales/server.en.ymlindex 4bc0fbf3ac9..2dde59496bc 100644--- a/config/locales/server.en.yml+++ b/config/locales/server.en.yml@@ -1591,6 +1591,7 @@ en:top_referrers_by_browser_pageviews:title: "Top referrers"description: "External sites referring the most browser pageviews to your forum in the selected period."+ direct: "Direct"labels:normalized_referrer: "Referrer"count: "Visits"diff --git a/frontend/discourse/admin/components/dashboard/traffic.gjs b/frontend/discourse/admin/components/dashboard/traffic.gjsindex 27f9cd8fa1c..76fd19f7d98 100644--- a/frontend/discourse/admin/components/dashboard/traffic.gjs+++ b/frontend/discourse/admin/components/dashboard/traffic.gjs@@ -320,14 +320,20 @@ export default class DashboardTraffic extends Component {<ul class="db-traffic__list">{{#each @traffic.top_referrers.rows as |row|}}<li class="db-traffic__list-row">- <a- class="db-traffic__link"- href={{concat "https://" row.normalized_referrer}}- rel="noopener noreferrer nofollow ugc"- target="_blank"- >- {{row.normalized_referrer}}- </a>+ {{#if row.normalized_referrer}}+ <a+ class="db-traffic__link"+ href={{concat "https://" row.normalized_referrer}}+ rel="noopener noreferrer nofollow ugc"+ target="_blank"+ >+ {{row.referrer_label}}+ </a>+ {{else}}+ <span class="db-traffic__name">+ {{row.referrer_label}}+ </span>+ {{/if}}<span class="db-traffic__metric"><span class="db-traffic__percent">{{row.percent}}%diff --git a/spec/models/reports/top_referrers_by_browser_pageviews_spec.rb b/spec/models/reports/top_referrers_by_browser_pageviews_spec.rbindex 1e19d459e13..f6fd3f6055e 100644--- a/spec/models/reports/top_referrers_by_browser_pageviews_spec.rb+++ b/spec/models/reports/top_referrers_by_browser_pageviews_spec.rb@@ -13,26 +13,31 @@ describe Reports::TopReferrersByBrowserPageviews doReport.find("top_referrers_by_browser_pageviews", start_date: start_date, end_date: end_date)end- it "ranks referrers by event count and computes each percent as a share of referred pageviews" do- 3.times do- Fabricate(:browser_pageview_event, normalized_referrer: "news.ycombinator.com/item?id=1")- end- 1.times { Fabricate(:browser_pageview_event, normalized_referrer: "reddit.com/r/discourse") }-- data = report.data- expect(data.map { |row| row[:normalized_referrer] }).to eq(- %w[news.ycombinator.com/item?id=1 reddit.com/r/discourse],+ it "pins direct first and shares one denominator with external referrers, excluding the own host" do+ 6.times { Fabricate(:browser_pageview_event, normalized_referrer: nil) }+ 3.times { Fabricate(:browser_pageview_event, normalized_referrer: "google.com") }+ 1.times { Fabricate(:browser_pageview_event, normalized_referrer: "reddit.com") }+ 5.times { Fabricate(:browser_pageview_event, normalized_referrer: "forum.example.com/t/1") }++ direct_label = I18n.t("reports.top_referrers_by_browser_pageviews.direct")++ expect(report.data).to eq(+ [+ { normalized_referrer: nil, referrer_label: direct_label, count: 6, percent: 60 },+ {+ normalized_referrer: "google.com",+ referrer_label: "google.com",+ count: 3,+ percent: 30,+ },+ {+ normalized_referrer: "reddit.com",+ referrer_label: "reddit.com",+ count: 1,+ percent: 10,+ },+ ],)- expect(data.map { |row| row[:percent] }).to eq([75, 25])- end-- it "excludes direct (no-referrer) pageviews from both numerator and percent denominator" do- 2.times { Fabricate(:browser_pageview_event, normalized_referrer: "google.com") }- 2.times { Fabricate(:browser_pageview_event, normalized_referrer: nil) }-- data = report.data- expect(data.map { |row| row[:normalized_referrer] }).to eq(["google.com"])- expect(data.first[:percent]).to eq(100)endit "excludes same-host bare, path-prefixed, and query-prefixed referrers from numerator and denominator" do@@ -92,7 +97,7 @@ describe Reports::TopReferrersByBrowserPageviews doendit "returns empty data when no qualifying events exist" do- Fabricate(:browser_pageview_event, normalized_referrer: nil)+ Fabricate(:browser_pageview_event, normalized_referrer: "forum.example.com/t/1")expect(report.data).to eq([])enddiff --git a/spec/system/admin_dashboard_redesign/site_traffic_section_spec.rb b/spec/system/admin_dashboard_redesign/site_traffic_section_spec.rbindex 4bbc0c505cd..c9d44095a8a 100644--- a/spec/system/admin_dashboard_redesign/site_traffic_section_spec.rb+++ b/spec/system/admin_dashboard_redesign/site_traffic_section_spec.rb@@ -184,8 +184,6 @@ describe "Admin Dashboard Redesign | Site Traffic section" donormalized_referrer: nil,created_at: "2026-05-12",)- # Internal-referrer and direct (no-referrer) pageviews must not dilute the- # top referrers percent denominator (it counts external referrer traffic only).6.times doFabricate(:browser_pageview_event,@@ -216,8 +214,9 @@ describe "Admin Dashboard Redesign | Site Traffic section" do)expect(traffic).to have_top_referrer_rows([- { referrer: "news.ycombinator.com/item?id=42", percent: 67 },- { referrer: "reddit.com/r/discourse", percent: 33 },+ { referrer: "Direct", percent: 25 },+ { referrer: "news.ycombinator.com/item?id=42", percent: 50 },+ { referrer: "reddit.com/r/discourse", percent: 25 },],)end@@ -240,6 +239,7 @@ describe "Admin Dashboard Redesign | Site Traffic section" donormalized_referrer: "news.ycombinator.com/item?id=42",created_at: "2026-05-12",)+ Fabricate(:browser_pageview_event, normalized_referrer: nil, created_at: "2026-05-12")BrowserPageviewReferrerDailyRollup.aggregate(start_date: "2026-05-01".to_date,end_date: "2026-05-14".to_date,@@ -251,6 +251,10 @@ describe "Admin Dashboard Redesign | Site Traffic section" doexpect(page).to have_current_path("/admin/reports/top_referrers_by_browser_pageviews?end_date=2026-05-12&start_date=2026-05-01",)+ expect(page).to have_css(+ ".admin-report-table-row:first-child td.referrer_label",+ text: "Direct",+ )endit "drills into the full top countries report scoped to the dashboard period",diff --git a/spec/system/page_objects/components/admin_dashboard_site_traffic.rb b/spec/system/page_objects/components/admin_dashboard_site_traffic.rbindex d5eadf46ff7..1017a98f5fa 100644--- a/spec/system/page_objects/components/admin_dashboard_site_traffic.rb+++ b/spec/system/page_objects/components/admin_dashboard_site_traffic.rb@@ -92,10 +92,9 @@ module PageObjectsrows.each_with_index.all? do |row, index|nth = ".db-traffic__list-row:nth-child(#{index + 1})"- next false unless has_css?("#{nth} a.db-traffic__link", text: row[:referrer])- next true unless row.key?(:percent)- has_css?("#{nth} .db-traffic__percent", text: "#{row[:percent]}%")+ has_css?("#{nth} .db-traffic__name, #{nth} a.db-traffic__link", text: row[:referrer]) &&+ has_css?("#{nth} .db-traffic__percent", text: "#{row[:percent]}%")endendend