A platform for community discussion. Free, open, simple.
FIX: Beacon pageview tracker drops query-param-only route transitions (#39780)
Alan Guo Xiang Tan2d0d3222f118
diff --git a/frontend/discourse/app/instance-initializers/page-tracking.js b/frontend/discourse/app/instance-initializers/page-tracking.jsindex 7ffe410b304..cc788af3bad 100644--- a/frontend/discourse/app/instance-initializers/page-tracking.js+++ b/frontend/discourse/app/instance-initializers/page-tracking.js@@ -106,32 +106,30 @@ export default {return;}- if (!(transition.urlMethod === "replace" && transition.queryParamsOnly)) {- const trackingSessionId = document.querySelector(- "meta[name=discourse-track-view-session-id]"- )?.content;- const referrerUrl = transition.from- ? _preNavigationUrl- : document.referrer.length- ? document.referrer- : null;-- let topicId;- if (- transition.to.name === "topic.fromParamsNear" ||- transition.to.name === "topic.fromParams"- ) {- topicId = transition.to.parent.params.id;- }+ const trackingSessionId = document.querySelector(+ "meta[name=discourse-track-view-session-id]"+ )?.content;+ const referrerUrl = transition.from+ ? _preNavigationUrl+ : document.referrer.length+ ? document.referrer+ : null;- sendBeaconPageview({- sessionId: trackingSessionId,- url: window.location.href,- referrer: referrerUrl,- topicId,- });+ let topicId;+ if (+ transition.to.name === "topic.fromParamsNear" ||+ transition.to.name === "topic.fromParams"+ ) {+ topicId = transition.to.parent.params.id;}+ sendBeaconPageview({+ sessionId: trackingSessionId,+ url: window.location.href,+ referrer: referrerUrl,+ topicId,+ });+_preNavigationUrl = window.location.href;},diff --git a/spec/system/page_objects/components/topic_list_header.rb b/spec/system/page_objects/components/topic_list_header.rbindex 0ed04c6313b..e42de41ed39 100644--- a/spec/system/page_objects/components/topic_list_header.rb+++ b/spec/system/page_objects/components/topic_list_header.rb@@ -51,7 +51,10 @@ module PageObjectsdef click_dismiss_read_confirmfind("#dismiss-read-confirm").clickend- ### /TODO++ def click_sort_by(order)+ find("#{TOPIC_LIST_HEADER_SELECTOR} th[data-sort-order='#{order}']").click+ endprivatediff --git a/spec/system/page_objects/pages/discovery.rb b/spec/system/page_objects/pages/discovery.rbindex 6dcec8f1b35..07259143652 100644--- a/spec/system/page_objects/pages/discovery.rb+++ b/spec/system/page_objects/pages/discovery.rb@@ -7,6 +7,10 @@ module PageObjectsComponents::TopicList.newend+ def topic_list_header+ Components::TopicListHeader.new+ end+def category_dropComponents::SelectKit.new(".category-breadcrumb li:first-of-type .category-drop")enddiff --git a/spec/system/request_tracker_spec.rb b/spec/system/request_tracker_spec.rbindex 2a7169150a2..44177917c78 100644--- a/spec/system/request_tracker_spec.rb+++ b/spec/system/request_tracker_spec.rb@@ -829,12 +829,31 @@ describe "Request tracking" doexpect(beacon_forward_event[:referrer]).to eq("#{Discourse.base_url}/")end+ it "tracks pageviews via both trackers when sorting a topic list" do+ visit "/latest"+ wait_for_beacon_count(1)+ wait_for_browser_count(1)++ discovery.topic_list_header.click_sort_by("views")++ expect(page).to have_current_path("/latest?ascending=false&order=views")+ wait_for_beacon_count(2)+ wait_for_browser_count(2)+ end+def wait_for_beacon_count(count)try_until_success doCachedCounting.flushexpect(ApplicationRequest.stats["page_view_anon_browser_beacon_total"]).to eq(count)endend++ def wait_for_browser_count(count)+ try_until_success do+ CachedCounting.flush+ expect(ApplicationRequest.stats["page_view_anon_browser_total"]).to eq(count)+ end+ endendendend