A platform for community discussion. Free, open, simple.
FIX: Update site traffic legend before filters are applied in site traffic explorer (#42903)
Alan Guo Xiang Taneb80eb88a220
diff --git a/frontend/discourse/admin/components/site-traffic-explorer.gjs b/frontend/discourse/admin/components/site-traffic-explorer.gjsindex f34cc750509..1da4fe85b53 100644--- a/frontend/discourse/admin/components/site-traffic-explorer.gjs+++ b/frontend/discourse/admin/components/site-traffic-explorer.gjs@@ -95,13 +95,12 @@ export default class SiteTrafficExplorer extends Component {@cachedget chartOptions() {- const trafficTypes =- this.args.traffic?.chart_traffic_types ?? this.args.trafficTypes;-return {hideYAxisGridLines: true,hiddenLabels: Object.entries(TRAFFIC_TYPE_BY_SERIES)- .filter(([, trafficType]) => !trafficTypes.includes(trafficType))+ .filter(+ ([, trafficType]) => !this.args.trafficTypes.includes(trafficType)+ ).map(([series]) => series),onLegendClick: this.toggleTrafficType,};diff --git a/frontend/discourse/admin/routes/admin-site-traffic.js b/frontend/discourse/admin/routes/admin-site-traffic.jsindex 42696583a9c..ca7cdd9fd43 100644--- a/frontend/discourse/admin/routes/admin-site-traffic.js+++ b/frontend/discourse/admin/routes/admin-site-traffic.js@@ -21,8 +21,6 @@ const FILTER_KEYS = ["ip",];-const TRAFFIC_TYPES = ["logged_in", "anonymous", "likely_crawler"];-export default class AdminSiteTrafficRoute extends DiscourseRoute {@service loadingSlider;@@ -56,7 +54,6 @@ export default class AdminSiteTrafficRoute extends DiscourseRoute {...traffic,chart_start_date: requestParams.start_date,chart_end_date: requestParams.end_date,- chart_traffic_types: this.#selectedTrafficTypes(params.traffic_type),},fetchError: null,}))@@ -146,17 +143,6 @@ export default class AdminSiteTrafficRoute extends DiscourseRoute {return requestParams;}- #selectedTrafficTypes(value) {- if (!value) {- return TRAFFIC_TYPES;- }-- const selected = this.#filterValues("traffic_type", value);- return TRAFFIC_TYPES.filter((trafficType) =>- selected.includes(trafficType)- );- }-#filterValues(key, value) {if (value === null || value === undefined) {return [];diff --git a/spec/system/admin_dashboard_redesign/site_traffic_explorer_spec.rb b/spec/system/admin_dashboard_redesign/site_traffic_explorer_spec.rbindex 65ef6d362cc..d79b3e85db4 100644--- a/spec/system/admin_dashboard_redesign/site_traffic_explorer_spec.rb+++ b/spec/system/admin_dashboard_redesign/site_traffic_explorer_spec.rb@@ -99,6 +99,51 @@ RSpec.describe "Admin Dashboard Redesign | Site Traffic Explorer" doexpect(traffic).to have_metric(label: "Average session duration", value: "10s")end+ it "lets an admin preview traffic type filters before applying them",+ time: Time.zone.local(2026, 5, 14, 12, 0, 0) do+ sign_in(admin)++ Fabricate(+ :browser_pageview_event,+ user_id: admin.id,+ session_id: "logged-in-session",+ source: BrowserPageviewEvent::SOURCE_BEACON,+ created_at: "2026-05-10 10:00:00",+ )+ Fabricate(+ :browser_pageview_event,+ session_id: "anonymous-session",+ source: BrowserPageviewEvent::SOURCE_BEACON,+ created_at: "2026-05-11 10:00:00",+ )+ Fabricate(+ :browser_pageview_event,+ session_id: "crawler-session",+ score: CrawlerScorer::BOT_SCORE_THRESHOLD + 1,+ source: BrowserPageviewEvent::SOURCE_BEACON,+ created_at: "2026-05-12 10:00:00",+ )++ traffic.visit(start_date: "2026-05-01", end_date: "2026-05-12")+ expect(traffic).to have_selected_legend_item(label: "Likely crawlers")++ traffic.toggle_chart_legend(label: "Likely crawlers")++ expect(traffic).to have_deselected_legend_item(label: "Likely crawlers")+ expect(traffic).to have_apply_filters(count: 2)++ traffic.toggle_chart_legend(label: "Likely crawlers")++ expect(traffic).to have_selected_legend_item(label: "Likely crawlers")+ expect(traffic).to have_no_apply_filters++ traffic.toggle_chart_legend(label: "Likely crawlers")+ traffic.apply_filters++ expect(traffic).to have_deselected_legend_item(label: "Likely crawlers")+ expect(traffic).to have_series_total(label: "likely-crawler", value: "0")+ end+it "lets an admin investigate traffic with dates and filters",time: Time.zone.local(2026, 5, 14, 12, 0, 0) dosign_in(admin)diff --git a/spec/system/page_objects/pages/admin_site_traffic_explorer.rb b/spec/system/page_objects/pages/admin_site_traffic_explorer.rbindex db3039b9e92..87733f81a19 100644--- a/spec/system/page_objects/pages/admin_site_traffic_explorer.rb+++ b/spec/system/page_objects/pages/admin_site_traffic_explorer.rb@@ -72,6 +72,35 @@ module PageObjectshas_no_css?("[data-test-traffic-series='#{label}']", visible: :all)end+ def toggle_chart_legend(label:)+ page.evaluate_async_script(<<~JAVASCRIPT, label)+ const label = arguments[0];+ const done = arguments[1];++ require("discourse/lib/load-chart-js").default().then((Chart) => {+ const chart = Chart.getChart(+ document.querySelector(".admin-report-stacked-chart canvas")+ );+ const legendItem = chart.legend.legendItems.find(+ (item) => item.text === label+ );++ chart.options.plugins.legend.onClick(null, legendItem, chart.legend);+ done();+ });+ JAVASCRIPT++ self+ end++ def has_selected_legend_item?(label:)+ has_css?(".admin-report-stacked-chart canvas") { legend_item_selected?(label:) }+ end++ def has_deselected_legend_item?(label:)+ has_css?(".admin-report-stacked-chart canvas") { legend_item_selected?(label:) == false }+ end+def has_partial_data_warning?(reason:)selector = "[data-test-site-traffic-partial-warning]"@@ -292,6 +321,28 @@ module PageObjectsprivate+ def legend_item_selected?(label:)+ page.evaluate_async_script(<<~JAVASCRIPT, label)+ const label = arguments[0];+ const done = arguments[1];++ require("discourse/lib/load-chart-js").default().then((Chart) => {+ const chart = Chart.getChart(+ document.querySelector(".admin-report-stacked-chart canvas")+ );+ const legendItem = chart?.legend?.legendItems.find(+ (item) => item.text === label+ );++ done(+ legendItem+ ? chart.isDatasetVisible(legendItem.datasetIndex)+ : null+ );+ });+ JAVASCRIPT+ end+def open_date_rangefind(".db-date-range__trigger").clickPageObjects::Components::AdminDashboardDateRangePicker.new.tap(&:open?)