A platform for community discussion. Free, open, simple.
FEATURE: Who's posting section of the dashboard engagement section (#40225)
Natalie Taye585165b84bb
diff --git a/app/assets/stylesheets/admin/admin_dashboard.scss b/app/assets/stylesheets/admin/admin_dashboard.scssindex 9cbc240716d..4f1b6efbd17 100644--- a/app/assets/stylesheets/admin/admin_dashboard.scss+++ b/app/assets/stylesheets/admin/admin_dashboard.scss@@ -344,6 +344,109 @@ h1 {}}+.db-whos-posting {+ display: flex;+ flex-direction: column;+ gap: var(--space-3);++ .db-section__row-block-header {+ align-items: flex-start;+ }++ &__filter {+ display: flex;+ flex-direction: column;+ align-items: flex-end;+ gap: var(--space-1);+ }++ &__subcategories {+ display: flex;+ align-items: center;+ gap: var(--space-1);+ font-size: var(--font-down-1-rem);+ color: var(--primary-medium);+ cursor: pointer;+ }++ &__bar {+ display: flex;+ width: 100%;+ height: 12px;+ border-radius: 6px;+ overflow: hidden;+ background: var(--primary-low);+ }++ &__segment {+ display: block;+ height: 100%;++ &.--new-members {+ background: var(--tertiary);+ }++ &.--returning {+ background: var(--tertiary-medium);+ }++ &.--staff {+ background: var(--primary-medium);+ }+ }++ &__legend {+ list-style: none;+ margin: 0;+ padding: 0;+ display: flex;+ flex-direction: column;+ gap: var(--space-1);+ }++ &__legend-item {+ display: flex;+ align-items: center;+ gap: var(--space-2);+ font-size: var(--font-down-1-rem);+ }++ &__legend-dot {+ width: 8px;+ height: 8px;+ border-radius: 50%;+ flex: 0 0 auto;++ &.--new-members {+ background: var(--tertiary);+ }++ &.--returning {+ background: var(--tertiary-medium);+ }++ &.--staff {+ background: var(--primary-medium);+ }+ }++ &__legend-label {+ flex: 1 1 auto;+ color: var(--primary);+ }++ &__legend-share {+ color: var(--primary-medium);+ font-variant-numeric: tabular-nums;+ }++ &__empty {+ color: var(--primary-medium);+ font-size: var(--font-down-1-rem);+ margin: 0;+ }+}+.db-tl-pipeline {display: flex;flex-direction: column;diff --git a/app/assets/stylesheets/admin/admin_report_chart.scss b/app/assets/stylesheets/admin/admin_report_chart.scssindex df8da620b95..4657f14f339 100644--- a/app/assets/stylesheets/admin/admin_report_chart.scss+++ b/app/assets/stylesheets/admin/admin_report_chart.scss@@ -92,6 +92,12 @@ body.uc-reporting-improvements .admin-contents:not(.dashboard) .chart {}}+ &__filter {+ &.--include_subcategories {+ align-self: center;+ }+ }+&__dates {.d-date-time-input-range {display: flex;diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rbindex d17978d9805..54f26ba9d90 100644--- a/app/controllers/admin/dashboard_controller.rb+++ b/app/controllers/admin/dashboard_controller.rb@@ -130,7 +130,11 @@ class Admin::DashboardController < Admin::StaffControllerwhen "traffic"AdminDashboardSiteTraffic.build(start_date: params[:start_date], end_date: params[:end_date])when "engagement"- AdminDashboardEngagement.build(start_date: params[:start_date], end_date: params[:end_date])+ AdminDashboardEngagement.build(+ start_date: params[:start_date],+ end_date: params[:end_date],+ current_user: current_user,+ )when "reports"AdminDashboard::Reports::Section.build(guardian: guardian)enddiff --git a/app/models/concerns/reports/posters_by_member_type.rb b/app/models/concerns/reports/posters_by_member_type.rbnew file mode 100644index 00000000000..a35695bf964--- /dev/null+++ b/app/models/concerns/reports/posters_by_member_type.rb@@ -0,0 +1,86 @@+# frozen_string_literal: true++module Reports::PostersByMemberType+ extend ActiveSupport::Concern++ MEMBER_TYPES = %i[new_members returning staff].freeze++ class_methods do+ def report_posters_by_member_type(report)+ report.modes = [Report::MODES[:table]]+ report.labels = [+ { property: :name, title: I18n.t("reports.posters_by_member_type.labels.member_type") },+ {+ property: :count,+ type: :number,+ title: I18n.t("reports.posters_by_member_type.labels.count"),+ },+ {+ property: :share_formatted,+ title: I18n.t("reports.posters_by_member_type.labels.share"),+ },+ ]++ category_id, include_subcategories = report.add_category_filter++ builder = DB.build <<~SQL+ SELECT+ CASE+ WHEN u.admin OR u.moderator THEN 'staff'+ WHEN u.created_at >= :start_date THEN 'new_members'+ ELSE 'returning'+ END AS bucket,+ COUNT(*) AS post_count+ FROM posts p+ INNER JOIN topics t ON t.id = p.topic_id+ INNER JOIN users u ON u.id = p.user_id+ /*join*/+ /*where*/+ GROUP BY bucket+ SQL++ builder.where("p.created_at >= :start_date", start_date: report.start_date)+ builder.where("p.created_at <= :end_date", end_date: report.end_date)+ builder.where("p.deleted_at IS NULL")+ builder.where("p.post_type = :regular_post_type", regular_post_type: Post.types[:regular])+ builder.where("t.deleted_at IS NULL")+ builder.where("t.archetype = 'regular'")+ builder.where("u.id > 0")++ if category_id+ if include_subcategories+ builder.where(+ "t.category_id IN (:category_ids)",+ category_ids: Category.subcategory_ids(category_id),+ )+ else+ builder.where("t.category_id = :category_id", category_id: category_id)+ end+ end++ unless report.current_user&.admin?+ builder.join "categories c ON c.id = t.category_id"+ builder.secure_category(Guardian.new(report.current_user).secure_category_ids)+ end++ counts = Hash.new(0)+ builder.query.each { |row| counts[row.bucket.to_sym] = row.post_count }++ total = counts.values.sum+ report.total = total++ report.data =+ MEMBER_TYPES.map do |type|+ count = counts[type]+ share = total.zero? ? 0.0 : (count.to_f / total * 100).round(2)+ {+ type: type,+ name: I18n.t("reports.posters_by_member_type.types.#{type}"),+ count: count,+ share: share,+ share_formatted: "#{share}%",+ }+ end+ end+ end+enddiff --git a/app/models/report.rb b/app/models/report.rbindex 44f4315c6cf..07755affb0a 100644--- a/app/models/report.rb+++ b/app/models/report.rb@@ -123,6 +123,7 @@ class Reportinclude Reports::TrendingSearchinclude Reports::TrustLevelGrowthinclude Reports::TrustLevelPipeline+ include Reports::PostersByMemberTypeinclude Reports::UserFlaggingRatioinclude Reports::UserToUserPrivateMessagesinclude Reports::UserToUserPrivateMessagesWithRepliesdiff --git a/app/services/admin_dashboard_engagement.rb b/app/services/admin_dashboard_engagement.rbindex e1a4ce50daf..c03a03fcce0 100644--- a/app/services/admin_dashboard_engagement.rb+++ b/app/services/admin_dashboard_engagement.rb@@ -9,23 +9,29 @@ class AdminDashboardEngagementnew_signups: "signups",}.freeze- def self.build(start_date:, end_date:)- new(start_date: start_date, end_date: end_date).build+ def self.build(start_date:, end_date:, current_user: nil)+ new(start_date: start_date, end_date: end_date, current_user: current_user).buildend- def initialize(start_date:, end_date:)+ def initialize(start_date:, end_date:, current_user: nil)@start_date = parse_date(start_date) || DEFAULT_RANGE_DAYS.days.ago.beginning_of_day@end_date = parse_date(end_date)&.end_of_day || Time.zone.now.end_of_day+ @current_user = current_userenddef buildkpis = build_kpis- { kpis: kpis, headline: build_headline(kpis), trust_level_pipeline: build_trust_level_pipeline }+ {+ kpis: kpis,+ headline: build_headline(kpis),+ trust_level_pipeline: build_trust_level_pipeline,+ posters: build_posters,+ }endprivate- attr_reader :start_date, :end_date+ attr_reader :start_date, :end_date, :current_userdef parse_date(value)return nil if value.blank?@@ -156,4 +162,18 @@ class AdminDashboardEngagementtotal_members: report.is_a?(Hash) ? report[:total] : report.total,}end++ def build_posters+ args = { start_date: start_date, end_date: end_date, current_user: current_user }++ report = Report.find_cached("posters_by_member_type", args)+ if report.nil?+ report = Report.find("posters_by_member_type", args)+ Report.cache(report) if report && report.error.blank?+ end++ return nil if report.nil? || report_error?(report)++ { rows: report_data(report), total: report.is_a?(Hash) ? report[:total] : report.total }+ endenddiff --git a/config/locales/client.en.yml b/config/locales/client.en.ymlindex 995bcd7ce2e..ed81354fe1d 100644--- a/config/locales/client.en.yml+++ b/config/locales/client.en.yml@@ -6886,6 +6886,12 @@ en:fetch_error: "Couldn't load engagement. Try refreshing the page."whos_posting:title: "Who's posting?"+ all_categories: "All categories"+ include_subcategories: "Include subcategories"+ new_members: "New members"+ returning: "Returning"+ staff: "Staff"+ empty: "No posts in the selected period."activity_by_category:title: "Activity by category"trust_level_pipeline:diff --git a/config/locales/server.en.yml b/config/locales/server.en.ymlindex 66240c1d4b6..7747738d293 100644--- a/config/locales/server.en.yml+++ b/config/locales/server.en.yml@@ -1377,6 +1377,17 @@ en:xaxis: "Day"yaxis: "Number of new contributors"description: "Number of users who made their first post during this period."+ posters_by_member_type:+ title: "Who's posting?"+ description: "Posts authored in the selected period, bucketed by member type. \"New members\" signed up during the period, \"Returning\" signed up before it, and \"Staff\" are admins or moderators."+ labels:+ member_type: "Member type"+ count: "Posts"+ share: "Share"+ types:+ new_members: "New members"+ returning: "Returning"+ staff: "Staff"trust_level_pipeline:title: "Trust level pipeline"description: "Member movement between trust levels for the selected period. Counts the members currently at each trust level, their share of the total membership, and the number of members who moved into or out of each trust level during the period."diff --git a/frontend/discourse/admin/components/dashboard/engagement.gjs b/frontend/discourse/admin/components/dashboard/engagement.gjsindex 0dc4bf2ba5f..c60616314b0 100644--- a/frontend/discourse/admin/components/dashboard/engagement.gjs+++ b/frontend/discourse/admin/components/dashboard/engagement.gjs@@ -1,5 +1,6 @@import EngagementHeadline from "discourse/admin/components/dashboard/engagement/headline";import TrustLevelPipeline from "discourse/admin/components/dashboard/engagement/trust-level-pipeline";+import WhosPosting from "discourse/admin/components/dashboard/engagement/whos-posting";import DashboardSection from "discourse/admin/components/dashboard/section";import { i18n } from "discourse-i18n";@@ -33,13 +34,11 @@ import { i18n } from "discourse-i18n";{{/if}}</div><div class="db-section__row-block">- <div class="db-section__row-block-header">- <h3 class="db-section__row-block-title --label">- {{i18n- "admin.dashboard.sections.engagement.whos_posting.title"- }}- </h3>- </div>+ <WhosPosting+ @posters={{@engagement.posters}}+ @startDate={{@startDate}}+ @endDate={{@endDate}}+ /></div></div><div class="db-section__row">diff --git a/frontend/discourse/admin/components/dashboard/engagement/whos-posting.gjs b/frontend/discourse/admin/components/dashboard/engagement/whos-posting.gjsnew file mode 100644index 00000000000..dc0c4f085dc--- /dev/null+++ b/frontend/discourse/admin/components/dashboard/engagement/whos-posting.gjs@@ -0,0 +1,206 @@+import Component from "@glimmer/component";+import { tracked } from "@glimmer/tracking";+import { on } from "@ember/modifier";+import { action } from "@ember/object";+import didUpdate from "@ember/render-modifiers/modifiers/did-update";+import { LinkTo } from "@ember/routing";+import { trustHTML } from "@ember/template";+import { ajax } from "discourse/lib/ajax";+import { popupAjaxError } from "discourse/lib/ajax-error";+import Category from "discourse/models/category";+import SearchAdvancedCategoryChooser from "discourse/select-kit/components/search-advanced-category-chooser";+import { i18n } from "discourse-i18n";++const ROW_ORDER = ["new_members", "returning", "staff"];++export default class WhosPosting extends Component {+ @tracked categoryId = null;+ @tracked includeSubcategories = false;+ @tracked overridePosters = null;+ @tracked loading = false;++ get hasSubcategories() {+ if (!this.categoryId) {+ return false;+ }+ const category = Category.findById(this.categoryId);+ return (category?.subcategories?.length ?? 0) > 0;+ }++ get reportQuery() {+ const query = {};+ if (this.categoryId) {+ const filters = { category: this.categoryId };+ if (this.includeSubcategories) {+ filters.include_subcategories = true;+ }+ query.filters = filters;+ }+ if (this.args.startDate) {+ query.start_date = this.args.startDate.toISOString().slice(0, 10);+ }+ if (this.args.endDate) {+ query.end_date = this.args.endDate.toISOString().slice(0, 10);+ }+ return query;+ }++ get posters() {+ return this.overridePosters ?? this.args.posters;+ }++ get rows() {+ const rows = this.posters?.rows ?? [];+ const byType = Object.fromEntries(rows.map((r) => [r.type, r]));+ return ROW_ORDER.map((type, index) => {+ const row = byType[type] ?? { type, count: 0, share: 0 };+ return {+ type,+ label: i18n(`admin.dashboard.sections.engagement.whos_posting.${type}`),+ share: row.share,+ shareFormatted: `${Math.round(row.share)}%`,+ segmentStyle: trustHTML(`width: ${row.share}%`),+ segmentClass: `--${type.replace("_", "-")}`,+ legendIndex: index,+ };+ });+ }++ get totalPosts() {+ return this.posters?.total ?? 0;+ }++ get hasData() {+ return this.totalPosts > 0;+ }++ get ariaLabel() {+ const parts = this.rows.map((r) => `${r.label} ${r.shareFormatted}`);+ return parts.join(", ");+ }++ @action+ onCategoryChange(categoryId) {+ this.categoryId = categoryId;+ if (!categoryId) {+ this.includeSubcategories = false;+ }+ this.refetch();+ }++ @action+ onSubcategoriesToggle(event) {+ this.includeSubcategories = event.target.checked;+ this.refetch();+ }++ @action+ onPeriodChange() {+ if (!this.categoryId) {+ this.overridePosters = null;+ } else {+ this.refetch();+ }+ }++ async refetch() {+ this.loading = true;++ const data = {+ start_date: this.args.startDate?.toISOString().slice(0, 10),+ end_date: this.args.endDate?.toISOString().slice(0, 10),+ };+ if (this.categoryId) {+ data.filters = { category: this.categoryId };+ if (this.includeSubcategories) {+ data.filters.include_subcategories = true;+ }+ }++ try {+ const response = await ajax(+ "/admin/reports/posters_by_member_type.json",+ { data }+ );+ const report = response?.report;+ const rows = report?.data ?? [];+ this.overridePosters = { rows, total: report?.total ?? 0 };+ } catch (error) {+ popupAjaxError(error);+ } finally {+ this.loading = false;+ }+ }++ <template>+ <div+ class="db-whos-posting"+ {{didUpdate this.onPeriodChange @startDate @endDate}}+ >+ <div class="db-section__row-block-header">+ <LinkTo+ @route="adminReports.show"+ @model="posters_by_member_type"+ @query={{this.reportQuery}}+ class="db-section__row-block-title --label"+ >+ {{i18n "admin.dashboard.sections.engagement.whos_posting.title"}}+ </LinkTo>+ <div class="db-whos-posting__filter">+ <SearchAdvancedCategoryChooser+ @value={{this.categoryId}}+ @onChange={{this.onCategoryChange}}+ />+ {{#if this.hasSubcategories}}+ <label class="db-whos-posting__subcategories">+ <input+ type="checkbox"+ checked={{this.includeSubcategories}}+ {{on "change" this.onSubcategoriesToggle}}+ />+ {{i18n+ "admin.dashboard.sections.engagement.whos_posting.include_subcategories"+ }}+ </label>+ {{/if}}+ </div>+ </div>++ {{#if this.hasData}}+ <div+ class="db-whos-posting__bar"+ role="img"+ aria-label={{this.ariaLabel}}+ >+ {{#each this.rows as |row|}}+ {{#if row.share}}+ <span+ class="db-whos-posting__segment {{row.segmentClass}}"+ style={{row.segmentStyle}}+ ></span>+ {{/if}}+ {{/each}}+ </div>++ <ul class="db-whos-posting__legend">+ {{#each this.rows as |row|}}+ <li class="db-whos-posting__legend-item">+ <span+ class="db-whos-posting__legend-dot {{row.segmentClass}}"+ aria-hidden="true"+ ></span>+ <span class="db-whos-posting__legend-label">{{row.label}}</span>+ <span+ class="db-whos-posting__legend-share"+ >{{row.shareFormatted}}</span>+ </li>+ {{/each}}+ </ul>+ {{else}}+ <p class="db-whos-posting__empty">+ {{i18n "admin.dashboard.sections.engagement.whos_posting.empty"}}+ </p>+ {{/if}}+ </div>+ </template>+}diff --git a/frontend/discourse/tests/integration/components/dashboard/whos-posting-test.gjs b/frontend/discourse/tests/integration/components/dashboard/whos-posting-test.gjsnew file mode 100644index 00000000000..8725fb2480a--- /dev/null+++ b/frontend/discourse/tests/integration/components/dashboard/whos-posting-test.gjs@@ -0,0 +1,102 @@+import { render } from "@ember/test-helpers";+import { module, test } from "qunit";+import WhosPosting from "discourse/admin/components/dashboard/engagement/whos-posting";+import { setupRenderingTest } from "discourse/tests/helpers/component-test";++module("Integration | Component | Dashboard | WhosPosting", function (hooks) {+ setupRenderingTest(hooks);++ const start = new Date("2026-04-01");+ const end = new Date("2026-04-30");++ const posters = {+ total: 100,+ rows: [+ { type: "new_members", count: 34, share: 34 },+ { type: "returning", count: 51, share: 51 },+ { type: "staff", count: 15, share: 15 },+ ],+ };++ test("renders the stacked bar segments and legend rows", async function (assert) {+ await render(+ <template>+ <WhosPosting+ @posters={{posters}}+ @startDate={{start}}+ @endDate={{end}}+ />+ </template>+ );++ assert.dom(".db-whos-posting__bar").exists();+ assert.dom(".db-whos-posting__segment").exists({ count: 3 });+ assert.dom(".db-whos-posting__legend-item").exists({ count: 3 });+ assert+ .dom(+ ".db-whos-posting__legend-item:nth-child(1) .db-whos-posting__legend-label"+ )+ .hasText("New members");+ assert+ .dom(+ ".db-whos-posting__legend-item:nth-child(2) .db-whos-posting__legend-share"+ )+ .hasText("51%");+ });++ test("renders the section header linking to the posters_by_member_type report", async function (assert) {+ await render(+ <template>+ <WhosPosting+ @posters={{posters}}+ @startDate={{start}}+ @endDate={{end}}+ />+ </template>+ );++ assert+ .dom("a.db-section__row-block-title.--label")+ .hasText("Who's posting?")+ .hasAttribute("href", /\/admin\/reports\/posters_by_member_type/);+ assert.dom(".category-chooser").exists();+ });++ test("falls back to an empty-state message when there are no posts", async function (assert) {+ const empty = { total: 0, rows: [] };++ await render(+ <template>+ <WhosPosting @posters={{empty}} @startDate={{start}} @endDate={{end}} />+ </template>+ );++ assert.dom(".db-whos-posting__bar").doesNotExist();+ assert.dom(".db-whos-posting__legend").doesNotExist();+ assert.dom(".db-whos-posting__empty").exists();+ });++ test("omits the bar segment for a bucket with zero share", async function (assert) {+ const noStaff = {+ total: 85,+ rows: [+ { type: "new_members", count: 34, share: 40 },+ { type: "returning", count: 51, share: 60 },+ { type: "staff", count: 0, share: 0 },+ ],+ };++ await render(+ <template>+ <WhosPosting+ @posters={{noStaff}}+ @startDate={{start}}+ @endDate={{end}}+ />+ </template>+ );++ assert.dom(".db-whos-posting__segment").exists({ count: 2 });+ assert.dom(".db-whos-posting__legend-item").exists({ count: 3 });+ });+});diff --git a/spec/models/concerns/reports/posters_by_member_type_spec.rb b/spec/models/concerns/reports/posters_by_member_type_spec.rbnew file mode 100644index 00000000000..5f0e4d1bcd0--- /dev/null+++ b/spec/models/concerns/reports/posters_by_member_type_spec.rb@@ -0,0 +1,184 @@+# frozen_string_literal: true++describe Reports::PostersByMemberType do+ before { freeze_time(Time.zone.local(2026, 4, 28, 12, 0, 0)) }++ let(:start_date) { Time.zone.local(2026, 4, 1) }+ let(:end_date) { Time.zone.local(2026, 4, 28).end_of_day }++ def build(filters: {}, current_user: nil)+ Report.find(+ "posters_by_member_type",+ { start_date: start_date, end_date: end_date, filters: filters, current_user: current_user },+ )+ end++ def row(report, type)+ report.data.find { |r| r[:type] == type }+ end++ it "returns three rows in fixed order: new_members, returning, staff" do+ report = build++ types = report.data.map { |r| r[:type] }+ expect(types).to eq(%i[new_members returning staff])+ end++ it "counts staff posts in the staff bucket regardless of join date" do+ admin = Fabricate(:admin, created_at: start_date + 1.day)+ moderator = Fabricate(:moderator, created_at: 6.months.ago)+ Fabricate(:post, user: admin, created_at: start_date + 5.days)+ Fabricate(:post, user: moderator, created_at: start_date + 6.days)++ report = build++ expect(row(report, :staff)[:count]).to eq(2)+ expect(row(report, :new_members)[:count]).to eq(0)+ expect(row(report, :returning)[:count]).to eq(0)+ end++ it "bucketing new members by users who signed up within the period" do+ new_user = Fabricate(:user, created_at: start_date + 2.days)+ Fabricate(:post, user: new_user, created_at: start_date + 3.days)++ report = build++ expect(row(report, :new_members)[:count]).to eq(1)+ end++ it "bucketing returning members by users who signed up before the period" do+ returning_user = Fabricate(:user, created_at: start_date - 30.days)+ Fabricate(:post, user: returning_user, created_at: start_date + 1.day)++ report = build++ expect(row(report, :returning)[:count]).to eq(1)+ end++ it "computes share as a percentage of the period's posts" do+ new_user = Fabricate(:user, created_at: start_date + 1.day)+ returning_user = Fabricate(:user, created_at: start_date - 30.days)+ Fabricate(:post, user: new_user, created_at: start_date + 2.days)+ Fabricate(:post, user: returning_user, created_at: start_date + 3.days)+ Fabricate(:post, user: returning_user, created_at: start_date + 4.days)++ report = build++ expect(row(report, :new_members)[:share]).to eq(33.33)+ expect(row(report, :returning)[:share]).to eq(66.67)+ expect(report.data.sum { |r| r[:share] }).to be_within(0.5).of(100)+ end++ it "excludes deleted posts" do+ user = Fabricate(:user, created_at: start_date - 30.days)+ Fabricate(:post, user: user, created_at: start_date + 1.day, deleted_at: Time.now)++ report = build++ expect(row(report, :returning)[:count]).to eq(0)+ end++ it "excludes posts in deleted topics" do+ user = Fabricate(:user, created_at: start_date - 30.days)+ topic = Fabricate(:topic, deleted_at: Time.now)+ Fabricate(:post, user: user, topic: topic, created_at: start_date + 1.day)++ report = build++ expect(row(report, :returning)[:count]).to eq(0)+ end++ it "excludes posts in private messages" do+ user = Fabricate(:user, created_at: start_date - 30.days)+ pm = Fabricate(:private_message_topic)+ Fabricate(:post, user: user, topic: pm, created_at: start_date + 1.day)++ report = build++ expect(row(report, :returning)[:count]).to eq(0)+ end++ it "excludes posts from system users (id <= 0)" do+ Fabricate(:post, user: Discourse.system_user, created_at: start_date + 1.day)++ report = build++ expect(report.data.sum { |r| r[:count] }).to eq(0)+ end++ it "excludes non-regular post types" do+ user = Fabricate(:user, created_at: start_date - 30.days)+ Fabricate(+ :post,+ user: user,+ created_at: start_date + 1.day,+ post_type: Post.types[:moderator_action],+ )++ report = build++ expect(row(report, :returning)[:count]).to eq(0)+ end++ it "filters by category when the category filter is provided" do+ user = Fabricate(:user, created_at: start_date - 30.days)+ target_category = Fabricate(:category)+ other_category = Fabricate(:category)+ target_topic = Fabricate(:topic, category: target_category)+ other_topic = Fabricate(:topic, category: other_category)+ Fabricate(:post, user: user, topic: target_topic, created_at: start_date + 1.day)+ Fabricate(:post, user: user, topic: other_topic, created_at: start_date + 1.day)++ report = build(filters: { category: target_category.id })++ expect(row(report, :returning)[:count]).to eq(1)+ end++ it "renders a unicode category name without errors" do+ user = Fabricate(:user, created_at: start_date - 30.days)+ cat = Fabricate(:category, name: "字テスト")+ topic = Fabricate(:topic, category: cat)+ Fabricate(:post, user: user, topic: topic, created_at: start_date + 1.day)++ expect { build(filters: { category: cat.id }) }.not_to raise_error+ end++ describe "secured categories" do+ fab!(:moderator)+ fab!(:admin)+ fab!(:private_group, :group)++ it "excludes posts in restricted categories from a moderator's unfiltered total" do+ private_category = Fabricate(:private_category, group: private_group, read_restricted: true)+ poster = Fabricate(:user, created_at: start_date - 30.days)+ topic = Fabricate(:topic, category: private_category)+ Fabricate(:post, user: poster, topic: topic, created_at: start_date + 1.day)++ report = build(current_user: moderator)++ expect(report.data.sum { |r| r[:count] }).to eq(0)+ end++ it "returns zero when a moderator filters by a category they cannot access" do+ private_category = Fabricate(:private_category, group: private_group, read_restricted: true)+ poster = Fabricate(:user, created_at: start_date - 30.days)+ topic = Fabricate(:topic, category: private_category)+ Fabricate(:post, user: poster, topic: topic, created_at: start_date + 1.day)++ report = build(filters: { category: private_category.id }, current_user: moderator)++ expect(row(report, :returning)[:count]).to eq(0)+ end++ it "lets an admin see posts in restricted categories" do+ private_category = Fabricate(:private_category, group: private_group, read_restricted: true)+ poster = Fabricate(:user, created_at: start_date - 30.days)+ topic = Fabricate(:topic, category: private_category)+ Fabricate(:post, user: poster, topic: topic, created_at: start_date + 1.day)++ report = build(filters: { category: private_category.id }, current_user: admin)++ expect(row(report, :returning)[:count]).to eq(1)+ end+ end+enddiff --git a/spec/services/admin_dashboard_engagement_spec.rb b/spec/services/admin_dashboard_engagement_spec.rbindex a95411b9243..68979730716 100644--- a/spec/services/admin_dashboard_engagement_spec.rb+++ b/spec/services/admin_dashboard_engagement_spec.rb@@ -72,6 +72,62 @@ describe AdminDashboardEngagement doReport.define_singleton_method(:find, &original)end+ describe "posters" do+ it "includes the posters block with rows and total" do+ result = described_class.build(start_date: "2026-04-01", end_date: "2026-04-28")+ posters = result[:posters]++ expect(posters[:rows].map { |r| r[:type] }).to eq(%i[new_members returning staff])+ expect(posters).to have_key(:total)+ end++ it "honours category visibility when current_user is a moderator" do+ moderator = Fabricate(:moderator)+ returning_poster = Fabricate(:user, created_at: Time.zone.local(2026, 3, 1))+ private_group = Fabricate(:group)+ private_cat = Fabricate(:private_category, group: private_group, read_restricted: true)+ topic = Fabricate(:topic, category: private_cat)+ Fabricate(+ :post,+ user: returning_poster,+ topic: topic,+ created_at: Time.zone.local(2026, 4, 10),+ )++ result =+ described_class.build(+ start_date: "2026-04-01",+ end_date: "2026-04-28",+ current_user: moderator,+ )++ expect(result[:posters][:total]).to eq(0)+ end++ it "lets an admin see posts in restricted categories" do+ admin = Fabricate(:admin)+ returning_poster = Fabricate(:user, created_at: Time.zone.local(2026, 3, 1))+ private_group = Fabricate(:group)+ private_cat = Fabricate(:private_category, group: private_group, read_restricted: true)+ topic = Fabricate(:topic, category: private_cat)+ Fabricate(+ :post,+ user: returning_poster,+ topic: topic,+ created_at: Time.zone.local(2026, 4, 10),+ )++ result =+ described_class.build(+ start_date: "2026-04-01",+ end_date: "2026-04-28",+ current_user: admin,+ )++ expect(result[:posters][:total]).to eq(1)+ end+ end+describe "trust_level_pipeline" doit "includes per-TL rows, a trend object, and total_members" doFabricate(:user, trust_level: TrustLevel[1])