Skip to content

A platform for community discussion. Free, open, simple.

FEATURE: Add site traffic dashboard section (#40023)

Alan Guo Xiang Tan87e695fc536d
diff --git a/app/assets/stylesheets/admin/admin_dashboard.scss b/app/assets/stylesheets/admin/admin_dashboard.scss
index dc00802e1ad..5507c7300b0 100644
--- a/app/assets/stylesheets/admin/admin_dashboard.scss
+++ b/app/assets/stylesheets/admin/admin_dashboard.scss
@@ -212,6 +212,48 @@ h1 {
font-size: var(--font-down-1-rem);
}
+ &__traffic-chart {
+ min-height: 260px;
+ height: 360px;
+ }
+
+ &__traffic-chart-canvas,
+ &__traffic-chart-canvas .chart-canvas,
+ &__traffic-chart-canvas .chart-canvas-container {
+ height: 100%;
+ }
+
+ &__traffic-chart &__traffic-chart-canvas.admin-report-stacked-chart {
+ height: 100%;
+
+ .chart-canvas-container {
+ height: 100%;
+ }
+ }
+
+ &__traffic-chart-shell {
+ height: 100%;
+ border-radius: var(--d-border-radius-large);
+ background: linear-gradient(
+ 135deg,
+ var(--primary-very-low),
+ var(--primary-low)
+ );
+ }
+
+ &__traffic-chart-message {
+ min-height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: var(--space-2);
+ padding: var(--space-4);
+ border-radius: var(--d-border-radius-large);
+ background: var(--primary-very-low);
+ color: var(--primary-medium);
+ font-size: var(--font-down-1-rem);
+ }
+
&__row {
display: flex;
flex-wrap: nowrap;
@@ -407,31 +449,80 @@ h1 {
}
.db-traffic {
- &__chart {
- height: 500px; // remove later
+ display: flex;
+ flex-direction: column;
+ gap: var(--space-4);
+ transition: opacity 0.15s ease;
+
+ &.is-loading {
+ opacity: 0.55;
+ }
+
+ &__headline {
+ margin: 0;
+ font-size: var(--font-up-3-rem);
+ line-height: 1.2;
+ color: var(--primary);
}
- &__list-heading {
+ &__headline-separator {
+ color: var(--primary);
+ }
+
+ &__trend {
+ display: inline-flex;
+ align-items: baseline;
+ gap: var(--space-1);
+ font-size: inherit;
+ line-height: inherit;
+
+ &.--up {
+ color: var(--success);
+ }
+
+ &.--down {
+ color: var(--danger);
+ }
+ }
+
+ &__info {
+ color: var(--primary-medium);
font-size: var(--font-down-1-rem);
}
&__list {
- list-style: none;
- padding: 0;
- margin: 0;
display: flex;
flex-direction: column;
gap: var(--space-2);
+ list-style: none;
+ margin: 0;
+ padding: 0;
}
&__list-row {
display: flex;
+ align-items: center;
justify-content: space-between;
+ gap: var(--space-4);
font-size: var(--font-down-1-rem);
}
+ &__name {
+ overflow: hidden;
+ color: var(--primary-high);
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+
+ &__value {
+ flex: 0 0 auto;
+ color: var(--primary);
+ font-weight: 600;
+ }
+
&__count {
color: var(--primary-medium);
+ font-weight: 400;
}
}
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index ab0e2f3524f..a8e8dec4e2f 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -96,6 +96,8 @@ class Admin::DashboardController < Admin::StaffController
case id
when "highlights"
AdminDashboardHighlights.build(start_date: params[:start_date], end_date: params[:end_date])
+ when "traffic"
+ AdminDashboardSiteTraffic.build(start_date: params[:start_date], end_date: params[:end_date])
end
end
diff --git a/app/models/concerns/reports/site_traffic.rb b/app/models/concerns/reports/site_traffic.rb
index f2e2c87aca4..3e3675fedea 100644
--- a/app/models/concerns/reports/site_traffic.rb
+++ b/app/models/concerns/reports/site_traffic.rb
@@ -3,6 +3,14 @@
module Reports::SiteTraffic
extend ActiveSupport::Concern
+ SERIES_COLORS = {
+ "page_view_logged_in_browser" => "#4B3CE0",
+ "page_view_anon_browser" => "#9C8DEC",
+ "page_view_crawler" => "#D5CDF7",
+ "page_view_embed" => "#E6E1F8",
+ "page_view_other" => "#E84A5F",
+ }.freeze
+
class_methods do
def report_site_traffic(report)
report.modes = [Report::MODES[:stacked_chart]]
@@ -55,19 +63,19 @@ module Reports::SiteTraffic
{
req: "page_view_logged_in_browser",
label: I18n.t("reports.site_traffic.xaxis.page_view_logged_in_browser"),
- color: report.colors[:turquoise],
+ color: SERIES_COLORS.fetch("page_view_logged_in_browser"),
data: data.map { |row| { x: row.date, y: row.page_view_logged_in_browser } },
},
{
req: "page_view_anon_browser",
label: I18n.t("reports.site_traffic.xaxis.page_view_anon_browser"),
- color: report.colors[:lime],
+ color: SERIES_COLORS.fetch("page_view_anon_browser"),
data: data.map { |row| { x: row.date, y: row.page_view_anon_browser } },
},
{
req: "page_view_crawler",
label: I18n.t("reports.site_traffic.xaxis.page_view_crawler"),
- color: report.colors[:purple],
+ color: SERIES_COLORS.fetch("page_view_crawler"),
data: data.map { |row| { x: row.date, y: row.page_view_crawler } },
},
]
@@ -76,7 +84,7 @@ module Reports::SiteTraffic
report.data << {
req: "page_view_embed",
label: I18n.t("reports.site_traffic.xaxis.page_view_embed"),
- color: report.colors[:yellow],
+ color: SERIES_COLORS.fetch("page_view_embed"),
data: data.map { |row| { x: row.date, y: row.page_view_embed } },
}
end
@@ -84,7 +92,7 @@ module Reports::SiteTraffic
report.data << {
req: "page_view_other",
label: I18n.t("reports.site_traffic.xaxis.page_view_other"),
- color: report.colors[:magenta],
+ color: SERIES_COLORS.fetch("page_view_other"),
data: data.map { |row| { x: row.date, y: row.page_view_other } },
}
end
diff --git a/app/services/admin_dashboard_site_traffic.rb b/app/services/admin_dashboard_site_traffic.rb
new file mode 100644
index 00000000000..86810ae7a03
--- /dev/null
+++ b/app/services/admin_dashboard_site_traffic.rb
@@ -0,0 +1,273 @@
+# frozen_string_literal: true
+
+class AdminDashboardSiteTraffic
+ DEFAULT_RANGE_DAYS = 30
+ SERIES_LABEL_REQS = {
+ logged_in: "page_view_logged_in_browser",
+ anonymous: "page_view_anon_browser",
+ embedded: "page_view_embed",
+ crawlers: "page_view_crawler",
+ }.freeze
+ private_constant :DEFAULT_RANGE_DAYS
+ private_constant :SERIES_LABEL_REQS
+
+ def self.build(start_date:, end_date:)
+ new(start_date: start_date, end_date: end_date).build
+ end
+
+ def initialize(start_date:, end_date:)
+ @start_date = parse_date(start_date) || (DEFAULT_RANGE_DAYS - 1).days.ago.beginning_of_day
+ @end_date = parse_date(end_date)&.end_of_day || Time.zone.now.end_of_day
+
+ if @start_date.to_date > @end_date.to_date
+ @start_date = (DEFAULT_RANGE_DAYS - 1).days.ago.beginning_of_day
+ @end_date = Time.zone.now.end_of_day
+ end
+ end
+
+ def build
+ current_rows = traffic_rows(start_date.to_date, end_date.to_date)
+ prior_rows = traffic_rows(prior_start_date, prior_end_date)
+ include_embedded = include_embedded_series?
+ totals = build_totals(current_rows, include_embedded: include_embedded)
+
+ {
+ kpis: kpis(totals, prior_rows),
+ pageview_series: pageview_series(current_rows, include_embedded: include_embedded),
+ }
+ end
+
+ private
+
+ attr_reader :start_date, :end_date
+
+ def series_ids(include_embedded:)
+ series = %i[logged_in]
+
+ return series if login_required?
+
+ series << :anonymous
+ series << :embedded if include_embedded
+ series << :crawlers
+
+ series
+ end
+
+ def kpis(totals, prior_rows)
+ kpis = { browser_pageviews: browser_pageviews_kpi(totals, prior_rows) }
+ logged_in_share = logged_in_share_value(totals)
+
+ kpis[:logged_in_share] = { value: logged_in_share } if !logged_in_share.nil?
+
+ kpis
+ end
+
+ def browser_pageviews_kpi(totals, prior_rows)
+ kpi = { value: totals[:human] }
+ trend = build_trend(totals, prior_rows)
+
+ return kpi if trend.blank?
+
+ kpi.merge(trend)
+ end
+
+ def logged_in_share_value(totals)
+ return nil if login_required?
+
+ totals[:human].positive? ? ((totals[:logged_in].to_f / totals[:human]) * 100).round : 0
+ end
+
+ def pageview_series(rows, include_embedded:)
+ series_ids(include_embedded: include_embedded).map do |id|
+ {
+ req: series_req(id),
+ label: series_label(id),
+ color: series_color(id),
+ data: rows.map { |row| pageview_series_point(row, id) },
+ }
+ end
+ end
+
+ def pageview_series_point(row, id)
+ { x: row.date.iso8601, y: row.public_send(id).to_i }
+ end
+
+ def series_req(id)
+ selected_request_type_names.fetch(id)
+ end
+
+ def series_label(id)
+ I18n.t("reports.site_traffic.xaxis.#{series_label_req(id)}")
+ end
+
+ def series_label_req(id)
+ SERIES_LABEL_REQS.fetch(id)
+ end
+
+ def series_color(id)
+ Reports::SiteTraffic::SERIES_COLORS.fetch(series_label_req(id))
+ end
+
+ def login_required?
+ SiteSetting.login_required
+ end
+
+ def prior_start_date
+ prior_end_date - (selected_day_count - 1)
+ end
+
+ def prior_end_date
+ start_date.to_date - 1
+ end
+
+ def prior_period_complete?
+ prior_period_tracking_started?
+ end
+
+ def prior_period_tracking_started?
+ return @prior_period_tracking_started if defined?(@prior_period_tracking_started)
+
+ req_type_sql =
+ if login_required?
+ "req_type = :logged_in_req_type"
+ else
+ "req_type IN (:logged_in_req_type, :anonymous_req_type)"
+ end
+
+ @prior_period_tracking_started =
+ DB.query_single(
+ <<~SQL,
+ SELECT 1
+ FROM application_requests
+ WHERE date <= :prior_start_date
+ AND #{req_type_sql}
+ LIMIT 1
+ SQL
+ prior_start_date: prior_start_date,
+ logged_in_req_type: selected_request_types[:logged_in],
+ anonymous_req_type: selected_request_types[:anonymous],
+ ).present?
+ end
+
+ def parse_date(value)
+ return nil if value.blank?
+
+ Time.zone.parse(value.to_s)&.beginning_of_day
+ rescue ArgumentError, TypeError
+ nil
+ end
+
+ def selected_request_types
+ @selected_request_types ||=
+ selected_request_type_names.transform_values { |name| ApplicationRequest.req_types[name] }
+ end
+
+ def selected_request_type_names
+ @selected_request_type_names ||=
+ if SiteSetting.use_legacy_pageviews
+ { logged_in: "page_view_logged_in", anonymous: "page_view_anon" }
+ else
+ { logged_in: "page_view_logged_in_browser", anonymous: "page_view_anon_browser" }
+ end.merge(crawlers: "page_view_crawler", embedded: "page_view_embed")
+ end
+
+ def traffic_rows(range_start_date, range_end_date)
+ DB.query(
+ <<~SQL,
+ WITH dates AS (
+ SELECT
+ request_date::date AS date
+ FROM generate_series(
+ CAST(:start_date AS date),
+ CAST(:end_date AS date),
+ INTERVAL '1 day'
+ ) request_date
+ )
+ SELECT
+ dates.date,
+ COALESCE(SUM(CASE WHEN ar.req_type = :logged_in_req_type THEN ar.count ELSE 0 END), 0)::bigint AS logged_in,
+ COALESCE(SUM(CASE WHEN ar.req_type = :anonymous_req_type THEN ar.count ELSE 0 END), 0)::bigint AS anonymous,
+ COALESCE(SUM(CASE WHEN ar.req_type = :crawler_req_type THEN ar.count ELSE 0 END), 0)::bigint AS crawlers,
+ COALESCE(SUM(CASE WHEN ar.req_type = :embedded_req_type THEN ar.count ELSE 0 END), 0)::bigint AS embedded
+ FROM dates
+ LEFT JOIN application_requests ar
+ ON ar.date = dates.date
+ AND ar.req_type IN (
+ :logged_in_req_type,
+ :anonymous_req_type,
+ :crawler_req_type,
+ :embedded_req_type
+ )
+ GROUP BY dates.date
+ ORDER BY dates.date ASC
+ SQL
+ start_date: range_start_date,
+ end_date: range_end_date,
+ logged_in_req_type: selected_request_types[:logged_in],
+ anonymous_req_type: selected_request_types[:anonymous],
+ crawler_req_type: selected_request_types[:crawlers],
+ embedded_req_type: selected_request_types[:embedded],
+ )
+ end
+
+ def build_totals(rows, include_embedded:)
+ logged_in = sum_rows(rows, :logged_in)
+ anonymous = login_required? ? 0 : sum_rows(rows, :anonymous)
+ crawlers = login_required? ? 0 : sum_rows(rows, :crawlers)
+ embedded = include_embedded ? sum_rows(rows, :embedded) : 0
+
+ {
+ logged_in: logged_in,
+ anonymous: anonymous,
+ embedded: embedded,
+ crawlers: crawlers,
+ human: logged_in + anonymous,
+ }
+ end
+
+ def build_trend(totals, prior_rows)
+ return nil if !prior_period_complete?
+
+ current_human = totals[:human]
+ previous_human = prior_human(prior_rows)
+ return nil if previous_human.zero? || current_human == previous_human
+
+ percent_change = ((current_human - previous_human).to_f / previous_human) * 100
+ return nil if percent_change.abs < 0.05
+
+ {
+ percent_change: format_trend_percent_change(percent_change),
+ comparison_period: {
+ start_date: prior_start_date.iso8601,
+ end_date: prior_end_date.iso8601,
+ },
+ }
+ end
+
+ def prior_human(prior_rows)
+ logged_in = sum_rows(prior_rows, :logged_in)
+ anonymous = login_required? ? 0 : sum_rows(prior_rows, :anonymous)
+
+ logged_in + anonymous
+ end
+
+ def format_trend_percent_change(percent_change)
+ percent_change.abs < 1 ? percent_change.round(1) : percent_change.round
+ end
+
+ def sum_rows(rows, field)
+ rows.sum { |row| row.public_send(field).to_i }
+ end
+
+ def include_embedded_series?
+ !login_required? && embedding_enabled? && EmbeddableHost.exists?
+ end
+
+ def embedding_enabled?
+ SiteSetting.embed_topics_list || SiteSetting.embed_full_app
+ end
+
+ def selected_day_count
+ (end_date.to_date - start_date.to_date).to_i + 1
+ end
+end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index e4ba5dd6738..4caff6d11fb 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -6270,6 +6270,8 @@ en:
group_moderation_and_security: "Moderation & Security"
group_other: "Other"
legacy_warning: "This is a legacy report. It will be retired soon. If you need help finding the replacement, contact support."
+ chart:
+ total: "Total: %{count}"
config_sections:
account:
@@ -6911,6 +6913,40 @@ en:
last_3_months: "vs last 3 months"
previous_period: "vs previous period"
+ site_traffic:
+ fetch_error: "Couldn't load site traffic. Try refreshing the page."
+ headline:
+ last_7_days:
+ one: "%{formatted_count} pageview in the last 7 days"
+ other: "%{formatted_count} pageviews in the last 7 days"
+ last_30_days:
+ one: "%{formatted_count} pageview in the last 30 days"
+ other: "%{formatted_count} pageviews in the last 30 days"
+ last_3_months:
+ one: "%{formatted_count} pageview in the last 3 months"
+ other: "%{formatted_count} pageviews in the last 3 months"
+ selected_period:
+ one: "%{formatted_count} pageview in the selected period"
+ other: "%{formatted_count} pageviews in the selected period"
+ trend:
+ up: "up %{percent}"
+ down: "down %{percent}"
+ comparison_tooltip:
+ previous_7_days: "Compared with the previous 7 days (%{start} – %{end})"
+ previous_30_days: "Compared with the previous 30 days (%{start} – %{end})"
+ previous_3_months: "Compared with the previous 3 months (%{start} – %{end})"
+ previous_days:
+ one: "Compared with the previous day (%{start} – %{end})"
+ other: "Compared with the previous %{count} days (%{start} – %{end})"
+ kpi:
+ logged_in_share:
+ label: "Logged-in share"
+ tooltip: "The share of pageviews from logged-in members."
+ series:
+ logged_in: "Logged in"
+ anonymous: "Anonymous"
+ embedded: "Embedded pageviews"
+ crawlers: "Crawlers"
period:
last_7_days: "Last 7 days"
last_30_days: "Last 30 days"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 76f0954aeb1..155db9d3a0e 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1422,9 +1422,9 @@ en:
site_traffic:
title: "Site traffic"
xaxis:
- page_view_anon_browser: "Pageviews (anonymous)"
- page_view_logged_in_browser: "Pageviews (logged in)"
- page_view_crawler: "Known crawlers"
+ page_view_anon_browser: "Anonymous"
+ page_view_logged_in_browser: "Logged in"
+ page_view_crawler: "Crawlers"
page_view_embed: "Embedded pageviews"
page_view_other: "Other traffic"
yaxis: "Day"
diff --git a/frontend/discourse/admin/components/admin-report-stacked-chart.gjs b/frontend/discourse/admin/components/admin-report-stacked-chart.gjs
index 72656f80cd4..090f55fe760 100644
--- a/frontend/discourse/admin/components/admin-report-stacked-chart.gjs
+++ b/frontend/discourse/admin/components/admin-report-stacked-chart.gjs
@@ -2,6 +2,7 @@ import Component from "@glimmer/component";
import Report from "discourse/admin/models/report";
import { number } from "discourse/lib/formatter";
import { makeArray } from "discourse/lib/helpers";
+import I18n, { i18n } from "discourse-i18n";
import Chart from "./chart";
function getCSSColor(varName) {
@@ -75,20 +76,22 @@ export default class AdminReportStackedChart extends Component {
const chartOptions = options || {};
chartOptions.hiddenLabels ??= [];
- const chartData = makeArray(model.chartData || model.data).map(
- (series) => ({
- label: series.label,
- color: series.color,
- data: Report.collapse(model, series.data, chartOptions.chartGrouping),
- req: series.req,
- })
- );
+ const sourceData = makeArray(model.chartData || model.data);
+ const chartGrouping =
+ chartOptions.chartGrouping ||
+ Report.groupingForDatapoints(sourceData[0]?.data?.length || 0);
+
+ const chartData = sourceData.map((series) => ({
+ label: series.label,
+ color: series.color,
+ data: Report.collapse(model, series.data, chartGrouping),
+ req: series.req,
+ }));
const data = {
- labels: chartData[0].data.map((point) => point.x),
+ labels: chartData[0]?.data.map((point) => point.x) ?? [],
datasets: chartData.map((series) => ({
label: series.label,
- stack: "pageviews-stack",
data: series.data,
backgroundColor: series.color,
_baseColor: series.color, // Store for gradient plugin
@@ -101,6 +104,7 @@ export default class AdminReportStackedChart extends Component {
const prefersReducedMotion = window.matchMedia(
"(prefers-reduced-motion: reduce)"
).matches;
+ const timeUnit = Report.unitForGrouping(chartGrouping);
return {
type: "bar",
@@ -115,8 +119,8 @@ export default class AdminReportStackedChart extends Component {
},
plugins: {
legend: {
- display: true,
- position: "bottom",
+ display: data.datasets.length > 1,
+ position: chartOptions.legendPosition || "bottom",
onClick: (e, legendItem, legend) => {
const index = legendItem.datasetIndex;
const ci = legend.chart;
@@ -129,15 +133,15 @@ export default class AdminReportStackedChart extends Component {
}
} else {
ci.show(index);
- chartOptions.hiddenLabels = chartOptions.hiddenLabels.filter(
- (l) => l !== req
- );
+ const hiddenIndex = chartOptions.hiddenLabels.indexOf(req);
+ if (hiddenIndex !== -1) {
+ chartOptions.hiddenLabels.splice(hiddenIndex, 1);
+ }
}
},
labels: {
usePointStyle: true,
pointStyle: "rectRounded",
- padding: 25,
boxWidth: 10,
boxHeight: 10,
generateLabels: (chart) => {
@@ -182,10 +186,11 @@ export default class AdminReportStackedChart extends Component {
(sum, item) => sum + parseInt(item.parsed.y || 0, 10),
0
);
- return `Total: ${total}`;
+ return i18n("admin.reports.chart.total", {
+ count: I18n.toNumber(total, { precision: 0 }),
+ });
},
- title: (tooltipItem) =>
- moment(tooltipItem[0].parsed.x).format("LL"),
+ title: (tooltipItem) => this.#tooltipTitle(tooltipItem),
},
},
},
@@ -204,6 +209,7 @@ export default class AdminReportStackedChart extends Component {
display: true,
grid: {
color: getCSSColor("--primary-very-low"),
+ display: !chartOptions.hideYAxisGridLines,
},
ticks: {
callback: (label) => number(label),
@@ -218,13 +224,10 @@ export default class AdminReportStackedChart extends Component {
display: true,
grid: { display: false },
- type: "time",
- time: {
- unit: chartOptions.chartGrouping
- ? Report.unitForGrouping(chartOptions.chartGrouping)
- : Report.unitForDatapoints(data.labels.length),
- },
+ type: "category",
ticks: {
+ callback: (value) =>
+ this.#categoryTickLabel(value, data.labels, timeUnit),
sampleSize: 5,
maxRotation: 50,
minRotation: 0,
@@ -237,8 +240,53 @@ export default class AdminReportStackedChart extends Component {
<template>
<Chart
+ ...attributes
@chartConfig={{this.chartConfig}}
class="admin-report-chart admin-report-stacked-chart"
/>
</template>
+
+ #tooltipTitle(tooltipItem) {
+ const point = tooltipItem[0].raw;
+ const startDate = point?.x ?? tooltipItem[0].parsed.x;
+
+ if (point?.end_date) {
+ return this.#tooltipDateRange(startDate, point.end_date);
+ }
+
+ return this.#dateLabelMoment(startDate).format("LL");
+ }
+
+ #tooltipDateRange(startValue, endValue) {
+ const startDate = this.#dateLabelMoment(startValue);
+ const endDate = this.#dateLabelMoment(endValue);
+
+ if (startDate.isSame(endDate, "day")) {
+ return startDate.format("LL");
+ }
+
+ return `${startDate.format("ll")} - ${endDate.format("ll")}`;
+ }
+
+ #categoryTickLabel(value, labels, timeUnit) {
+ const label = labels[value] ?? value;
+
+ return this.#formatDateLabel(label, timeUnit);
+ }
+
+ #formatDateLabel(label, timeUnit) {
+ const date = this.#dateLabelMoment(label);
+
+ if (timeUnit === "month") {
+ return date.format("MMM YYYY");
+ }
+
+ return date.format("D MMM");
+ }
+
+ #dateLabelMoment(value) {
+ return typeof value === "string"
+ ? moment.utc(value, "YYYY-MM-DD")
+ : moment(value);
+ }
}
diff --git a/frontend/discourse/admin/components/dashboard/date-range.gjs b/frontend/discourse/admin/components/dashboard/date-range.gjs
index 329740be43b..f0b05006647 100644
--- a/frontend/discourse/admin/components/dashboard/date-range.gjs
+++ b/frontend/discourse/admin/components/dashboard/date-range.gjs
@@ -24,12 +24,12 @@ export function calculatePresetStartDate(period) {
const today = moment();
switch (period) {
case PERIOD_LAST_7_DAYS:
- return today.subtract(7, "days").startOf("day").toDate();
+ return today.subtract(6, "days").startOf("day").toDate();
case PERIOD_LAST_3_MONTHS:
- return today.subtract(3, "months").startOf("day").toDate();
+ return today.subtract(3, "months").add(1, "day").startOf("day").toDate();
case PERIOD_LAST_30_DAYS:
default:
- return today.subtract(30, "days").startOf("day").toDate();
+ return today.subtract(29, "days").startOf("day").toDate();
}
}
diff --git a/frontend/discourse/admin/components/dashboard/traffic.gjs b/frontend/discourse/admin/components/dashboard/traffic.gjs
index 76de4e66843..a1fa13dcabe 100644
--- a/frontend/discourse/admin/components/dashboard/traffic.gjs
+++ b/frontend/discourse/admin/components/dashboard/traffic.gjs
@@ -1,113 +1,351 @@
+import Component from "@glimmer/component";
+import { concat } from "@ember/helper";
+import AdminReportStackedChart from "discourse/admin/components/admin-report-stacked-chart";
import DashboardSection from "discourse/admin/components/dashboard/section";
+import DTooltip from "discourse/float-kit/components/d-tooltip";
import dIcon from "discourse/ui-kit/helpers/d-icon";
-import { i18n } from "discourse-i18n";
-
-<template>
- <DashboardSection
- @title={{i18n "admin.dashboard.sections.traffic.title"}}
- @startDate={{@startDate}}
- @endDate={{@endDate}}
- >
- <div class="db-section__subheader">
- <div class="db-section__subintro">
- <h3>712k pageviews this month — up 9%</h3>
- <p>Logged-in traffic is growing steadily. Two spikes on Mar 8–9 drove a
- burst of anonymous visitors who didn't log in, pulling the logged-in
- share down slightly to 38%.</p>
- </div>
- <div class="db-section__metrics">
- <div class="db-section__metric">
- <div class="db-section__metric-number">38%</div>
- <div class="db-section__metric-label">
- Logged-in share
- <span class="db-section__info">{{dIcon
- "far-circle-question"
- }}</span>
+import I18n, { i18n } from "discourse-i18n";
+
+const PERIOD_COPY_KEYS = {
+ last_7_days: {
+ headline: "admin.dashboard.site_traffic.headline.last_7_days",
+ comparisonTooltip:
+ "admin.dashboard.site_traffic.comparison_tooltip.previous_7_days",
+ },
+ last_30_days: {
+ headline: "admin.dashboard.site_traffic.headline.last_30_days",
+ comparisonTooltip:
+ "admin.dashboard.site_traffic.comparison_tooltip.previous_30_days",
+ },
+ last_3_months: {
+ headline: "admin.dashboard.site_traffic.headline.last_3_months",
+ comparisonTooltip:
+ "admin.dashboard.site_traffic.comparison_tooltip.previous_3_months",
+ },
+};
+
+export default class DashboardTraffic extends Component {
+ hiddenLabels = ["page_view_crawler"];
+
+ get browserPageviews() {
+ return this.args.traffic?.kpis?.browser_pageviews?.value ?? 0;
+ }
+
+ get headlineCount() {
+ return this.formatHeadlineCount(this.browserPageviews);
+ }
+
+ get headlineText() {
+ return i18n(this.#headlineKey(this.args.period), {
+ count: this.browserPageviews,
+ formatted_count: this.headlineCount,
+ });
+ }
+
+ get trend() {
+ const browserPageviewsKpi = this.args.traffic?.kpis?.browser_pageviews;
+ const percentChange = browserPageviewsKpi?.percent_change;
+
+ if (percentChange === null || percentChange === undefined) {
+ return null;
+ }
+
+ return browserPageviewsKpi;
+ }
+
+ get trendDirection() {
+ return this.trend?.percent_change > 0 ? "up" : "down";
+ }
+
+ get trendText() {
+ if (!this.trend) {
+ return null;
+ }
+
+ return i18n(`admin.dashboard.site_traffic.trend.${this.trendDirection}`, {
+ percent: this.formatTrendPercent(Math.abs(this.trend.percent_change)),
+ });
+ }
+
+ get comparisonTooltipText() {
+ const tooltip = this.#comparisonTooltip(
+ this.args.period,
+ this.trend?.comparison_period
+ );
+
+ if (!tooltip) {
+ return null;
+ }
+
+ return i18n(tooltip.key, {
+ count: tooltip.count,
+ ...this.#formatComparisonDates(tooltip.startDate, tooltip.endDate),
+ });
+ }
+
+ get showLoggedInShare() {
+ const loggedInShare = this.args.traffic?.kpis?.logged_in_share?.value;
+ return loggedInShare !== null && loggedInShare !== undefined;
+ }
+
+ get loggedInShare() {
+ return `${this.args.traffic?.kpis?.logged_in_share?.value ?? 0}%`;
+ }
+
+ get chartModel() {
+ return {
+ start_date: this.args.startDate,
+ end_date: this.args.endDate,
+ data: this.args.traffic?.pageview_series ?? [],
+ };
+ }
+
+ get chartOptions() {
+ return {
+ hideYAxisGridLines: true,
+ hiddenLabels: this.hiddenLabels,
+ legendPosition: "top",
+ };
+ }
+
+ formatHeadlineCount(value) {
+ if (value >= 1_000_000) {
+ const formatted = I18n.toNumber(value / 1_000_000, { precision: 1 });
+ return `${formatted.replace(/[,.]0$/, "")}M`;
+ }
+
+ if (value >= 1_000) {
+ return `${I18n.toNumber(Math.round(value / 1_000), { precision: 0 })}k`;
+ }
+
+ return I18n.toNumber(value, { precision: 0 });
+ }
+
+ formatTrendPercent(value) {
+ const precision = value < 1 ? 1 : 0;
+ return `${I18n.toNumber(value, { precision })}%`;
+ }
+
+ #dateFrom(value) {
+ return moment(value, "YYYY-MM-DD");
+ }
+
+ #inclusiveDayCount(startDate, endDate) {
+ return this.#dateFrom(endDate).diff(this.#dateFrom(startDate), "days") + 1;
+ }
+
+ #headlineKey(period) {
+ return (
+ PERIOD_COPY_KEYS[period]?.headline ??
+ "admin.dashboard.site_traffic.headline.selected_period"
+ );
+ }
+
+ #comparisonTooltip(period, comparisonPeriod) {
+ if (!comparisonPeriod) {
+ return null;
+ }
+
+ const startDate = comparisonPeriod.start_date;
+ const endDate = comparisonPeriod.end_date;
+ const tooltip = { startDate, endDate };
+ const presetKey = PERIOD_COPY_KEYS[period]?.comparisonTooltip;
+
+ if (presetKey) {
+ return { ...tooltip, key: presetKey };
+ }
+
+ return {
+ ...tooltip,
+ count: this.#inclusiveDayCount(startDate, endDate),
+ key: "admin.dashboard.site_traffic.comparison_tooltip.previous_days",
+ };
+ }
+
+ #formatComparisonDates(startDate, endDate) {
+ const start = this.#dateFrom(startDate);
+ const end = this.#dateFrom(endDate);
+ const dateWithYear = (date) =>
+ date.format(i18n("dates.long_with_year_no_time"));
+ const dateWithoutYear = (date) =>
+ date.format(i18n("dates.long_no_year_no_time"));
+
+ if (start.isSame(end, "day")) {
+ const date = dateWithYear(start);
+ return { start: date, end: date };
+ }
+
+ if (start.year() === end.year()) {
+ return { start: dateWithoutYear(start), end: dateWithYear(end) };
+ }
+
+ return { start: dateWithYear(start), end: dateWithYear(end) };
+ }
+
+ <template>
+ <DashboardSection
+ @title={{i18n "admin.dashboard.sections.traffic.title"}}
+ @startDate={{@startDate}}
+ @endDate={{@endDate}}
+ >
+ <div class="db-traffic {{if @loading 'is-loading'}}">
+ <div class="db-section__subheader">
+ <div class="db-section__subintro">
+ <h3 class="db-traffic__headline">
+ {{this.headlineText}}
+ {{#if this.trend}}
+ <span class="db-traffic__headline-separator"> - </span>
+ <span
+ class="db-traffic__trend {{concat '--' this.trendDirection}}"
+ >
+ {{this.trendText}}
+ <DTooltip
+ class="db-traffic__info"
+ @identifier="site-traffic-comparison-tooltip"
+ @icon="circle-info"
+ >
+ <:content>{{this.comparisonTooltipText}}</:content>
+ </DTooltip>
+ </span>
+ {{/if}}
+ </h3>
+ <p>
+ Placeholder: Logged-in traffic is growing steadily. Two spikes on
+ Mar 8-9 drove a burst of anonymous visitors who didn't log in,
+ pulling the logged-in share down slightly to 38%.
+ </p>
</div>
+
+ {{#if this.showLoggedInShare}}
+ <div class="db-section__metrics">
+ <div class="db-section__metric">
+ <div
+ class="db-section__metric-number"
+ >{{this.loggedInShare}}</div>
+ <div class="db-section__metric-label">
+ {{i18n
+ "admin.dashboard.site_traffic.kpi.logged_in_share.label"
+ }}
+ <DTooltip
+ class="db-traffic__info"
+ @identifier="site-traffic-logged-in-share-tooltip"
+ @icon="circle-info"
+ >
+ <:content>
+ {{i18n
+ "admin.dashboard.site_traffic.kpi.logged_in_share.tooltip"
+ }}
+ </:content>
+ </DTooltip>
+ </div>
+ </div>
+ </div>
+ {{/if}}
</div>
- <div class="db-section__metric">
- <div class="db-section__metric-number">3m 12s</div>
- <div class="db-section__metric-label">Avg. session
- </div>
+
+ <div class="db-section__callout">
+ Placeholder: Spikes on Mar 8 and Mar 9 - a Hacker News post linking to
+ the plugin release docs drove a surge in anonymous pageviews.
</div>
- <div class="db-section__metric">
- <div class="db-section__metric-number">52%</div>
- <div class="db-section__metric-label">Bounce rate
- <span class="db-section__info">{{dIcon
- "far-circle-question"
- }}</span>
+
+ {{#if @fetchError}}
+ <div class="db-section__traffic-chart">
+ <div class="db-section__traffic-chart-message" role="alert">
+ {{i18n "admin.dashboard.site_traffic.fetch_error"}}
+ </div>
+ </div>
+ {{else if @traffic}}
+ <div class="db-section__traffic-chart">
+ <AdminReportStackedChart
+ @model={{this.chartModel}}
+ @options={{this.chartOptions}}
+ class="db-section__traffic-chart-canvas"
+ />
+ </div>
+ {{else}}
+ <div class="db-section__traffic-chart">
+ <div class="db-section__traffic-chart-shell"></div>
+ </div>
+ {{/if}}
+
+ <div class="db-section__row">
+ <div class="db-section__row-block">
+ <div class="db-section__row-block-header">
+ <a class="db-section__row-block-title">
+ Placeholder: Top referrers
+ <span class="db-link-arrow">{{dIcon "arrow-right"}}</span>
+ </a>
+ </div>
+
+ <ul class="db-traffic__list">
+ <li class="db-traffic__list-row">
+ <span class="db-traffic__name">news.ycombinator.com</span>
+ <span class="db-traffic__value">
+ 41%
+ <span class="db-traffic__count">(34.2k)</span>
+ </span>
+ </li>
+ <li class="db-traffic__list-row">
+ <span class="db-traffic__name">google.com</span>
+ <span class="db-traffic__value">
+ 29%
+ <span class="db-traffic__count">(24.5k)</span>
+ </span>
+ </li>
+ <li class="db-traffic__list-row">
+ <span class="db-traffic__name">github.com</span>
+ <span class="db-traffic__value">
+ 15%
+ <span class="db-traffic__count">(12.3k)</span>
+ </span>
+ </li>
+ <li class="db-traffic__list-row">
+ <span class="db-traffic__name">reddit.com/r/selfhosted</span>
+ <span class="db-traffic__value">
+ 10%
+ <span class="db-traffic__count">(8.0k)</span>
+ </span>
+ </li>
+ <li class="db-traffic__list-row">
+ <span class="db-traffic__name">duckduckgo.com</span>
+ <span class="db-traffic__value">
+ 5%
+ <span class="db-traffic__count">(4.8k)</span>
+ </span>
+ </li>
+ </ul>
+ </div>
+
+ <div class="db-section__row-block">
+ <h3 class="db-section__row-block-title">
+ Placeholder: Top countries
+ </h3>
+
+ <ul class="db-traffic__list">
+ <li class="db-traffic__list-row">
+ <span class="db-traffic__name">🇺🇸 United States</span>
+ <span class="db-traffic__value">41%</span>
+ </li>
+ <li class="db-traffic__list-row">
+ <span class="db-traffic__name">🇬🇧 United Kingdom</span>
+ <span class="db-traffic__value">12%</span>
+ </li>
+ <li class="db-traffic__list-row">
+ <span class="db-traffic__name">🇩🇪 Germany</span>
+ <span class="db-traffic__value">8%</span>
+ </li>
+ <li class="db-traffic__list-row">
+ <span class="db-traffic__name">🇨🇦 Canada</span>
+ <span class="db-traffic__value">7%</span>
+ </li>
+ <li class="db-traffic__list-row">
+ <span class="db-traffic__name">🇦🇺 Australia</span>
+ <span class="db-traffic__value">4%</span>
+ </li>
+ </ul>
</div>
</div>
</div>
- </div>
- <div class="db-section__callout">
- Spikes on Mar 8 and Mar 9 — a Hacker News post linking to the plugin
- release docs drove a surge in anonymous pageviews.
- </div>
- <div class="db-traffic__chart">
- PLACEHOLDER FOR TRAFFIC CHART
- </div>
-
- <div class="db-section__row">
- <div class="db-section__row-block">
- <div class="db-section__row-block-header">
- <a class="db-section__row-block-title">Top referrers<span
- class="db-link-arrow"
- >{{dIcon "arrow-right"}}</span></a>
- </div>
- <ul class="db-traffic__list">
- <li class="db-traffic__list-row">
- <span class="db-traffic__name">news.ycombinator.com</span>
- <span class="db-traffic__value">41%
- <span class="db-traffic__count">(34.2k)</span></span>
- </li>
- <li class="db-traffic__list-row">
- <span class="db-traffic__name">google.com</span>
- <span class="db-traffic__value">29%
- <span class="db-traffic__count">(24.5k)</span></span>
- </li>
- <li class="db-traffic__list-row">
- <span class="db-traffic__name">github.com</span>
- <span class="db-traffic__value">15%
- <span class="db-traffic__count">(12.3k)</span></span>
- </li>
- <li class="db-traffic__list-row">
- <span class="db-traffic__name">reddit.com/r/selfhosted</span>
- <span class="db-traffic__value">10%
- <span class="db-traffic__count">(8.0k)</span></span>
- </li>
- <li class="db-traffic__list-row">
- <span class="db-traffic__name">duckduckgo.com</span>
- <span class="db-traffic__value">5%
- <span class="db-traffic__count">(4.8k)</span></span>
- </li>
- </ul>
- </div>
- <div class="db-section__row-block">
- <h3 class="db-section__row-block-title">Top countries</h3>
- <ul class="db-traffic__list">
- <li class="db-traffic__list-row">
- <span class="db-traffic__name">🇺🇸 United States</span>
- <span class="db-traffic__value">41%</span>
- </li>
- <li class="db-traffic__list-row">
- <span class="db-traffic__name">🇬🇧 United Kingdom</span>
- <span class="db-traffic__value">12%</span>
- </li>
- <li class="db-traffic__list-row">
- <span class="db-traffic__name">🇩🇪 Germany</span>
- <span class="db-traffic__value">8%</span>
- </li>
- <li class="db-traffic__list-row">
- <span class="db-traffic__name">🇨🇦 Canada</span>
- <span class="db-traffic__value">7%</span>
- </li>
- <li class="db-traffic__list-row">
- <span class="db-traffic__name">🇦🇺 Australia</span>
- <span class="db-traffic__value">4%</span>
- </li>
- </ul>
- </div>
- </div>
- </DashboardSection>
-</template>
+ </DashboardSection>
+ </template>
+}
diff --git a/frontend/discourse/admin/components/redesigned-admin-dashboard.gjs b/frontend/discourse/admin/components/redesigned-admin-dashboard.gjs
index c2f9eefff05..2042eb72c8d 100644
--- a/frontend/discourse/admin/components/redesigned-admin-dashboard.gjs
+++ b/frontend/discourse/admin/components/redesigned-admin-dashboard.gjs
@@ -15,10 +15,6 @@ import { deepEqual } from "discourse/lib/object";
import { eq } from "discourse/truth-helpers";
import { i18n } from "discourse-i18n";
-function buildPending(committed) {
- return committed?.map((s) => ({ ...s })) ?? [];
-}
-
export default class RedesignedAdminDashboard extends Component {
@service currentUser;
@@ -29,21 +25,17 @@ export default class RedesignedAdminDashboard extends Component {
constructor() {
super(...arguments);
- this.pendingSections = buildPending(this.committedSections);
- }
-
- get committedSections() {
- return this.args.configuration?.sections ?? [];
- }
-
- get showSkeleton() {
- return this.args.loadingSections && !this.args.sections;
+ this.pendingSections = this.#buildPendingSections(
+ this.args.loadedSections?.configuration?.sections
+ );
}
@action
onMenuOpen() {
this._opened = true;
- this.pendingSections = buildPending(this.committedSections);
+ this.pendingSections = this.#buildPendingSections(
+ this.args.loadedSections?.configuration?.sections
+ );
}
@action
@@ -66,7 +58,11 @@ export default class RedesignedAdminDashboard extends Component {
if (this._saving || !this._opened) {
return;
}
- if (deepEqual(this.pendingSections, this.committedSections)) {
+
+ const committedSections =
+ this.args.loadedSections?.configuration?.sections ?? [];
+
+ if (deepEqual(this.pendingSections, committedSections)) {
return;
}
@@ -75,22 +71,28 @@ export default class RedesignedAdminDashboard extends Component {
.updateConfiguration(this.pendingSections)
.catch((e) => {
popupAjaxError(e);
- this.pendingSections = buildPending(this.committedSections);
+ this.pendingSections = this.#buildPendingSections(
+ this.args.loadedSections?.configuration?.sections
+ );
})
.finally(() => {
this._saving = false;
});
}
+ #buildPendingSections(sections) {
+ return sections?.map((section) => ({ ...section })) ?? [];
+ }
+
<template>
<div class="db-toolbar">
<h1>Dashboard</h1>
<div class="db-toolbar__actions">
<DashboardDateRange
- @period={{@period}}
- @startDate={{@startDate}}
- @endDate={{@endDate}}
+ @period={{@requestedPeriod}}
+ @startDate={{@requestedStartDate}}
+ @endDate={{@requestedEndDate}}
@setPeriod={{@setPeriod}}
@setCustomDateRange={{@setCustomDateRange}}
/>
@@ -119,40 +121,42 @@ export default class RedesignedAdminDashboard extends Component {
</div>
<div class="db-main">
- {{#if this.showSkeleton}}
- <DashboardSkeleton />
- {{else}}
- {{#each @sections key="id" as |section|}}
+ {{#if @loadedSections}}
+ {{#each @loadedSections.sections key="id" as |section|}}
<div class="db-main__section" data-section-id={{section.id}}>
{{#if (eq section.id "highlights")}}
<DashboardHighlights
@highlights={{section.data}}
- @period={{@period}}
+ @period={{@loadedSections.period}}
@loading={{@loadingSections}}
@fetchError={{@sectionsFetchError}}
- @startDate={{@startDate}}
- @endDate={{@endDate}}
+ @startDate={{@loadedSections.startDate}}
+ @endDate={{@loadedSections.endDate}}
/>
{{else if (eq section.id "reports")}}
<DashboardReports
- @startDate={{@startDate}}
- @endDate={{@endDate}}
+ @startDate={{@loadedSections.startDate}}
+ @endDate={{@loadedSections.endDate}}
/>
{{else if (eq section.id "traffic")}}
<DashboardTraffic
- @startDate={{@startDate}}
- @endDate={{@endDate}}
+ @traffic={{section.data}}
+ @period={{@loadedSections.period}}
+ @loading={{@loadingSections}}
+ @fetchError={{@sectionsFetchError}}
+ @startDate={{@loadedSections.startDate}}
+ @endDate={{@loadedSections.endDate}}
/>
{{else if (eq section.id "engagement")}}
<DashboardEngagement
- @startDate={{@startDate}}
- @endDate={{@endDate}}
+ @startDate={{@loadedSections.startDate}}
+ @endDate={{@loadedSections.endDate}}
/>
{{/if}}
</div>
{{/each}}
- {{#unless @sections.length}}
+ {{#unless @loadedSections.sections.length}}
<div class="db-main__empty" role="status" aria-live="polite">
{{#if this.currentUser.admin}}
{{i18n "admin.dashboard.configure.empty_state_admin"}}
@@ -161,6 +165,8 @@ export default class RedesignedAdminDashboard extends Component {
{{/if}}
</div>
{{/unless}}
+ {{else if @loadingSections}}
+ <DashboardSkeleton />
{{/if}}
</div>
</template>
diff --git a/frontend/discourse/admin/controllers/admin/dashboard.js b/frontend/discourse/admin/controllers/admin/dashboard.js
index 28075fd2782..76d94b5155f 100644
--- a/frontend/discourse/admin/controllers/admin/dashboard.js
+++ b/frontend/discourse/admin/controllers/admin/dashboard.js
@@ -18,6 +18,7 @@ const PROBLEMS_CHECK_MINUTES = 1;
export default class AdminDashboardController extends Controller {
@service router;
@service siteSettings;
+ @service loadingSlider;
@controller("exception") exceptionController;
@tracked loadingProblems = false;
@@ -25,8 +26,7 @@ export default class AdminDashboardController extends Controller {
@tracked range = DEFAULT_PERIOD;
@tracked start_date = null;
@tracked end_date = null;
- @tracked sections = null;
- @tracked configuration = null;
+ @tracked loadedSections = null;
@tracked loadingSections = false;
@tracked sectionsFetchError = false;
@autoTrackedArray problems;
@@ -36,6 +36,7 @@ export default class AdminDashboardController extends Controller {
isLoading = false;
dashboardFetchedAt = null;
_sectionsLoadId = 0;
+ _sectionsLoadingCount = 0;
get safePeriod() {
if (!VALID_PERIODS.includes(this.range)) {
@@ -95,25 +96,46 @@ export default class AdminDashboardController extends Controller {
async fetchSections() {
const id = ++this._sectionsLoadId;
+ const period = this.safePeriod;
+ const startDate = this.startDate;
+ const endDate = this.endDate;
+
this.loadingSections = true;
this.sectionsFetchError = false;
+ this._sectionsLoadingCount += 1;
+ if (this._sectionsLoadingCount === 1) {
+ this.loadingSlider.transitionStarted();
+ }
+
try {
const model = await AdminDashboard.fetch({
- startDate: this.startDate,
- endDate: this.endDate,
+ startDate,
+ endDate,
});
+
if (id !== this._sectionsLoadId) {
return;
}
- this.sections = model.sections;
- this.configuration = model.configuration;
+
+ this.loadedSections = {
+ period,
+ startDate,
+ endDate,
+ sections: model.sections,
+ configuration: model.configuration,
+ };
} catch {
if (id !== this._sectionsLoadId) {
return;
}
this.sectionsFetchError = true;
} finally {
+ this._sectionsLoadingCount = Math.max(this._sectionsLoadingCount - 1, 0);
+ if (this._sectionsLoadingCount === 0) {
+ this.loadingSlider.transitionEnded();
+ }
+
if (id === this._sectionsLoadId) {
this.loadingSections = false;
}
diff --git a/frontend/discourse/admin/models/report.js b/frontend/discourse/admin/models/report.js
index 09d3d38db0f..91ed2db8139 100644
--- a/frontend/discourse/admin/models/report.js
+++ b/frontend/discourse/admin/models/report.js
@@ -63,31 +63,31 @@ export default class Report extends EmberObject {
} else if (grouping === "weekly" || grouping === "monthly") {
const isoKind = grouping === "weekly" ? "isoWeek" : "month";
const kind = grouping === "weekly" ? "week" : "month";
- const startMoment = moment(model.start_date, "YYYY-MM-DD");
+ const selectedStart = Report.#dateMoment(model.start_date);
+ const selectedEnd = Report.#dateMoment(model.end_date);
let currentIndex = 0;
- let currentStart = startMoment.clone().startOf(isoKind);
- let currentEnd = startMoment.clone().endOf(isoKind);
- const transformedData = [
- {
- x: currentStart.format("YYYY-MM-DD"),
- y: 0,
- },
- ];
+ let currentStart = selectedStart.clone().startOf(isoKind);
+ let currentEnd = selectedStart.clone().endOf(isoKind);
+ const bucketStart = () => moment.max(currentStart, selectedStart);
+ const bucketEnd = () => moment.min(currentEnd, selectedEnd);
+ const bucket = () => ({
+ x: bucketStart().format("YYYY-MM-DD"),
+ y: 0,
+ end_date: bucketEnd().format("YYYY-MM-DD"),
+ });
+ const transformedData = [bucket()];
let appliedAverage = false;
data.forEach((d) => {
- const date = moment(d.x, "YYYY-MM-DD");
+ const date = Report.#dateMoment(d.x);
- if (
- !date.isSame(currentStart) &&
- !date.isBetween(currentStart, currentEnd)
- ) {
+ while (date.isAfter(currentEnd)) {
if (model.average) {
transformedData[currentIndex].y = applyAverage(
transformedData[currentIndex].y,
- currentStart,
- currentEnd
+ bucketStart(),
+ bucketEnd()
);
appliedAverage = true;
@@ -96,25 +96,18 @@ export default class Report extends EmberObject {
currentIndex += 1;
currentStart = currentStart.add(1, kind).startOf(isoKind);
currentEnd = currentEnd.add(1, kind).endOf(isoKind);
- } else {
- appliedAverage = false;
+ transformedData[currentIndex] = bucket();
}
- if (transformedData[currentIndex]) {
- transformedData[currentIndex].y += d.y;
- } else {
- transformedData[currentIndex] = {
- x: d.x,
- y: d.y,
- };
- }
+ transformedData[currentIndex].y += d.y;
+ appliedAverage = false;
});
if (model.average && !appliedAverage) {
transformedData[currentIndex].y = applyAverage(
transformedData[currentIndex].y,
- currentStart,
- moment(model.end_date).subtract(1, "day") // remove 1 day as model end date is at 00:00 of next day
+ bucketStart(),
+ bucketEnd()
);
}
@@ -199,6 +192,18 @@ export default class Report extends EmberObject {
});
}
+ static #dateMoment(value) {
+ if (moment.isMoment(value)) {
+ return value.clone().startOf("day");
+ }
+
+ if (value instanceof Date) {
+ return moment(value).startOf("day");
+ }
+
+ return moment.utc(value).startOf("day");
+ }
+
average = false;
percent = false;
higher_is_better = true;
diff --git a/frontend/discourse/admin/routes/admin/dashboard.js b/frontend/discourse/admin/routes/admin/dashboard.js
index 3287db16430..a6776b591c5 100644
--- a/frontend/discourse/admin/routes/admin/dashboard.js
+++ b/frontend/discourse/admin/routes/admin/dashboard.js
@@ -11,7 +11,11 @@ export default class AdminDashboardRoute extends DiscourseRoute {
}
activate() {
- const controller = this.controllerFor("admin.dashboard");
+ scrollTop();
+ }
+
+ setupController(controller) {
+ super.setupController(...arguments);
if (this.siteSettings.dashboard_improvements) {
controller.fetchSections();
@@ -19,7 +23,5 @@ export default class AdminDashboardRoute extends DiscourseRoute {
controller.fetchProblems();
controller.fetchDashboard();
}
-
- scrollTop();
}
}
diff --git a/frontend/discourse/admin/templates/admin/dashboard.gjs b/frontend/discourse/admin/templates/admin/dashboard.gjs
index fb064d19026..cd7aa449096 100644
--- a/frontend/discourse/admin/templates/admin/dashboard.gjs
+++ b/frontend/discourse/admin/templates/admin/dashboard.gjs
@@ -10,13 +10,12 @@ import { i18n } from "discourse-i18n";
export default <template>
{{#if @controller.siteSettings.dashboard_improvements}}
<RedesignedAdminDashboard
- @period={{@controller.safePeriod}}
- @startDate={{@controller.startDate}}
- @endDate={{@controller.endDate}}
+ @requestedPeriod={{@controller.safePeriod}}
+ @requestedStartDate={{@controller.startDate}}
+ @requestedEndDate={{@controller.endDate}}
@setPeriod={{@controller.setPeriod}}
@setCustomDateRange={{@controller.setCustomDateRange}}
- @sections={{@controller.sections}}
- @configuration={{@controller.configuration}}
+ @loadedSections={{@controller.loadedSections}}
@updateConfiguration={{@controller.updateConfiguration}}
@loadingSections={{@controller.loadingSections}}
@sectionsFetchError={{@controller.sectionsFetchError}}
diff --git a/frontend/discourse/tests/integration/components/dashboard/date-range-test.gjs b/frontend/discourse/tests/integration/components/dashboard/date-range-test.gjs
index fc4478baecc..c08f7f21efa 100644
--- a/frontend/discourse/tests/integration/components/dashboard/date-range-test.gjs
+++ b/frontend/discourse/tests/integration/components/dashboard/date-range-test.gjs
@@ -1,8 +1,11 @@
import { tracked } from "@glimmer/tracking";
import { click, render, settled } from "@ember/test-helpers";
import { module, test } from "qunit";
-import DashboardDateRange from "discourse/admin/components/dashboard/date-range";
+import DashboardDateRange, {
+ calculatePresetStartDate,
+} from "discourse/admin/components/dashboard/date-range";
import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { withFrozenTime } from "discourse/tests/helpers/qunit-helpers";
module("Integration | Component | Dashboard | DateRange", function (hooks) {
setupRenderingTest(hooks);
@@ -62,6 +65,23 @@ module("Integration | Component | Dashboard | DateRange", function (hooks) {
assert.deepEqual(calls, ["last_7_days"], "fires with the chosen value");
});
+ test("preset start dates include exactly the named period through today", function (assert) {
+ withFrozenTime("2026-05-14 12:00:00", "UTC", () => {
+ assert.strictEqual(
+ moment(calculatePresetStartDate("last_7_days")).format("YYYY-MM-DD"),
+ "2026-05-08"
+ );
+ assert.strictEqual(
+ moment(calculatePresetStartDate("last_30_days")).format("YYYY-MM-DD"),
+ "2026-04-15"
+ );
+ assert.strictEqual(
+ moment(calculatePresetStartDate("last_3_months")).format("YYYY-MM-DD"),
+ "2026-02-15"
+ );
+ });
+ });
+
test("does not call @setPeriod when the custom item is clicked", async function (assert) {
const calls = [];
const setPeriod = (period) => calls.push(period);
diff --git a/frontend/discourse/tests/unit/models/report-test.js b/frontend/discourse/tests/unit/models/report-test.js
index 41ce2f6f05f..5080a6cba0a 100644
--- a/frontend/discourse/tests/unit/models/report-test.js
+++ b/frontend/discourse/tests/unit/models/report-test.js
@@ -1,6 +1,7 @@
import { getOwner } from "@ember/owner";
import { setupTest } from "ember-qunit";
import { module, test } from "qunit";
+import Report from "discourse/admin/models/report";
import { setPrefix } from "discourse/lib/get-url";
function reportWithData(data) {
@@ -18,6 +19,85 @@ function reportWithData(data) {
module("Unit | Model | report", function (hooks) {
setupTest(hooks);
+ test("collapse groups by calendar period and clamps partial edge buckets", function (assert) {
+ assert.deepEqual(
+ Report.collapse(
+ { start_date: "2026-03-01", end_date: "2026-04-04" },
+ [
+ { x: "2026-03-01", y: 1 },
+ { x: "2026-03-07", y: 2 },
+ { x: "2026-03-08", y: 4 },
+ { x: "2026-04-04", y: 8 },
+ ],
+ "weekly"
+ ),
+ [
+ { x: "2026-03-01", y: 1, end_date: "2026-03-01" },
+ { x: "2026-03-02", y: 6, end_date: "2026-03-08" },
+ { x: "2026-03-09", y: 0, end_date: "2026-03-15" },
+ { x: "2026-03-16", y: 0, end_date: "2026-03-22" },
+ { x: "2026-03-23", y: 0, end_date: "2026-03-29" },
+ { x: "2026-03-30", y: 8, end_date: "2026-04-04" },
+ ]
+ );
+
+ assert.deepEqual(
+ Report.collapse(
+ { start_date: "2025-01-15", end_date: "2025-04-10" },
+ [
+ { x: "2025-01-15", y: 1 },
+ { x: "2025-01-31", y: 2 },
+ { x: "2025-02-01", y: 4 },
+ { x: "2025-04-10", y: 8 },
+ ],
+ "monthly"
+ ),
+ [
+ { x: "2025-01-15", y: 3, end_date: "2025-01-31" },
+ { x: "2025-02-01", y: 4, end_date: "2025-02-28" },
+ { x: "2025-03-01", y: 0, end_date: "2025-03-31" },
+ { x: "2025-04-01", y: 8, end_date: "2025-04-10" },
+ ]
+ );
+ });
+
+ test("collapse averages partial edge buckets over the displayed date range", function (assert) {
+ assert.deepEqual(
+ Report.collapse(
+ { start_date: "2026-03-01", end_date: "2026-03-08", average: true },
+ [
+ { x: "2026-03-01", y: 2 },
+ { x: "2026-03-02", y: 2 },
+ { x: "2026-03-08", y: 7 },
+ ],
+ "weekly"
+ ),
+ [
+ { x: "2026-03-01", y: 2, end_date: "2026-03-01" },
+ { x: "2026-03-02", y: 1.29, end_date: "2026-03-08" },
+ ]
+ );
+
+ assert.deepEqual(
+ Report.collapse(
+ { start_date: "2025-01-15", end_date: "2025-04-10", average: true },
+ [
+ { x: "2025-01-15", y: 17 },
+ { x: "2025-01-31", y: 17 },
+ { x: "2025-04-01", y: 10 },
+ { x: "2025-04-10", y: 10 },
+ ],
+ "monthly"
+ ),
+ [
+ { x: "2025-01-15", y: 2, end_date: "2025-01-31" },
+ { x: "2025-02-01", y: 0, end_date: "2025-02-28" },
+ { x: "2025-03-01", y: 0, end_date: "2025-03-31" },
+ { x: "2025-04-01", y: 2, end_date: "2025-04-10" },
+ ]
+ );
+ });
+
test("counts", function (assert) {
const report = reportWithData.call(
this,
diff --git a/spec/fabricators/application_request_fabricator.rb b/spec/fabricators/application_request_fabricator.rb
new file mode 100644
index 00000000000..5d1aad0fb14
--- /dev/null
+++ b/spec/fabricators/application_request_fabricator.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+Fabricator(:application_request) do
+ transient request_type: :page_view_logged_in_browser
+
+ date { Date.current }
+ count 1
+ req_type { |transients| ApplicationRequest.req_types.fetch(transients[:request_type].to_s) }
+end
+
+Fabricator(:logged_in_application_request, from: :application_request) do
+ transient request_type: :page_view_logged_in
+end
+
+Fabricator(:anonymous_application_request, from: :application_request) do
+ transient request_type: :page_view_anon
+end
+
+Fabricator(:logged_in_browser_application_request, from: :application_request) do
+ transient request_type: :page_view_logged_in_browser
+end
+
+Fabricator(:logged_in_browser_mobile_application_request, from: :application_request) do
+ transient request_type: :page_view_logged_in_browser_mobile
+end
+
+Fabricator(:logged_in_browser_beacon_application_request, from: :application_request) do
+ transient request_type: :page_view_logged_in_browser_beacon
+end
+
+Fabricator(:anonymous_browser_application_request, from: :application_request) do
+ transient request_type: :page_view_anon_browser
+end
+
+Fabricator(:anonymous_browser_mobile_application_request, from: :application_request) do
+ transient request_type: :page_view_anon_browser_mobile
+end
+
+Fabricator(:anonymous_browser_beacon_application_request, from: :application_request) do
+ transient request_type: :page_view_anon_browser_beacon
+end
+
+Fabricator(:embedded_application_request, from: :application_request) do
+ transient request_type: :page_view_embed
+end
+
+Fabricator(:crawler_application_request, from: :application_request) do
+ transient request_type: :page_view_crawler
+end
diff --git a/spec/requests/admin/dashboard_controller_spec.rb b/spec/requests/admin/dashboard_controller_spec.rb
index 473e0b54c8e..74e96a2b00c 100644
--- a/spec/requests/admin/dashboard_controller_spec.rb
+++ b/spec/requests/admin/dashboard_controller_spec.rb
@@ -96,6 +96,15 @@ RSpec.describe Admin::DashboardController do
end
end
+ context "when anonymous" do
+ it "denies access with a 404 response" do
+ get "/admin/dashboard.json"
+
+ expect(response.status).to eq(404)
+ expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
+ end
+ end
+
describe "sections payload" do
before do
SiteSetting.dashboard_improvements = true
@@ -104,13 +113,143 @@ RSpec.describe Admin::DashboardController do
sign_in(admin)
end
- def highlights_data
- sections = response.parsed_body["sections"]
- sections.find { |s| s["id"] == "highlights" }&.dig("data")
+ let(:section_payloads) do
+ response.parsed_body["sections"].index_by { |section| section["id"] }
+ end
+
+ context "with highlights_data" do
+ let(:highlights_data) { section_payloads["highlights"]&.dig("data") }
+
+ it "returns the highlights payload for the selected dates" do
+ Fabricate(:user, created_at: Time.zone.local(2026, 4, 10))
+ Fabricate(:user, created_at: Time.zone.local(2026, 4, 15))
+ Fabricate(:user, created_at: Time.zone.local(2026, 3, 10))
+
+ get "/admin/dashboard.json", params: { start_date: "2026-04-01", end_date: "2026-04-28" }
+
+ expect(response.status).to eq(200)
+ expect(highlights_data).to eq(
+ "kpis" => [
+ {
+ "type" => "new_signups",
+ "value" => 2,
+ "previous_value" => 1,
+ "percent_change" => 100.0,
+ "report_type" => "signups",
+ "report_query" => {
+ "start_date" => "2026-04-01",
+ "end_date" => "2026-04-28",
+ },
+ },
+ {
+ "type" => "dau_mau",
+ "value" => nil,
+ "previous_value" => nil,
+ "percent_change" => nil,
+ "report_type" => "dau_by_mau",
+ "report_query" => {
+ "start_date" => "2026-04-01",
+ "end_date" => "2026-04-28",
+ },
+ },
+ {
+ "type" => "new_contributors",
+ "value" => nil,
+ "previous_value" => 0,
+ "percent_change" => nil,
+ "report_type" => "new_contributors",
+ "report_query" => {
+ "start_date" => "2026-04-01",
+ "end_date" => "2026-04-28",
+ },
+ },
+ ],
+ )
+ end
+ end
+
+ context "with traffic_data" do
+ let(:traffic_data) { section_payloads["traffic"]&.dig("data") }
+
+ it "returns the site traffic payload for the selected dates" do
+ SiteSetting.use_legacy_pageviews = false
+ SiteSetting.embed_topics_list = true
+
+ Fabricate(:embeddable_host)
+ Fabricate(:logged_in_browser_application_request, date: "2026-04-28", count: 1)
+ Fabricate(:anonymous_browser_application_request, date: "2026-04-29", count: 2)
+
+ Fabricate(:logged_in_browser_application_request, date: "2026-05-01", count: 10)
+ Fabricate(:anonymous_browser_application_request, date: "2026-05-02", count: 20)
+
+ Fabricate(:embedded_application_request, date: "2026-05-02", count: 4)
+ Fabricate(:crawler_application_request, date: "2026-05-03", count: 3)
+
+ get "/admin/dashboard.json", params: { start_date: "2026-05-01", end_date: "2026-05-03" }
+
+ expect(traffic_data).to eq(
+ "kpis" => {
+ "browser_pageviews" => {
+ "value" => 30,
+ "percent_change" => 900,
+ "comparison_period" => {
+ "start_date" => "2026-04-28",
+ "end_date" => "2026-04-30",
+ },
+ },
+ "logged_in_share" => {
+ "value" => 33,
+ },
+ },
+ "pageview_series" => [
+ {
+ "req" => "page_view_logged_in_browser",
+ "label" => I18n.t("reports.site_traffic.xaxis.page_view_logged_in_browser"),
+ "color" => "#4B3CE0",
+ "data" => [
+ { "x" => "2026-05-01", "y" => 10 },
+ { "x" => "2026-05-02", "y" => 0 },
+ { "x" => "2026-05-03", "y" => 0 },
+ ],
+ },
+ {
+ "req" => "page_view_anon_browser",
+ "label" => I18n.t("reports.site_traffic.xaxis.page_view_anon_browser"),
+ "color" => "#9C8DEC",
+ "data" => [
+ { "x" => "2026-05-01", "y" => 0 },
+ { "x" => "2026-05-02", "y" => 20 },
+ { "x" => "2026-05-03", "y" => 0 },
+ ],
+ },
+ {
+ "req" => "page_view_embed",
+ "label" => I18n.t("reports.site_traffic.xaxis.page_view_embed"),
+ "color" => "#E6E1F8",
+ "data" => [
+ { "x" => "2026-05-01", "y" => 0 },
+ { "x" => "2026-05-02", "y" => 4 },
+ { "x" => "2026-05-03", "y" => 0 },
+ ],
+ },
+ {
+ "req" => "page_view_crawler",
+ "label" => I18n.t("reports.site_traffic.xaxis.page_view_crawler"),
+ "color" => "#D5CDF7",
+ "data" => [
+ { "x" => "2026-05-01", "y" => 0 },
+ { "x" => "2026-05-02", "y" => 0 },
+ { "x" => "2026-05-03", "y" => 3 },
+ ],
+ },
+ ],
+ )
+ end
end
it "is omitted when dashboard_improvements is disabled" do
SiteSetting.dashboard_improvements = false
+
get "/admin/dashboard.json"
expect(response.status).to eq(200)
@@ -118,15 +257,23 @@ RSpec.describe Admin::DashboardController do
expect(response.parsed_body["configuration"]).to be_nil
end
- it "includes a highlights section with kpis" do
- get "/admin/dashboard.json"
+ it "falls back to default dates when date params are malformed" do
+ get "/admin/dashboard.json", params: { start_date: "garbage", end_date: "also-garbage" }
expect(response.status).to eq(200)
- expect(highlights_data["kpis"]).to be_an(Array)
+ expect(section_payloads.keys).to contain_exactly(
+ "highlights",
+ "reports",
+ "traffic",
+ "engagement",
+ )
+ expect(section_payloads.dig("highlights", "data")).to be_present
+ expect(section_payloads.dig("traffic", "data")).to be_present
end
it "returns the sections as an ordered array of {id, data}" do
SiteSetting.admin_dashboard_sections = "reports|highlights"
+
get "/admin/dashboard.json"
ids = response.parsed_body["sections"].map { |s| s["id"] }
@@ -135,6 +282,7 @@ RSpec.describe Admin::DashboardController do
it "omits hidden sections from the data payload" do
SiteSetting.admin_dashboard_sections = "highlights|reports"
+
get "/admin/dashboard.json"
ids = response.parsed_body["sections"].map { |s| s["id"] }
@@ -143,66 +291,32 @@ RSpec.describe Admin::DashboardController do
it "leaves data null for sections without a builder yet" do
SiteSetting.admin_dashboard_sections = "highlights|reports"
+
get "/admin/dashboard.json"
reports = response.parsed_body["sections"].find { |s| s["id"] == "reports" }
expect(reports["data"]).to be_nil
end
- it "returns the documented payload shape for new_signups" do
- freeze_time(Time.utc(2026, 4, 28, 12, 0, 0)) do
- Fabricate(:user, created_at: 5.days.ago)
- get "/admin/dashboard.json", params: { start_date: "2026-03-01", end_date: "2026-04-28" }
-
- kpis = highlights_data["kpis"]
- signups = kpis.find { |k| k["type"] == "new_signups" }
-
- expect(signups).to include(
- "type" => "new_signups",
- "report_type" => "signups",
- "report_query" => {
- "start_date" => "2026-03-01",
- "end_date" => "2026-04-28",
- },
- )
- expect(signups["value"]).to be >= 1
- expect(signups).to have_key("previous_value")
- expect(signups).to have_key("percent_change")
- end
- end
-
- it "honours start_date and end_date query params" do
- Fabricate(:user, created_at: 2.days.ago)
- get "/admin/dashboard.json",
- params: {
- start_date: 7.days.ago.strftime("%Y-%m-%d"),
- end_date: Date.current.strftime("%Y-%m-%d"),
- }
-
- expect(response.status).to eq(200)
- expect(highlights_data["kpis"]).to be_an(Array)
- end
-
- it "ignores malformed date params and falls back to defaults" do
- get "/admin/dashboard.json", params: { start_date: "garbage", end_date: "also-garbage" }
-
- expect(response.status).to eq(200)
- expect(highlights_data).to be_present
- end
-
it "denies non-staff users" do
sign_in(user)
+
get "/admin/dashboard.json"
expect(response.status).to eq(404)
+ expect(response.parsed_body["errors"]).to include(I18n.t("not_found"))
end
it "allows moderators and returns the sections payload" do
sign_in(moderator)
+
get "/admin/dashboard.json"
expect(response.status).to eq(200)
- expect(highlights_data).to be_present
+ expect(response.parsed_body["sections"].map { |section| section["id"] }).to include(
+ "highlights",
+ "traffic",
+ )
end
it "omits version_check when the flag is on" do
@@ -235,18 +349,22 @@ RSpec.describe Admin::DashboardController do
it "is included for admins and lists every known section with a visibility flag" do
SiteSetting.admin_dashboard_sections = "highlights|reports"
sign_in(admin)
+
get "/admin/dashboard.json"
configuration = response.parsed_body["configuration"]
expect(configuration).to be_present
+
ids = configuration["sections"].map { |s| s["id"] }
expect(ids).to match_array(%w[highlights reports traffic engagement])
+
visible = configuration["sections"].select { |s| s["visible"] }.map { |s| s["id"] }
expect(visible).to eq(%w[highlights reports])
end
it "is omitted for moderators" do
sign_in(moderator)
+
get "/admin/dashboard.json"
expect(response.status).to eq(200)
@@ -256,6 +374,7 @@ RSpec.describe Admin::DashboardController do
it "is omitted when dashboard_improvements is disabled" do
SiteSetting.dashboard_improvements = false
sign_in(admin)
+
get "/admin/dashboard.json"
expect(response.parsed_body).not_to have_key("configuration")
@@ -271,6 +390,7 @@ RSpec.describe Admin::DashboardController do
it "returns 204 and writes the site setting for admins" do
sign_in(admin)
+
put "/admin/dashboard/configuration.json",
params: {
sections: [
@@ -286,6 +406,7 @@ RSpec.describe Admin::DashboardController do
it "drops unknown section ids silently" do
sign_in(admin)
+
put "/admin/dashboard/configuration.json",
params: {
sections: [{ id: "frobnitz", visible: true }, { id: "highlights", visible: true }],
@@ -297,6 +418,7 @@ RSpec.describe Admin::DashboardController do
it "coerces non-boolean visible values" do
sign_in(admin)
+
put "/admin/dashboard/configuration.json",
params: {
sections: [
@@ -311,6 +433,7 @@ RSpec.describe Admin::DashboardController do
it "treats an empty sections array as hide-everything" do
sign_in(admin)
+
put "/admin/dashboard/configuration.json", params: { sections: [] }
expect(response.status).to eq(204)
@@ -319,6 +442,7 @@ RSpec.describe Admin::DashboardController do
it "treats a missing sections key the same as an empty array" do
sign_in(admin)
+
put "/admin/dashboard/configuration.json"
expect(response.status).to eq(204)
@@ -327,6 +451,7 @@ RSpec.describe Admin::DashboardController do
it "returns 404 for moderators" do
sign_in(moderator)
+
put "/admin/dashboard/configuration.json",
params: {
sections: [{ id: "highlights", visible: true }],
@@ -346,12 +471,14 @@ RSpec.describe Admin::DashboardController do
it "reflects the new configuration for moderators on a subsequent GET" do
sign_in(admin)
+
put "/admin/dashboard/configuration.json",
params: {
sections: [{ id: "highlights", visible: true }],
}
sign_in(moderator)
+
get "/admin/dashboard.json"
ids = response.parsed_body["sections"].map { |s| s["id"] }
diff --git a/spec/services/admin_dashboard_site_traffic_spec.rb b/spec/services/admin_dashboard_site_traffic_spec.rb
new file mode 100644
index 00000000000..f341881f74a
--- /dev/null
+++ b/spec/services/admin_dashboard_site_traffic_spec.rb
@@ -0,0 +1,528 @@
+# frozen_string_literal: true
+
+RSpec.describe AdminDashboardSiteTraffic do
+ before do
+ freeze_time(Time.zone.local(2026, 5, 14, 12, 0, 0))
+ SiteSetting.use_legacy_pageviews = false
+ end
+
+ def traffic_point(date, count)
+ { x: date, y: count }
+ end
+
+ def traffic_series(id, data, req: traffic_series_req(id))
+ canonical_req = traffic_series_req(id)
+
+ {
+ req: req,
+ label: I18n.t("reports.site_traffic.xaxis.#{canonical_req}"),
+ color: Reports::SiteTraffic::SERIES_COLORS.fetch(canonical_req),
+ data: data,
+ }
+ end
+
+ def traffic_series_req(id)
+ {
+ logged_in: "page_view_logged_in_browser",
+ anonymous: "page_view_anon_browser",
+ embedded: "page_view_embed",
+ crawlers: "page_view_crawler",
+ }.fetch(id)
+ end
+
+ def traffic_series_data(response, id, req: traffic_series_req(id))
+ response[:pageview_series].find { |traffic_series| traffic_series[:req] == req }[:data]
+ end
+
+ describe ".build" do
+ it "returns public-community KPIs and pageview series for selected dates" do
+ SiteSetting.embed_topics_list = true
+ Fabricate(:embeddable_host)
+
+ Fabricate(:logged_in_browser_application_request, date: "2026-04-28", count: 1)
+ Fabricate(:anonymous_browser_application_request, date: "2026-04-29", count: 2)
+
+ Fabricate(:logged_in_browser_application_request, date: "2026-05-01", count: 10)
+ Fabricate(:anonymous_browser_application_request, date: "2026-05-02", count: 20)
+
+ Fabricate(:embedded_application_request, date: "2026-05-02", count: 4)
+ Fabricate(:crawler_application_request, date: "2026-05-03", count: 3)
+
+ expect(described_class.build(start_date: "2026-05-01", end_date: "2026-05-03")).to eq(
+ kpis: {
+ browser_pageviews: {
+ value: 30,
+ percent_change: 900,
+ comparison_period: {
+ start_date: "2026-04-28",
+ end_date: "2026-04-30",
+ },
+ },
+ logged_in_share: {
+ value: 33,
+ },
+ },
+ pageview_series: [
+ traffic_series(
+ :logged_in,
+ [
+ traffic_point("2026-05-01", 10),
+ traffic_point("2026-05-02", 0),
+ traffic_point("2026-05-03", 0),
+ ],
+ ),
+ traffic_series(
+ :anonymous,
+ [
+ traffic_point("2026-05-01", 0),
+ traffic_point("2026-05-02", 20),
+ traffic_point("2026-05-03", 0),
+ ],
+ ),
+ traffic_series(
+ :embedded,
+ [
+ traffic_point("2026-05-01", 0),
+ traffic_point("2026-05-02", 4),
+ traffic_point("2026-05-03", 0),
+ ],
+ ),
+ traffic_series(
+ :crawlers,
+ [
+ traffic_point("2026-05-01", 0),
+ traffic_point("2026-05-02", 0),
+ traffic_point("2026-05-03", 3),
+ ],
+ ),
+ ],
+ )
+ end
+
+ it "returns a negative trend when current pageviews are below the comparison period" do
+ Fabricate(:logged_in_browser_application_request, date: "2026-04-28", count: 20)
+
+ Fabricate(:logged_in_browser_application_request, date: "2026-05-01", count: 5)
+
+ expect(described_class.build(start_date: "2026-05-01", end_date: "2026-05-03")).to eq(
+ kpis: {
+ browser_pageviews: {
+ value: 5,
+ percent_change: -75,
+ comparison_period: {
+ start_date: "2026-04-28",
+ end_date: "2026-04-30",
+ },
+ },
+ logged_in_share: {
+ value: 100,
+ },
+ },
+ pageview_series: [
+ traffic_series(
+ :logged_in,
+ [
+ traffic_point("2026-05-01", 5),
+ traffic_point("2026-05-02", 0),
+ traffic_point("2026-05-03", 0),
+ ],
+ ),
+ traffic_series(
+ :anonymous,
+ [
+ traffic_point("2026-05-01", 0),
+ traffic_point("2026-05-02", 0),
+ traffic_point("2026-05-03", 0),
+ ],
+ ),
+ traffic_series(
+ :crawlers,
+ [
+ traffic_point("2026-05-01", 0),
+ traffic_point("2026-05-02", 0),
+ traffic_point("2026-05-03", 0),
+ ],
+ ),
+ ],
+ )
+ end
+
+ it "returns daily rows for longer selected date ranges" do
+ Fabricate(:logged_in_browser_application_request, date: "2026-02-28", count: 99)
+
+ Fabricate(:logged_in_browser_application_request, date: "2026-03-01", count: 1)
+ Fabricate(:logged_in_browser_application_request, date: "2026-03-07", count: 2)
+ Fabricate(:logged_in_browser_application_request, date: "2026-03-08", count: 4)
+ Fabricate(:logged_in_browser_application_request, date: "2026-04-04", count: 8)
+ Fabricate(:anonymous_browser_application_request, date: "2026-03-08", count: 10)
+
+ response = described_class.build(start_date: "2026-03-01", end_date: "2026-04-04")
+
+ dates = (Date.iso8601("2026-03-01")..Date.iso8601("2026-04-04")).map(&:iso8601)
+ logged_in_counts = {
+ "2026-03-01" => 1,
+ "2026-03-07" => 2,
+ "2026-03-08" => 4,
+ "2026-04-04" => 8,
+ }
+ anonymous_counts = { "2026-03-08" => 10 }
+
+ expect(traffic_series_data(response, :logged_in)).to eq(
+ dates.map { |date| traffic_point(date, logged_in_counts.fetch(date, 0)) },
+ )
+ expect(traffic_series_data(response, :anonymous)).to eq(
+ dates.map { |date| traffic_point(date, anonymous_counts.fetch(date, 0)) },
+ )
+ end
+
+ it "omits trend data when the comparison period has no pageviews" do
+ Fabricate(:logged_in_browser_application_request, date: "2026-04-01", count: 1)
+
+ Fabricate(:logged_in_browser_application_request, date: "2026-05-01", count: 8)
+
+ expect(described_class.build(start_date: "2026-05-01", end_date: "2026-05-03")[:kpis]).to eq(
+ browser_pageviews: {
+ value: 8,
+ },
+ logged_in_share: {
+ value: 100,
+ },
+ )
+ end
+
+ it "omits trend data when current pageviews match the comparison period" do
+ Fabricate(:logged_in_browser_application_request, date: "2026-04-28", count: 8)
+
+ Fabricate(:logged_in_browser_application_request, date: "2026-05-01", count: 8)
+
+ expect(described_class.build(start_date: "2026-05-01", end_date: "2026-05-03")[:kpis]).to eq(
+ browser_pageviews: {
+ value: 8,
+ },
+ logged_in_share: {
+ value: 100,
+ },
+ )
+ end
+
+ it "omits trend data when the percentage change is below the display threshold" do
+ Fabricate(:logged_in_browser_application_request, date: "2026-04-28", count: 200_000)
+
+ Fabricate(:logged_in_browser_application_request, date: "2026-05-01", count: 200_001)
+
+ expect(described_class.build(start_date: "2026-05-01", end_date: "2026-05-03")[:kpis]).to eq(
+ browser_pageviews: {
+ value: 200_001,
+ },
+ logged_in_share: {
+ value: 100,
+ },
+ )
+ end
+
+ it "returns one decimal place for trend changes below one percent" do
+ Fabricate(:logged_in_browser_application_request, date: "2026-04-28", count: 10_000)
+
+ Fabricate(:logged_in_browser_application_request, date: "2026-05-01", count: 10_050)
+
+ expect(described_class.build(start_date: "2026-05-01", end_date: "2026-05-03")[:kpis]).to eq(
+ browser_pageviews: {
+ value: 10_050,
+ percent_change: 0.5,
+ comparison_period: {
+ start_date: "2026-04-28",
+ end_date: "2026-04-30",
+ },
+ },
+ logged_in_share: {
+ value: 100,
+ },
+ )
+ end
+
+ it "returns whole numbers for trend changes of at least one percent" do
+ Fabricate(:logged_in_browser_application_request, date: "2026-04-28", count: 100)
+
+ Fabricate(:logged_in_browser_application_request, date: "2026-05-01", count: 110)
+
+ expect(described_class.build(start_date: "2026-05-01", end_date: "2026-05-03")[:kpis]).to eq(
+ browser_pageviews: {
+ value: 110,
+ percent_change: 10,
+ comparison_period: {
+ start_date: "2026-04-28",
+ end_date: "2026-04-30",
+ },
+ },
+ logged_in_share: {
+ value: 100,
+ },
+ )
+ end
+
+ it "excludes mobile and beacon browser pageviews from totals and series" do
+ Fabricate(:logged_in_browser_application_request, date: "2026-05-01", count: 10)
+ Fabricate(:anonymous_browser_application_request, date: "2026-05-01", count: 20)
+
+ Fabricate(:logged_in_browser_mobile_application_request, date: "2026-05-01", count: 100)
+ Fabricate(:logged_in_browser_beacon_application_request, date: "2026-05-01", count: 200)
+ Fabricate(:anonymous_browser_mobile_application_request, date: "2026-05-01", count: 300)
+ Fabricate(:anonymous_browser_beacon_application_request, date: "2026-05-01", count: 400)
+
+ expect(described_class.build(start_date: "2026-05-01", end_date: "2026-05-01")).to eq(
+ kpis: {
+ browser_pageviews: {
+ value: 30,
+ },
+ logged_in_share: {
+ value: 33,
+ },
+ },
+ pageview_series: [
+ traffic_series(:logged_in, [traffic_point("2026-05-01", 10)]),
+ traffic_series(:anonymous, [traffic_point("2026-05-01", 20)]),
+ traffic_series(:crawlers, [traffic_point("2026-05-01", 0)]),
+ ],
+ )
+ end
+
+ it "uses legacy human counters when legacy pageviews are enabled" do
+ SiteSetting.use_legacy_pageviews = true
+
+ Fabricate(:logged_in_application_request, date: "2026-05-01", count: 11)
+ Fabricate(:anonymous_application_request, date: "2026-05-01", count: 22)
+
+ Fabricate(:logged_in_browser_application_request, date: "2026-05-01", count: 110)
+ Fabricate(:anonymous_browser_application_request, date: "2026-05-01", count: 220)
+
+ Fabricate(:crawler_application_request, date: "2026-05-01", count: 4)
+
+ expect(described_class.build(start_date: "2026-05-01", end_date: "2026-05-01")).to eq(
+ kpis: {
+ browser_pageviews: {
+ value: 33,
+ },
+ logged_in_share: {
+ value: 33,
+ },
+ },
+ pageview_series: [
+ traffic_series(:logged_in, [traffic_point("2026-05-01", 11)], req: "page_view_logged_in"),
+ traffic_series(:anonymous, [traffic_point("2026-05-01", 22)], req: "page_view_anon"),
+ traffic_series(:crawlers, [traffic_point("2026-05-01", 4)]),
+ ],
+ )
+ end
+
+ it "only includes embedded traffic when embedding is configured" do
+ Fabricate(:embedded_application_request, date: "2026-05-01", count: 7)
+
+ expect(described_class.build(start_date: "2026-05-01", end_date: "2026-05-01")).to eq(
+ kpis: {
+ browser_pageviews: {
+ value: 0,
+ },
+ logged_in_share: {
+ value: 0,
+ },
+ },
+ pageview_series: [
+ traffic_series(:logged_in, [traffic_point("2026-05-01", 0)]),
+ traffic_series(:anonymous, [traffic_point("2026-05-01", 0)]),
+ traffic_series(:crawlers, [traffic_point("2026-05-01", 0)]),
+ ],
+ )
+
+ SiteSetting.embed_topics_list = true
+ Fabricate(:embeddable_host)
+
+ expect(described_class.build(start_date: "2026-05-01", end_date: "2026-05-01")).to eq(
+ kpis: {
+ browser_pageviews: {
+ value: 0,
+ },
+ logged_in_share: {
+ value: 0,
+ },
+ },
+ pageview_series: [
+ traffic_series(:logged_in, [traffic_point("2026-05-01", 0)]),
+ traffic_series(:anonymous, [traffic_point("2026-05-01", 0)]),
+ traffic_series(:embedded, [traffic_point("2026-05-01", 7)]),
+ traffic_series(:crawlers, [traffic_point("2026-05-01", 0)]),
+ ],
+ )
+ end
+
+ it "includes embedded traffic when full app embedding is enabled" do
+ SiteSetting.embed_full_app = true
+
+ Fabricate(:embeddable_host)
+ Fabricate(:embedded_application_request, date: "2026-05-01", count: 7)
+
+ expect(described_class.build(start_date: "2026-05-01", end_date: "2026-05-01")).to eq(
+ kpis: {
+ browser_pageviews: {
+ value: 0,
+ },
+ logged_in_share: {
+ value: 0,
+ },
+ },
+ pageview_series: [
+ traffic_series(:logged_in, [traffic_point("2026-05-01", 0)]),
+ traffic_series(:anonymous, [traffic_point("2026-05-01", 0)]),
+ traffic_series(:embedded, [traffic_point("2026-05-01", 7)]),
+ traffic_series(:crawlers, [traffic_point("2026-05-01", 0)]),
+ ],
+ )
+ end
+
+ it "returns logged-in traffic only when login is required" do
+ SiteSetting.login_required = true
+ SiteSetting.embed_topics_list = true
+
+ Fabricate(:embeddable_host)
+ Fabricate(:logged_in_browser_application_request, date: "2026-05-01", count: 9)
+ Fabricate(:anonymous_browser_application_request, date: "2026-05-01", count: 19)
+ Fabricate(:crawler_application_request, date: "2026-05-01", count: 29)
+ Fabricate(:embedded_application_request, date: "2026-05-01", count: 5)
+
+ expect(described_class.build(start_date: "2026-05-01", end_date: "2026-05-01")).to eq(
+ kpis: {
+ browser_pageviews: {
+ value: 9,
+ },
+ },
+ pageview_series: [traffic_series(:logged_in, [traffic_point("2026-05-01", 9)])],
+ )
+ end
+
+ it "omits trend data when the comparison period predates tracked human traffic" do
+ Fabricate(:logged_in_browser_application_request, date: "2026-04-30", count: 2)
+
+ Fabricate(:logged_in_browser_application_request, date: "2026-05-01", count: 8)
+
+ expect(described_class.build(start_date: "2026-05-01", end_date: "2026-05-03")).to eq(
+ kpis: {
+ browser_pageviews: {
+ value: 8,
+ },
+ logged_in_share: {
+ value: 100,
+ },
+ },
+ pageview_series: [
+ traffic_series(
+ :logged_in,
+ [
+ traffic_point("2026-05-01", 8),
+ traffic_point("2026-05-02", 0),
+ traffic_point("2026-05-03", 0),
+ ],
+ ),
+ traffic_series(
+ :anonymous,
+ [
+ traffic_point("2026-05-01", 0),
+ traffic_point("2026-05-02", 0),
+ traffic_point("2026-05-03", 0),
+ ],
+ ),
+ traffic_series(
+ :crawlers,
+ [
+ traffic_point("2026-05-01", 0),
+ traffic_point("2026-05-02", 0),
+ traffic_point("2026-05-03", 0),
+ ],
+ ),
+ ],
+ )
+ end
+
+ it "returns zero-value KPIs and series when no traffic has been recorded" do
+ ApplicationRequest.delete_all
+
+ expect(described_class.build(start_date: "2026-05-01", end_date: "2026-05-03")).to eq(
+ kpis: {
+ browser_pageviews: {
+ value: 0,
+ },
+ logged_in_share: {
+ value: 0,
+ },
+ },
+ pageview_series: [
+ traffic_series(
+ :logged_in,
+ [
+ traffic_point("2026-05-01", 0),
+ traffic_point("2026-05-02", 0),
+ traffic_point("2026-05-03", 0),
+ ],
+ ),
+ traffic_series(
+ :anonymous,
+ [
+ traffic_point("2026-05-01", 0),
+ traffic_point("2026-05-02", 0),
+ traffic_point("2026-05-03", 0),
+ ],
+ ),
+ traffic_series(
+ :crawlers,
+ [
+ traffic_point("2026-05-01", 0),
+ traffic_point("2026-05-02", 0),
+ traffic_point("2026-05-03", 0),
+ ],
+ ),
+ ],
+ )
+ end
+
+ it "uses the default date range when dates are missing, malformed, or reversed" do
+ Fabricate(:logged_in_browser_application_request, date: "2026-04-15", count: 3)
+
+ response_summaries =
+ [
+ described_class.build(start_date: nil, end_date: nil),
+ described_class.build(start_date: "not-a-date", end_date: "also-not-a-date"),
+ described_class.build(start_date: "2026-05-10", end_date: "2026-05-01"),
+ ].map do |response|
+ logged_in_series_data = traffic_series_data(response, :logged_in)
+
+ {
+ browser_pageviews: response.dig(:kpis, :browser_pageviews, :value),
+ first_point: logged_in_series_data.first,
+ last_point: logged_in_series_data.last,
+ data_points: logged_in_series_data.size,
+ }
+ end
+
+ expect(response_summaries).to eq(
+ [
+ {
+ browser_pageviews: 3,
+ first_point: traffic_point("2026-04-15", 3),
+ last_point: traffic_point("2026-05-14", 0),
+ data_points: 30,
+ },
+ {
+ browser_pageviews: 3,
+ first_point: traffic_point("2026-04-15", 3),
+ last_point: traffic_point("2026-05-14", 0),
+ data_points: 30,
+ },
+ {
+ browser_pageviews: 3,
+ first_point: traffic_point("2026-04-15", 3),
+ last_point: traffic_point("2026-05-14", 0),
+ data_points: 30,
+ },
+ ],
+ )
+ end
+ end
+end
diff --git a/spec/system/admin_dashboard_redesign/site_traffic_section_spec.rb b/spec/system/admin_dashboard_redesign/site_traffic_section_spec.rb
new file mode 100644
index 00000000000..b4e9033a5f7
--- /dev/null
+++ b/spec/system/admin_dashboard_redesign/site_traffic_section_spec.rb
@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+
+describe "Admin Dashboard Redesign | Site Traffic section" do
+ fab!(:current_user, :admin)
+
+ let(:dashboard) { PageObjects::Pages::AdminDashboard.new }
+
+ before do
+ SiteSetting.dashboard_improvements = true
+ SiteSetting.admin_dashboard_sections = "traffic"
+ SiteSetting.use_legacy_pageviews = false
+ SiteSetting.embed_topics_list = true
+ sign_in(current_user)
+ end
+
+ it "lets staff review pageview totals, inspect tooltips, and compare another period",
+ time: Time.zone.local(2026, 5, 14, 12, 0, 0) do
+ Fabricate(:embeddable_host)
+
+ Fabricate(:logged_in_browser_application_request, date: "2025-11-18", count: 25)
+ Fabricate(:logged_in_browser_application_request, date: "2026-03-16", count: 5)
+
+ Fabricate(:logged_in_browser_application_request, date: "2026-05-01", count: 15)
+ Fabricate(:logged_in_browser_application_request, date: "2026-05-12", count: 20)
+ Fabricate(:anonymous_browser_application_request, date: "2026-05-12", count: 10)
+ Fabricate(:crawler_application_request, date: "2026-05-12", count: 5)
+ Fabricate(:embedded_application_request, date: "2026-05-12", count: 3)
+
+ dashboard.visit
+ expect(dashboard).to have_section("traffic")
+
+ traffic = dashboard.site_traffic
+
+ expect(traffic).to have_headline("45 pageviews in the last 30 days")
+ expect(traffic).to have_up_trend("up 800%")
+ expect(traffic).to have_metric("Logged-in share", "78%")
+
+ traffic.hover_comparison_tooltip
+ expect(traffic).to have_comparison_tooltip(
+ "Compared with the previous 30 days (Mar 16 – Apr 14, 2026)",
+ )
+
+ traffic.hover_logged_in_share_tooltip
+ expect(traffic).to have_logged_in_share_tooltip(
+ "The share of pageviews from logged-in members.",
+ )
+
+ dashboard.select_preset("last_7_days")
+
+ expect(traffic).to have_headline("30 pageviews in the last 7 days")
+ expect(traffic).to have_trend("up 100%")
+
+ traffic.hover_comparison_tooltip
+ expect(traffic).to have_comparison_tooltip(
+ "Compared with the previous 7 days (May 1 – May 7, 2026)",
+ )
+
+ dashboard.select_preset("last_3_months")
+
+ expect(traffic).to have_headline("50 pageviews in the last 3 months")
+ expect(traffic).to have_trend("up 100%")
+
+ traffic.hover_comparison_tooltip
+ expect(traffic).to have_comparison_tooltip(
+ "Compared with the previous 3 months (Nov 18, 2025 – Feb 14, 2026)",
+ )
+ end
+
+ it "shows staff when pageviews are down compared with the previous period",
+ time: Time.zone.local(2026, 5, 14, 12, 0, 0) do
+ Fabricate(:logged_in_browser_application_request, date: "2026-03-16", count: 80)
+
+ Fabricate(:logged_in_browser_application_request, date: "2026-05-12", count: 20)
+
+ dashboard.visit
+ traffic = dashboard.site_traffic
+
+ expect(traffic).to have_headline("20 pageviews in the last 30 days")
+ expect(traffic).to have_down_trend("down 75%")
+ end
+
+ it "shows staff traffic for a selected custom date range",
+ time: Time.zone.local(2026, 5, 14, 12, 0, 0) do
+ Fabricate(:logged_in_browser_application_request, date: "2026-04-28", count: 10)
+
+ Fabricate(:logged_in_browser_application_request, date: "2026-05-01", count: 20)
+
+ dashboard.visit_with_query(range: "custom", start_date: "2026-05-01", end_date: "2026-05-03")
+ traffic = dashboard.site_traffic
+
+ expect(traffic).to have_headline("20 pageviews in the selected period")
+ expect(traffic).to have_trend("up 100%")
+
+ traffic.hover_comparison_tooltip
+ expect(traffic).to have_comparison_tooltip(
+ "Compared with the previous 3 days (Apr 28 – Apr 30, 2026)",
+ )
+ end
+
+ it "shows staff login-required pageviews without logged-in share",
+ time: Time.zone.local(2026, 5, 14, 12, 0, 0) do
+ SiteSetting.login_required = true
+
+ Fabricate(:embeddable_host)
+ Fabricate(:logged_in_browser_application_request, date: "2026-05-12", count: 9)
+ Fabricate(:anonymous_browser_application_request, date: "2026-05-12", count: 19)
+
+ Fabricate(:crawler_application_request, date: "2026-05-12", count: 29)
+ Fabricate(:embedded_application_request, date: "2026-05-12", count: 5)
+
+ dashboard.visit
+ traffic = dashboard.site_traffic
+
+ expect(traffic).to have_headline("9 pageviews in the last 30 days")
+ expect(traffic).to have_no_metric("Logged-in share")
+ end
+
+ it "shows staff a zero-value traffic chart when no pageviews were recorded",
+ time: Time.zone.local(2026, 5, 14, 12, 0, 0) do
+ ApplicationRequest.delete_all
+
+ dashboard.visit
+ traffic = dashboard.site_traffic
+
+ expect(traffic).to have_headline("0 pageviews in the last 30 days")
+ expect(traffic).to have_no_trend
+ expect(traffic).to have_no_comparison_tooltip
+ expect(traffic).to have_chart
+ end
+end
diff --git a/spec/system/page_objects/components/admin_dashboard_site_traffic.rb b/spec/system/page_objects/components/admin_dashboard_site_traffic.rb
new file mode 100644
index 00000000000..60ae86f1f94
--- /dev/null
+++ b/spec/system/page_objects/components/admin_dashboard_site_traffic.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module PageObjects
+ module Components
+ class AdminDashboardSiteTraffic < PageObjects::Components::Base
+ def has_headline?(text)
+ has_css?(".db-traffic__headline", text: text)
+ end
+
+ def has_trend?(text)
+ has_css?(".db-traffic__trend", text: text)
+ end
+
+ def has_up_trend?(text)
+ has_css?(".db-traffic__trend.--up", text: text)
+ end
+
+ def has_down_trend?(text)
+ has_css?(".db-traffic__trend.--down", text: text)
+ end
+
+ def has_no_trend?
+ has_no_css?(".db-traffic__trend")
+ end
+
+ def has_metric?(label, value)
+ has_css?(".db-section__metric-number", exact_text: value) &&
+ has_css?(".db-section__metric-label", exact_text: label)
+ end
+
+ def has_no_metric?(label)
+ has_no_css?(".db-section__metric", text: label)
+ end
+
+ def has_chart?
+ has_css?(".db-section__traffic-chart canvas")
+ end
+
+ def hover_comparison_tooltip
+ find("[data-trigger][data-identifier='site-traffic-comparison-tooltip']").hover
+ self
+ end
+
+ def has_comparison_tooltip?(text)
+ Tooltips.new("site-traffic-comparison-tooltip").present?(text: text)
+ end
+
+ def has_no_comparison_tooltip?
+ has_no_css?("[data-trigger][data-identifier='site-traffic-comparison-tooltip']")
+ end
+
+ def hover_logged_in_share_tooltip
+ find("[data-trigger][data-identifier='site-traffic-logged-in-share-tooltip']").hover
+ self
+ end
+
+ def has_logged_in_share_tooltip?(text)
+ Tooltips.new("site-traffic-logged-in-share-tooltip").present?(text: text)
+ end
+ end
+ end
+end
diff --git a/spec/system/page_objects/pages/admin_dashboard.rb b/spec/system/page_objects/pages/admin_dashboard.rb
index d36454c8708..40ea1a1e27e 100644
--- a/spec/system/page_objects/pages/admin_dashboard.rb
+++ b/spec/system/page_objects/pages/admin_dashboard.rb
@@ -9,6 +9,12 @@ module PageObjects
self
end
+ def visit_with_query(params)
+ page.visit("/admin?#{params.to_query}")
+ has_css?(".db-main__section, .db-main__empty, .nav-pills")
+ self
+ end
+
def has_admin_notice?(message)
has_css?(".dashboard-problem", text: message)
end
@@ -75,6 +81,10 @@ module PageObjects
has_no_css?(".db-main__section[data-section-id='#{id}']")
end
+ def site_traffic
+ PageObjects::Components::AdminDashboardSiteTraffic.new
+ end
+
def section_ids_in_order
all(".db-main__section").map { |el| el["data-section-id"] }
end