A platform for community discussion. Free, open, simple.
FIX: Hide browser pageview cards in legacy mode (#42426)
Alan Guo Xiang Tan209a56404f41
diff --git a/app/services/admin_dashboard_site_traffic.rb b/app/services/admin_dashboard_site_traffic.rbindex 30ce57cb9a3..04b34a0a19b 100644--- a/app/services/admin_dashboard_site_traffic.rb+++ b/app/services/admin_dashboard_site_traffic.rb@@ -40,7 +40,7 @@ class AdminDashboardSiteTrafficpageview_series: pageview_series(current_rows, include_embedded: include_embedded),}- if SiteSetting.persist_browser_pageview_events+ if SiteSetting.persist_browser_pageview_events && !SiteSetting.use_legacy_pageviewstop_countries = fetch_card("top_countries_by_browser_pageviews")response[:top_countries] = top_countries if top_countriesdiff --git a/spec/services/admin_dashboard_site_traffic_spec.rb b/spec/services/admin_dashboard_site_traffic_spec.rbindex dfd0ca8892b..90f5f2fe73c 100644--- a/spec/services/admin_dashboard_site_traffic_spec.rb+++ b/spec/services/admin_dashboard_site_traffic_spec.rb@@ -640,6 +640,13 @@ RSpec.describe AdminDashboardSiteTraffic doexpect(result).not_to have_key(:top_referrers)end+ it "omits top_countries and top_referrers when legacy pageviews are enabled" do+ SiteSetting.use_legacy_pageviews = true++ result = build_traffic(start_date: nil, end_date: nil)+ expect(result.keys).to contain_exactly(:kpis, :pageview_series)+ end+it "returns top_countries and top_referrers with rows and no error when matching events exist" do6.times doFabricate(:browser_pageview_event, country_code: "US", normalized_referrer: "google.com")