A platform for community discussion. Free, open, simple.
FEATURE: compare posting activity by group on the admin dashboard (#42809)
Osama Sayegh039aa4750810
diff --git a/app/assets/stylesheets/admin/admin_base.scss b/app/assets/stylesheets/admin/admin_base.scssindex e4f188f1b3c..256cc6b54f4 100644--- a/app/assets/stylesheets/admin/admin_base.scss+++ b/app/assets/stylesheets/admin/admin_base.scss@@ -1248,6 +1248,7 @@ a.inline-editable-field {@import "admin/admin_report_stacked_line_chart";@import "admin/admin_report_table";@import "admin/admin_report_inline_table";+@import "admin/posters_by_member_type_report";@import "admin/admin_section_landing_page";@import "admin/admin_user_fields";@import "admin/mini_profiler";diff --git a/app/assets/stylesheets/admin/dashboard/engagement.scss b/app/assets/stylesheets/admin/dashboard/engagement.scssindex 5e00671091f..e847591f877 100644--- a/app/assets/stylesheets/admin/dashboard/engagement.scss+++ b/app/assets/stylesheets/admin/dashboard/engagement.scss@@ -194,6 +194,30 @@&.--staff {background: var(--primary-medium);}++ &.--group-0 {+ background: var(--quaternary);+ }++ &.--group-1 {+ background: var(--love);+ }++ &.--group-2 {+ background: var(--success);+ }++ &.--group-3 {+ background: var(--danger);+ }++ &.--group-4 {+ background: var(--success-medium);+ }++ &.--group-5 {+ background: var(--danger-medium);+ }}&__bar-share {diff --git a/app/assets/stylesheets/admin/posters_by_member_type_report.scss b/app/assets/stylesheets/admin/posters_by_member_type_report.scssnew file mode 100644index 00000000000..7047c3494cd--- /dev/null+++ b/app/assets/stylesheets/admin/posters_by_member_type_report.scss@@ -0,0 +1,48 @@+.posters-by-member-type-report {+ &__numeric {+ text-align: right;+ }++ &__row {+ cursor: pointer;++ &:hover {+ background: var(--primary-very-low);+ }++ &.--selected {+ background: var(--tertiary-low);++ td {+ color: var(--tertiary);+ font-weight: 600;+ }+ }+ }++ &__members {+ margin-top: var(--space-4);+ }++ &__members-header {+ display: flex;+ align-items: flex-start;+ justify-content: space-between;+ gap: var(--space-2);+ margin-bottom: var(--space-2);+ }++ &__members-heading {+ min-width: 0;+ }++ &__members-name {+ margin: 0;+ }++ &__members-stats {+ margin: 0;+ color: var(--primary-medium);+ font-size: var(--font-down-1);+ }+}diff --git a/app/assets/stylesheets/common/modal/_index.scss b/app/assets/stylesheets/common/modal/_index.scssindex 263cd367253..c57c03f5871 100644--- a/app/assets/stylesheets/common/modal/_index.scss+++ b/app/assets/stylesheets/common/modal/_index.scss@@ -3,5 +3,6 @@@import "discourse-reactions-popup";@import "change-reply-to";@import "create-invite-with-roles";+@import "manageable-row-list";@import "manage-reports-modal";@import "share-target";diff --git a/app/assets/stylesheets/common/modal/manage-reports-modal.scss b/app/assets/stylesheets/common/modal/manage-reports-modal.scssindex 6ab2a7a3327..bcea87ff9e2 100644--- a/app/assets/stylesheets/common/modal/manage-reports-modal.scss+++ b/app/assets/stylesheets/common/modal/manage-reports-modal.scss@@ -1,146 +1,10 @@@use "lib/viewport";.manage-reports {- .d-modal__body {- padding-inline: 0;- padding-block: var(--space-3);- }-- &__search-wrapper {- padding: var(--space-2) 1.5rem;- border-bottom: 1px solid var(--primary-low);- background: var(--secondary);- }-- &__counter {- color: var(--primary-medium);- font-size: var(--font-down-2-rem);- }-- &__list {- display: flex;- flex-direction: column;-- @include unstyled-list;- }-- &__row {- display: flex;- align-items: center;- gap: var(--space-3);- padding: var(--space-3) var(--space-6);- background: var(--secondary);- box-shadow:- inset 0 2px 0 0 transparent,- inset 0 -2px 0 0 transparent;-- .manage-reports__list.--dragging & {- transition: box-shadow 0.1s ease;- }-- &:not(:last-child) {- border-bottom: 1px solid var(--primary-low);- }-- &[draggable="true"] {- cursor: grab;- }-- &.dragging {- opacity: 0.5;- }-- &.drag-below,- &:not(.dragging):has(+ .manage-reports__row.drag-above) {- box-shadow:- inset 0 2px 0 0 transparent,- inset 0 -2px 0 0 var(--tertiary);- }-- &:first-child.drag-above,- .manage-reports__row.dragging + &.drag-above {- box-shadow:- inset 0 2px 0 0 var(--tertiary),- inset 0 -2px 0 0 transparent;- }-- @include viewport.until(sm) {- padding: var(--space-2) var(--space-3) var(--space-2) var(--space-6);- }- }-- &__grip {- align-self: flex-start;- color: var(--primary-low-mid);- visibility: hidden;-- .manage-reports__list.--reorderable .manage-reports__row.--enabled & {- visibility: visible;- }- }-- &__order-mobile {- display: flex;- flex-direction: column;- gap: var(--space-2);- visibility: hidden;-- .manage-reports__list.--reorderable .manage-reports__row.--enabled & {- visibility: visible;- }- }-- &__row-text {- display: flex;- flex-direction: column;- gap: var(--space-half);- flex: 1 1 auto;- min-width: 0;- }-- &__row-heading {- display: flex;- align-items: center;- gap: var(--space-2);- min-width: 0;- }-- &__title {- font-weight: 600;- overflow: hidden;- text-overflow: ellipsis;- white-space: nowrap;- min-width: 0;- }-- &__description {- margin: 0;- color: var(--primary-medium);- font-size: var(--font-down-1);+ .manageable-row-list__description {text-transform: capitalize;}- &__arrow {- flex: 0 0 auto;- }-- .d-modal__footer {- justify-content: flex-end;-- @include viewport.until(sm) {- flex-direction: column;- align-items: flex-end;- gap: var(--space-2);- }- }-- &__footer-note {- margin: 0;- margin-right: auto;- color: var(--primary-medium);- font-size: var(--font-down-1);- }-.de-cta__description {@include viewport.until(sm) {display: none;diff --git a/app/assets/stylesheets/common/modal/manageable-row-list.scss b/app/assets/stylesheets/common/modal/manageable-row-list.scssnew file mode 100644index 00000000000..db516115468--- /dev/null+++ b/app/assets/stylesheets/common/modal/manageable-row-list.scss@@ -0,0 +1,146 @@+@use "lib/viewport";++.manageable-row-list {+ .d-modal__body {+ padding-inline: 0;+ padding-block: var(--space-3);+ }++ &__search-wrapper {+ padding: var(--space-2) 1.5rem;+ border-bottom: 1px solid var(--primary-low);+ background: var(--secondary);+ }++ &__counter {+ color: var(--primary-medium);+ font-size: var(--font-down-2-rem);+ }++ &__list {+ display: flex;+ flex-direction: column;++ @include unstyled-list;+ }++ &__row {+ display: flex;+ align-items: center;+ gap: var(--space-3);+ padding: var(--space-3) var(--space-6);+ background: var(--secondary);+ box-shadow:+ inset 0 2px 0 0 transparent,+ inset 0 -2px 0 0 transparent;++ .manageable-row-list__list.--dragging & {+ transition: box-shadow 0.1s ease;+ }++ &:not(:last-child) {+ border-bottom: 1px solid var(--primary-low);+ }++ &[draggable="true"] {+ cursor: grab;+ }++ &.dragging {+ opacity: 0.5;+ }++ &.drag-below,+ &:not(.dragging):has(+ .manageable-row-list__row.drag-above) {+ box-shadow:+ inset 0 2px 0 0 transparent,+ inset 0 -2px 0 0 var(--tertiary);+ }++ &:first-child.drag-above,+ .manageable-row-list__row.dragging + &.drag-above {+ box-shadow:+ inset 0 2px 0 0 var(--tertiary),+ inset 0 -2px 0 0 transparent;+ }++ @include viewport.until(sm) {+ padding: var(--space-2) var(--space-3) var(--space-2) var(--space-6);+ }+ }++ &__grip {+ align-self: flex-start;+ color: var(--primary-low-mid);+ visibility: hidden;++ .manageable-row-list__list.--reorderable+ .manageable-row-list__row.--enabled+ & {+ visibility: visible;+ }+ }++ &__order-mobile {+ display: flex;+ flex-direction: column;+ gap: var(--space-2);+ visibility: hidden;++ .manageable-row-list__list.--reorderable+ .manageable-row-list__row.--enabled+ & {+ visibility: visible;+ }+ }++ &__row-text {+ display: flex;+ flex-direction: column;+ gap: var(--space-half);+ flex: 1 1 auto;+ min-width: 0;+ }++ &__row-heading {+ display: flex;+ align-items: center;+ gap: var(--space-2);+ min-width: 0;+ }++ &__title {+ font-weight: 600;+ overflow: hidden;+ text-overflow: ellipsis;+ white-space: nowrap;+ min-width: 0;+ }++ &__description {+ margin: 0;+ color: var(--primary-medium);+ font-size: var(--font-down-1);+ }++ &__arrow {+ flex: 0 0 auto;+ }++ .d-modal__footer {+ justify-content: flex-end;++ @include viewport.until(sm) {+ flex-direction: column;+ align-items: flex-end;+ gap: var(--space-2);+ }+ }++ &__footer-note {+ margin: 0;+ margin-right: auto;+ color: var(--primary-medium);+ font-size: var(--font-down-1);+ }+}diff --git a/app/controllers/export_csv_controller.rb b/app/controllers/export_csv_controller.rbindex 82690e20f89..9c15c815921 100644--- a/app/controllers/export_csv_controller.rb+++ b/app/controllers/export_csv_controller.rb@@ -4,6 +4,8 @@ class ExportCsvController < ApplicationControllerrequires_loginskip_before_action :preload_json, :check_xhr, only: [:show]+ MAX_ARG_VALUE_LENGTH = 300+def export_entityentity = export_params[:entity]entity_id = params.dig(:args, :export_user_id)&.to_i if entity == "user_archive"@@ -11,7 +13,7 @@ class ExportCsvController < ApplicationControllerraise Discourse::InvalidParameters.new(:entity) unless entity.is_a?(String) && entity.size < 100(export_params[:args] || {}).each do |key, value|- unless value.is_a?(String) && value.size < 100+ unless value.is_a?(String) && value.size < MAX_ARG_VALUE_LENGTHraise Discourse::InvalidParameters.new("args.#{key}")endend@@ -90,7 +92,10 @@ class ExportCsvController < ApplicationController@_export_params ||=beginparams.require(:entity)- params.permit(:entity, args: [*Report::FILTERS, *UserHistory.staff_filters]).to_h+ params.permit(+ :entity,+ args: [*Report::FILTERS, *UserHistory.staff_filters, :category_ids, :groups],+ ).to_hendendenddiff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rbindex b581eecbace..8774b66a85b 100644--- a/app/jobs/regular/export_csv_file.rb+++ b/app/jobs/regular/export_csv_file.rb@@ -197,6 +197,8 @@ module Jobs@extra[:filters] = {}@extra[:filters][:category] = @extra[:category].to_i if @extra[:category].present?@extra[:filters][:group] = @extra[:group].to_i if @extra[:group].present?+ @extra[:filters][:category_ids] = @extra[:category_ids] if @extra[:category_ids].present?+ @extra[:filters][:groups] = @extra[:groups] if @extra[:groups].present?@extra[:filters][:include_subcategories] = !!ActiveRecord::Type::Boolean.new.cast(@extra[:include_subcategories],) if @extra[:include_subcategories].present?diff --git a/app/models/concerns/reports/posters_by_member_type.rb b/app/models/concerns/reports/posters_by_member_type.rbindex 08ae0f9bf94..25584a73a39 100644--- a/app/models/concerns/reports/posters_by_member_type.rb+++ b/app/models/concerns/reports/posters_by_member_type.rb@@ -3,12 +3,42 @@module Reports::PostersByMemberTypeextend ActiveSupport::Concern- MEMBER_TYPES = %i[new_members returning staff].freeze+ SYNTHETIC_KEYS = %w[new_members returning staff].freeze+ DEFAULT_GROUPS = SYNTHETIC_KEYS+ MAX_GROUPS = 10MAX_CATEGORY_IDS = 50+ MAX_MEMBER_ROWS = 500++ EXCLUDED_GROUP_IDS = [+ Group::AUTO_GROUPS[:everyone],+ Group::AUTO_GROUPS[:anonymous_users],+ Group::AUTO_GROUPS[:logged_in_users],+ Group::AUTO_GROUPS[:staff],+ ].freezeclass_methods do+ def group_token(group_id)+ "group:#{group_id}"+ end++ def parse_group_token(token)+ token = token.to_s+ return { type: :synthetic, key: token } if SYNTHETIC_KEYS.include?(token)++ match = token.match(/\Agroup:(\d+)\z/)+ { type: :group, id: match[1].to_i } if match+ end++ def valid_group_token?(token)+ parsed = parse_group_token(token)+ return false if parsed.nil?+ return true if parsed[:type] == :synthetic++ !EXCLUDED_GROUP_IDS.include?(parsed[:id]) && Group.exists?(id: parsed[:id])+ end+def report_posters_by_member_type(report)- report.modes = [Report::MODES[:table]]+ report.modes = ["posters_by_member_type"]report.labels = [{ property: :name, title: I18n.t("reports.posters_by_member_type.labels.member_type") },{@@ -22,76 +52,291 @@ module Reports::PostersByMemberType},]- raw_ids = report.filters[:category_ids]- filter_requested = raw_ids.present?- requested_ids =- if filter_requested- parsed_ids = Array(raw_ids.is_a?(String) ? raw_ids.split(",") : raw_ids).map(&:to_i)- if parsed_ids.present?- # in_order_of keeps the admin's requested order and drops nonexistent ids- Category.in_order_of(:id, parsed_ids).limit(MAX_CATEGORY_IDS).pluck(:id)+ category_ids, empty_category_selection = parse_category_ids_filter(report)+ report.add_filter("category_ids", type: "category_list", default: category_ids)++ guardian = report.guardian || Guardian.new(report.current_user)+ resolved_groups = resolve_groups_filter(report.filters[:groups], guardian)+ report.add_filter("groups", type: "groups", default: resolved_groups)++ synthetic_keys = resolved_groups & SYNTHETIC_KEYS+ group_ids =+ resolved_groups.filter_map do |token|+ parsed = parse_group_token(token)+ parsed[:id] if parsed && parsed[:type] == :group+ end+ groups_by_id = Group.where(id: group_ids).index_by(&:id)++ counts = {}+ total = 0++ unless empty_category_selection+ if synthetic_keys.present?+ counts.merge!(synthetic_bucket_counts(report, category_ids, guardian))+ end++ if group_ids.present?+ group_post_counts(report, category_ids, guardian, group_ids).each do |group_id, count|+ counts[group_token(group_id)] = count+ end+ end++ total = grand_total(report, category_ids, guardian)+ end++ report.total = total++ report.data =+ resolved_groups.filter_map do |token|+ if SYNTHETIC_KEYS.include?(token)+ kind = "synthetic"+ group_id = nil+ name = I18n.t("reports.posters_by_member_type.types.#{token}")+ elsif (parsed = parse_group_token(token)) && parsed[:type] == :group &&+ (group = groups_by_id[parsed[:id]])+ kind = "group"+ group_id = group.id+ name = group.name_full_preferredelse- []+ nextend++ count = counts[token] || 0+ share = total.zero? ? 0.0 : (count.to_f / total * 100).round(2)++ {+ type: token,+ kind: kind,+ group_id: group_id,+ name: name,+ count: count,+ share: share,+ share_formatted: "#{share}%",+ }+ end+ end++ def report_posters_by_member_type_members(report)+ report.modes = [Report::MODES[:table]]+ report.labels = [+ {+ type: :user,+ properties: {+ username: :username,+ id: :user_id,+ avatar: :avatar_template,+ },+ title: I18n.t("reports.posters_by_member_type_members.labels.user"),+ },+ {+ property: :count,+ type: :number,+ title: I18n.t("reports.posters_by_member_type_members.labels.count"),+ },+ {+ property: :share_formatted,+ title: I18n.t("reports.posters_by_member_type_members.labels.share"),+ },+ ]++ category_ids, empty_category_selection = parse_category_ids_filter(report)+ report.add_filter("category_ids", type: "category_list", default: category_ids)++ guardian = report.guardian || Guardian.new(report.current_user)+ parsed = parse_group_token(report.filters[:group])++ if parsed.nil?+ report.error = :not_found+ return+ end++ if parsed[:type] == :group+ group = Group.find_by(id: parsed[:id])+ if group.nil? || EXCLUDED_GROUP_IDS.include?(group.id) ||+ !(guardian.is_admin? || guardian.can_see_group_and_members?(group))+ report.error = :not_found+ return+ end+ end++ report.total = 0+ report.data = []+ return if empty_category_selection++ rows = member_rows_for(report, category_ids, guardian, parsed)+ total = member_total_for(report, category_ids, guardian, parsed)+ report.total = total++ report.data =+ rows.map do |row|+ share = total.zero? ? 0.0 : (row[:count].to_f / total * 100).round(2)+ row.merge(share: share, share_formatted: "#{share}%")+ end+ end++ private++ def parse_category_ids_filter(report)+ raw_ids = report.filters[:category_ids]+ return nil, false if raw_ids.blank?++ parsed_ids = Array(raw_ids.is_a?(String) ? raw_ids.split(",") : raw_ids).map(&:to_i)+ ids =+ if parsed_ids.present?+ # in_order_of keeps the admin's requested order and drops nonexistent ids+ Category.in_order_of(:id, parsed_ids).limit(MAX_CATEGORY_IDS).pluck(:id)else- nil+ []+ end++ [ids, ids.empty?]+ end++ def resolve_groups_filter(raw_groups, guardian)+ tokens =+ Array(raw_groups.is_a?(String) ? raw_groups.split(",") : raw_groups)+ .map { |token| token.to_s.strip }+ .reject(&:blank?)+ .uniq+ .first(MAX_GROUPS)++ requested_group_ids =+ tokens.filter_map do |token|+ parse_group_token(token)&.dig(:id) if token.start_with?("group:")end- report.add_filter("category_ids", type: "category_list", default: requested_ids)- empty_selection = filter_requested && requested_ids.empty?+ visible_group_ids =+ if requested_group_ids.present?+ Group+ .where(id: requested_group_ids)+ .where.not(id: EXCLUDED_GROUP_IDS)+ .select { |group| guardian.is_admin? || guardian.can_see_group_and_members?(group) }+ .map(&:id)+ .to_set+ else+ Set.new+ end++ resolved =+ tokens.select do |token|+ parsed = parse_group_token(token)+ next false if parsed.nil?+ parsed[:type] == :synthetic || visible_group_ids.include?(parsed[:id])+ end++ resolved.presence || DEFAULT_GROUPS.dup+ end- counts = Hash.new(0)+ def base_query_builder(report, category_ids, guardian)+ builder = DB.build(<<~SQL)+ /*select*/+ 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*/+ /*order_by*/+ /*limit*/+ SQL- unless empty_selection- builder = DB.build <<~SQL- SELECT+ 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_ids.present?+ builder.where("t.category_id IN (:category_ids)", category_ids: category_ids)+ end++ unless guardian.is_admin?+ builder.join "categories c ON c.id = t.category_id"+ builder.secure_category(guardian.secure_category_ids)+ end++ builder+ end++ def grand_total(report, category_ids, guardian)+ base_query_builder(report, category_ids, guardian).count.to_i+ end++ def synthetic_bucket_counts(report, category_ids, guardian)+ rows =+ base_query_builder(report, category_ids, guardian).select(<<~SQL).group_by("bucket").queryCASEWHEN 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 requested_ids.present?- builder.where("t.category_id IN (:category_ids)", category_ids: requested_ids)- end+ SQL- 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+ rows.each_with_object({}) { |row, counts| counts[row.bucket] = row.post_count }+ end++ def group_post_counts(report, category_ids, guardian, group_ids)+ rows =+ base_query_builder(report, category_ids, guardian)+ .join(+ "group_users gu ON gu.user_id = u.id AND gu.group_id IN (:group_ids)",+ group_ids: group_ids,+ )+ .select("gu.group_id, COUNT(*) AS post_count")+ .group_by("gu.group_id")+ .query- builder.query.each { |row| counts[row.bucket.to_sym] = row.post_count }+ rows.each_with_object({}) { |row, counts| counts[row.group_id] = row.post_count }+ end++ def apply_entry_scope(builder, report, parsed)+ if parsed[:type] == :group+ builder.join(+ "group_users gu ON gu.user_id = u.id AND gu.group_id = :group_id",+ group_id: parsed[:id],+ )+ else+ case parsed[:key]+ when "staff"+ builder.where("u.admin OR u.moderator")+ when "new_members"+ builder.where("NOT (u.admin OR u.moderator)")+ builder.where("u.created_at >= :start_date", start_date: report.start_date)+ when "returning"+ builder.where("NOT (u.admin OR u.moderator)")+ builder.where("u.created_at < :start_date", start_date: report.start_date)+ endend- total = counts.values.sum- report.total = total+ builder+ end- report.data =- MEMBER_TYPES.map do |type|- count = counts[type]- share = total.zero? ? 0.0 : (count.to_f / total * 100).round(2)+ def member_total_for(report, category_ids, guardian, parsed)+ apply_entry_scope(+ base_query_builder(report, category_ids, guardian),+ report,+ parsed,+ ).count.to_i+ end++ def member_rows_for(report, category_ids, guardian, parsed)+ builder =+ apply_entry_scope(base_query_builder(report, category_ids, guardian), report, parsed)++ builder+ .select("u.id AS user_id, u.username, u.uploaded_avatar_id, COUNT(*) AS post_count")+ .group_by("u.id, u.username, u.uploaded_avatar_id")+ .order_by("post_count DESC")+ .limit(MAX_MEMBER_ROWS)+ .query+ .map do |row|{- type: type,- name: I18n.t("reports.posters_by_member_type.types.#{type}"),- count: count,- share: share,- share_formatted: "#{share}%",+ user_id: row.user_id,+ username: row.username,+ avatar_template: User.avatar_template(row.username, row.uploaded_avatar_id),+ count: row.post_count,}endenddiff --git a/app/models/report.rb b/app/models/report.rbindex 858781fe2fe..3b154260b05 100644--- a/app/models/report.rb+++ b/app/models/report.rb@@ -96,6 +96,8 @@ class Reportweb_hook_events_daily_aggregate]+ INTERNAL_REPORT_TYPES = %w[posters_by_member_type_members]+include Reports::AssociatedAccountsByProviderinclude Reports::Bookmarksinclude Reports::ConsolidatedApiRequestsdiff --git a/app/queries/reports/list_query.rb b/app/queries/reports/list_query.rbindex 1da2573ec72..f6c6f40d05c 100644--- a/app/queries/reports/list_query.rb+++ b/app/queries/reports/list_query.rb@@ -14,6 +14,7 @@ module Reportsreturn false if Report.hidden?(type, guardian:)return false if plugin_report? && plugin_disabled?return false if Report::LEGACY_REPORTS.include?(type)+ return false if Report::INTERNAL_REPORT_TYPES.include?(type)trueenddiff --git a/app/services/admin_dashboard_engagement.rb b/app/services/admin_dashboard_engagement.rbindex 9cde44037e6..c2c5ce13468 100644--- a/app/services/admin_dashboard_engagement.rb+++ b/app/services/admin_dashboard_engagement.rb@@ -66,12 +66,15 @@ class AdminDashboardEngagementdef build_postersargs = { start_date: start_date, end_date: end_date, current_user: current_user }- selected_category_ids =- AdminDashboardSectionConfiguration.settings_for("engagement").dig(- "whos_posting",- "category_ids",- )- args[:filters] = { category_ids: selected_category_ids } if selected_category_ids.present?+ whos_posting_settings =+ AdminDashboardSectionConfiguration.settings_for("engagement")["whos_posting"] || {}+ selected_category_ids = whos_posting_settings["category_ids"]+ selected_groups = whos_posting_settings["groups"]++ filters = {}+ filters[:category_ids] = selected_category_ids if selected_category_ids.present?+ filters[:groups] = selected_groups if selected_groups.present?+ args[:filters] = filters if filters.present?report = Report.find_cached("posters_by_member_type", args)if report.nil?@@ -85,6 +88,7 @@ class AdminDashboardEngagementrows: report_data(report),total: report.is_a?(Hash) ? report[:total] : report.total,category_ids: visible_category_ids(selected_category_ids),+ groups: visible_groups(selected_groups),}end@@ -118,4 +122,21 @@ class AdminDashboardEngagementCategory.secured(Guardian.new(current_user)).in_order_of(:id, category_ids).pluck(:id)end++ def visible_groups(groups)+ return Reports::PostersByMemberType::DEFAULT_GROUPS if groups.blank?++ guardian = Guardian.new(current_user)+ resolved =+ groups.select do |token|+ parsed = Report.parse_group_token(token)+ next false if parsed.nil?+ next true if parsed[:type] == :synthetic++ group = Group.find_by(id: parsed[:id])+ group.present? && (guardian.is_admin? || guardian.can_see_group_and_members?(group))+ end++ resolved.presence || Reports::PostersByMemberType::DEFAULT_GROUPS+ endenddiff --git a/app/services/admin_dashboard_section_configuration.rb b/app/services/admin_dashboard_section_configuration.rbindex b0d1ea52dba..ae6b49788ae 100644--- a/app/services/admin_dashboard_section_configuration.rb+++ b/app/services/admin_dashboard_section_configuration.rb@@ -5,6 +5,7 @@ class AdminDashboardSectionConfigurationACTIVITY_BY_CATEGORY_MAX = 10WHOS_POSTING_MAX = 10+ WHOS_POSTING_GROUPS_MAX = 10SUPPORTED_SETTINGS = {"engagement" => {@@ -29,7 +30,7 @@ class AdminDashboardSectionConfigurationend,},"whos_posting" => {- permit: [{ category_ids: [] }],+ permit: [{ category_ids: [] }, { groups: [] }],validate: ->(attrs) doids = attrs[:category_ids]raise Discourse::InvalidParameters.new(:category_ids) if !ids.is_a?(Array)@@ -45,7 +46,24 @@ class AdminDashboardSectionConfigurationraise Discourse::InvalidParameters.new(:category_ids)end- { "category_ids" => parsed }+ result = { "category_ids" => parsed }++ if attrs.key?(:groups)+ groups = attrs[:groups]+ raise Discourse::InvalidParameters.new(:groups) if !groups.is_a?(Array)++ groups = groups.map(&:to_s)++ if groups.blank? || groups.size > WHOS_POSTING_GROUPS_MAX ||+ groups.uniq.size != groups.size ||+ groups.any? { |token| !Report.valid_group_token?(token) }+ raise Discourse::InvalidParameters.new(:groups)+ end++ result["groups"] = groups+ end++ resultend,},},diff --git a/config/locales/client.en.yml b/config/locales/client.en.ymlindex 616478966ce..1372b3f59dc 100644--- a/config/locales/client.en.yml+++ b/config/locales/client.en.yml@@ -7469,6 +7469,21 @@ en:staff: "Staff"empty: "No posts in the selected period."save_error: "Couldn't save your selection for next time."+ add_group: "Add group"+ modal:+ title: "Compare groups"+ search_placeholder: "Search groups..."+ counter: "%{count} of %{max} groups selected"+ apply: "Save"+ enable: "Enable %{title}"+ disable: "Disable %{title}"+ move_up: "Move %{title} up"+ move_down: "Move %{title} down"+ footer_note: "These changes will apply for all users."+ descriptions:+ new_members: "Signed up during the selected period"+ returning: "Signed up before the selected period"+ staff: "Admins and moderators"trust_level_pipeline:title: "Trust level pipeline"trust_levels:@@ -7806,6 +7821,16 @@ en:average_for_sample: "Average for sample"total: "All time total"no_data: "No data to display."+ posters_by_member_type_members:+ title: "%{name} — %{users} · %{posts}"+ users_count:+ one: "%{count} user"+ other: "%{count} users"+ posts_count:+ one: "%{count} post"+ other: "%{count} posts"+ deselect: "Deselect %{name}"+ fetch_error: "Couldn't load users for this group."trending_search:more: '<a href="%{basePath}/admin/logs/search_logs">Search logs</a>'disabled: 'Trending search report is disabled. Enable <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">log search queries</a> to collect data.'diff --git a/config/locales/server.en.yml b/config/locales/server.en.ymlindex 023b504a45a..7ce26a93825 100644--- a/config/locales/server.en.yml+++ b/config/locales/server.en.yml@@ -1477,6 +1477,11 @@ en:new_members: "New members"returning: "Returning"staff: "Staff"+ posters_by_member_type_members:+ labels:+ user: "User"+ count: "Posts"+ share: "Share"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, the number of members promoted or demoted into each trust level during the period, and new sign-ups."diff --git a/frontend/discourse/admin/components/admin-report.gjs b/frontend/discourse/admin/components/admin-report.gjsindex ea78afb8e6f..8591757d2ce 100644--- a/frontend/discourse/admin/components/admin-report.gjs+++ b/frontend/discourse/admin/components/admin-report.gjs@@ -18,7 +18,9 @@ import ReportFilterBoolComponent from "discourse/admin/components/report-filtersimport ReportFilterCategoryComponent from "discourse/admin/components/report-filters/category";import ReportFilterCategoryListComponent from "discourse/admin/components/report-filters/category-list";import ReportFilterGroupComponent from "discourse/admin/components/report-filters/group";+import ReportFilterGroupsComponent from "discourse/admin/components/report-filters/groups";import ReportFilterListComponent from "discourse/admin/components/report-filters/list";+import PostersByMemberTypeReport from "discourse/admin/components/reports/posters-by-member-type-report";import { REPORT_MODES } from "discourse/admin/lib/constants";import Report, {DAILY_LIMIT_DAYS,@@ -259,6 +261,8 @@ export default class AdminReport extends Component {return ReportFilterCategoryListComponent;case "group":return ReportFilterGroupComponent;+ case "groups":+ return ReportFilterGroupsComponent;case "list":return ReportFilterListComponent;}@@ -283,6 +287,8 @@ export default class AdminReport extends Component {return AdminReportRadar;case REPORT_MODES.storage_stats:return AdminReportStorageStats;+ case "posters_by_member_type":+ return PostersByMemberTypeReport;default:if (reportModeComponent(reportMode)) {return reportModeComponent(reportMode);@@ -483,6 +489,7 @@ export default class AdminReport extends Component {this.model = report;this.currentMode = currentMode;this.options = this._buildOptions(currentMode, report);+ this.args.onDataLoaded?.(report);}@binddiff --git a/frontend/discourse/admin/components/dashboard/engagement/whos-posting.gjs b/frontend/discourse/admin/components/dashboard/engagement/whos-posting.gjsindex 47a2e9461f2..d392455afe4 100644--- a/frontend/discourse/admin/components/dashboard/engagement/whos-posting.gjs+++ b/frontend/discourse/admin/components/dashboard/engagement/whos-posting.gjs@@ -6,20 +6,36 @@ import didUpdate from "@ember/render-modifiers/modifiers/did-update";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import { trustHTML } from "@ember/template";+import CompareGroups from "discourse/admin/components/modal/compare-groups";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import Category from "discourse/models/category";import MultipleCategoriesSelector from "discourse/select-kit/components/multiple-categories-selector";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";-const ROW_ORDER = ["new_members", "returning", "staff"];const MAX_CATEGORIES = 10;+const DEFAULT_GROUPS = ["new_members", "returning", "staff"];+const GROUP_SEGMENT_CLASSES = [+ "--group-0",+ "--group-1",+ "--group-2",+ "--group-3",+ "--group-4",+ "--group-5",+];++function sameGroups(a, b) {+ return a.length === b.length && a.every((token, index) => token === b[index]);+}export default class WhosPosting extends Component {@service currentUser;@service toasts;+ @service modal;@tracked selectedCategories = [];+ @tracked selectedGroups = [];@tracked overridePosters = null;@tracked loading = false;@@ -30,13 +46,21 @@ export default class WhosPosting extends Component {.map((id) => Category.findById(id)).filter(Boolean);this.appliedCategoryIds = this.selectedCategories.map((c) => c.id);+ this.selectedGroups = this.args.posters?.groups ?? DEFAULT_GROUPS;}get reportQuery() {const query = {};+ const filters = {};const ids = this.selectedCategories.map((c) => c.id);if (ids.length > 0) {- query.filters = { category_ids: ids.join(",") };+ filters.category_ids = ids.join(",");+ }+ if (!sameGroups(this.selectedGroups, DEFAULT_GROUPS)) {+ filters.groups = this.selectedGroups.join(",");+ }+ if (Object.keys(filters).length > 0) {+ query.filters = filters;}if (this.args.startDate) {query.start_date = this.args.startDate.toISOString().slice(0, 10);@@ -53,16 +77,19 @@ export default class WhosPosting extends Component {get rows() {const rows = this.posters?.rows ?? [];- const byType = Object.fromEntries(rows.map((r) => [r.type, r]));- return ROW_ORDER.map((type) => {- const row = byType[type] ?? { type, count: 0, share: 0 };+ let groupIndex = 0;+ return rows.map((row) => {+ const segmentClass =+ row.kind === "group"+ ? GROUP_SEGMENT_CLASSES[groupIndex++ % GROUP_SEGMENT_CLASSES.length]+ : `--${row.type.replace("_", "-")}`;return {- type,- label: i18n(`admin.dashboard.sections.engagement.whos_posting.${type}`),+ type: row.type,+ label: row.name,share: row.share,shareFormatted: `${Math.round(row.share)}%`,segmentStyle: trustHTML(`width: ${row.share}%`),- segmentClass: `--${type.replace("_", "-")}`,+ segmentClass,};});}@@ -86,7 +113,7 @@ export default class WhosPosting extends Component {}@action- onClose() {+ onCategoriesClose() {const ids = this.selectedCategories.map((c) => c.id);const unchanged =ids.length === this.appliedCategoryIds.length &&@@ -99,10 +126,27 @@ export default class WhosPosting extends Component {this.appliedCategoryIds = ids;this.refetch();- this.#persistSelection();+ this.#persist();+ }++ @action+ openCompareGroups() {+ this.modal.show(CompareGroups, {+ model: {+ currentTokens: this.selectedGroups,+ footerNote: i18n(+ "admin.dashboard.sections.engagement.whos_posting.modal.footer_note"+ ),+ onApply: (tokens) => {+ this.selectedGroups = tokens;+ this.refetch();+ this.#persist();+ },+ },+ });}- #persistSelection() {+ #persist() {if (!this.currentUser?.admin) {return;}@@ -112,6 +156,7 @@ export default class WhosPosting extends Component {contentType: "application/json",data: JSON.stringify({category_ids: this.selectedCategories.map((c) => c.id),+ groups: this.selectedGroups,}),}).catch(() => {this.toasts.error({@@ -127,7 +172,11 @@ export default class WhosPosting extends Component {@actiononPeriodChange() {- if (this.selectedCategories.length === 0) {+ const hasCustomSelection =+ this.selectedCategories.length > 0 ||+ !sameGroups(this.selectedGroups, DEFAULT_GROUPS);++ if (!hasCustomSelection) {this.overridePosters = null;} else {this.refetch();@@ -141,10 +190,12 @@ export default class WhosPosting extends Component {start_date: this.args.startDate?.toISOString().slice(0, 10),end_date: this.args.endDate?.toISOString().slice(0, 10),};+ const filters = { groups: this.selectedGroups.join(",") };const ids = this.selectedCategories.map((c) => c.id);if (ids.length > 0) {- data.filters = { category_ids: ids.join(",") };+ filters.category_ids = ids.join(",");}+ data.filters = filters;try {const response = await ajax(@@ -153,7 +204,12 @@ export default class WhosPosting extends Component {);const report = response?.report;const rows = report?.data ?? [];- this.overridePosters = { rows, total: report?.total ?? 0 };+ this.overridePosters = {+ rows,+ total: report?.total ?? 0,+ category_ids: this.args.posters?.category_ids,+ groups: this.selectedGroups,+ };} catch (error) {popupAjaxError(error);} finally {@@ -179,7 +235,7 @@ export default class WhosPosting extends Component {<MultipleCategoriesSelector@categories={{this.selectedCategories}}@onChange={{this.onCategoriesChange}}- @onClose={{this.onClose}}+ @onClose={{this.onCategoriesClose}}@options={{hash maximum=MAX_CATEGORIES none="category.all"}}/></div>@@ -211,6 +267,13 @@ export default class WhosPosting extends Component {{{i18n "admin.dashboard.sections.engagement.whos_posting.empty"}}</p>{{/if}}++ <DButton+ @action={{this.openCompareGroups}}+ @icon="plus"+ @label="admin.dashboard.sections.engagement.whos_posting.add_group"+ class="btn-transparent db-whos-posting__add-group"+ /></div></template>}diff --git a/frontend/discourse/admin/components/manageable-row-list-item.gjs b/frontend/discourse/admin/components/manageable-row-list-item.gjsnew file mode 100644index 00000000000..c7f3bf75f69--- /dev/null+++ b/frontend/discourse/admin/components/manageable-row-list-item.gjs@@ -0,0 +1,159 @@+import Component from "@glimmer/component";+import { tracked } from "@glimmer/tracking";+import { concat, fn } from "@ember/helper";+import { on } from "@ember/modifier";+import { action } from "@ember/object";+import { service } from "@ember/service";+import { and, eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import { i18n } from "discourse-i18n";++export default class ManageableRowListItem extends Component {+ @service site;++ @tracked dragCssClass;+ dragCount = 0;++ isAboveElement(event) {+ const domRect = event.currentTarget.getBoundingClientRect();+ return event.offsetY < domRect.height / 2;+ }++ @action+ dragStart(event) {+ event.dataTransfer.effectAllowed = "move";+ this.args.onDragStart(this.args.row.key);+ this.dragCssClass = "dragging";+ }++ @action+ dragOver(event) {+ if (!this.args.row.enabled) {+ return;+ }+ event.preventDefault();+ if (this.dragCssClass === "dragging") {+ return;+ }+ this.dragCssClass = this.isAboveElement(event)+ ? "drag-above"+ : "drag-below";+ }++ @action+ dragEnter() {+ this.dragCount++;+ }++ @action+ dragLeave() {+ this.dragCount--;+ if (+ this.dragCount === 0 &&+ (this.dragCssClass === "drag-above" || this.dragCssClass === "drag-below")+ ) {+ this.dragCssClass = null;+ }+ }++ @action+ drop(event) {+ if (!this.args.row.enabled) {+ return;+ }+ event.preventDefault();+ event.stopPropagation();+ this.dragCount = 0;+ const dropAbove = this.isAboveElement(event);+ this.dragCssClass = null;+ this.args.onDrop(this.args.row.key, dropAbove);+ }++ @action+ dragEnd() {+ this.dragCount = 0;+ this.dragCssClass = null;+ this.args.onDragEnd();+ }++ <template>+ <li+ class={{dConcatClass+ "manageable-row-list__row"+ (if @row.enabled "--enabled")+ this.dragCssClass+ }}+ data-identifier={{@row.key}}+ draggable={{and @row.enabled @reorderable}}+ {{on "dragstart" this.dragStart}}+ {{on "dragover" this.dragOver}}+ {{on "dragenter" this.dragEnter}}+ {{on "dragleave" this.dragLeave}}+ {{on "drop" this.drop}}+ {{on "dragend" this.dragEnd}}+ >++ {{#unless this.site.mobileView}}+ <span class="manageable-row-list__grip">+ {{dIcon "grip-vertical"}}+ </span>+ {{/unless}}++ {{#if this.site.mobileView}}+ <div class="manageable-row-list__order-mobile">+ <DButton+ @icon="arrow-up"+ @action={{fn @onMoveUp @row}}+ @disabled={{eq @index 0}}+ @translatedAriaLabel={{i18n+ (concat @ariaLabelPrefix ".move_up")+ }}+ class="manageable-row-list__arrow btn-transparent"+ />+ <DButton+ @icon="arrow-down"+ @action={{fn @onMoveDown @row}}+ @disabled={{eq @index @lastEnabledIndex}}+ @translatedAriaLabel={{i18n+ (concat @ariaLabelPrefix ".move_down")+ }}+ class="manageable-row-list__arrow btn-transparent"+ />+ </div>+ {{/if}}++ <div class="manageable-row-list__row-text">+ <div class="manageable-row-list__row-heading">+ <span class="manageable-row-list__title">{{@row.title}}</span>+ {{#if @row.label}}+ <span class="db-report__label">+ {{@row.label}}+ </span>+ {{/if}}+ </div>+ {{#if @row.description}}+ <p class="manageable-row-list__description">{{@row.description}}</p>+ {{/if}}+ </div>++ <DToggleSwitch+ @state={{@row.enabled}}+ disabled={{@toggleDisabled}}+ aria-label={{i18n+ (if+ @row.enabled+ (concat @ariaLabelPrefix ".disable")+ (concat @ariaLabelPrefix ".enable")+ )+ }}+ {{on "click" (fn @onToggle @row)}}+ />+ </li>+ </template>+}diff --git a/frontend/discourse/admin/components/modal/compare-groups.gjs b/frontend/discourse/admin/components/modal/compare-groups.gjsnew file mode 100644index 00000000000..b25f9e695aa--- /dev/null+++ b/frontend/discourse/admin/components/modal/compare-groups.gjs@@ -0,0 +1,220 @@+import Component from "@glimmer/component";+import { tracked } from "@glimmer/tracking";+import { hash } from "@ember/helper";+import { action } from "@ember/object";+import { service } from "@ember/service";+import ManageableRowListItem from "discourse/admin/components/manageable-row-list-item";+import ToggleableOrderedList from "discourse/admin/lib/toggleable-ordered-list";+import DButton from "discourse/ui-kit/d-button";+import DFilterInput from "discourse/ui-kit/d-filter-input";+import DModal from "discourse/ui-kit/d-modal";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import { i18n } from "discourse-i18n";++export const VISIBLE_CAP = 10;+export const SYNTHETIC_KEYS = ["new_members", "returning", "staff"];++const EXCLUDED_AUTO_GROUP_IDS = [0, 3, 4, 5];+const ARIA_LABEL_PREFIX =+ "admin.dashboard.sections.engagement.whos_posting.modal";++export function groupToken(groupId) {+ return `group:${groupId}`;+}++export default class CompareGroups extends Component {+ @service site;++ @tracked search = "";+ @tracked applying = false;+ list = new ToggleableOrderedList({ cap: VISIBLE_CAP, minSelected: 1 });++ rowsByKey = new Map();++ toggleDisabled = (row) => this.list.toggleDisabled(row.key);++ constructor() {+ super(...arguments);+ this.buildRows();++ const currentTokens = this.args.model?.currentTokens ?? [];+ this.list.enabledOrder = currentTokens.filter((key) =>+ this.rowsByKey.has(key)+ );+ }++ buildRows() {+ SYNTHETIC_KEYS.forEach((key) => {+ this.rowsByKey.set(key, {+ key,+ title: i18n(`admin.dashboard.sections.engagement.whos_posting.${key}`),+ description: i18n(+ `admin.dashboard.sections.engagement.whos_posting.modal.descriptions.${key}`+ ),+ });+ });++ (this.site.groups ?? [])+ .filter((group) => !EXCLUDED_AUTO_GROUP_IDS.includes(group.id))+ .forEach((group) => {+ const key = groupToken(group.id);+ this.rowsByKey.set(key, { key, title: group.full_name || group.name });+ });+ }++ get enabledRows() {+ return this.list.enabledOrder+ .map((key) => this.rowsByKey.get(key))+ .filter(Boolean);+ }++ get disabledRows() {+ const enabled = this.list.enabledKeys;+ return [...this.rowsByKey.values()].filter((row) => !enabled.has(row.key));+ }++ get filteredDisabledRows() {+ const query = this.search.trim().toLowerCase();+ if (!query) {+ return this.disabledRows;+ }+ return this.disabledRows.filter((row) =>+ (row.title ?? "").toLowerCase().includes(query)+ );+ }++ get visibleRows() {+ return [+ ...this.enabledRows.map((row) => ({ ...row, enabled: true })),+ ...this.filteredDisabledRows.map((row) => ({ ...row, enabled: false })),+ ];+ }++ get lastEnabledIndex() {+ return this.enabledRows.length - 1;+ }++ @action+ updateSearch(event) {+ this.search = event.target.value;+ }++ @action+ toggle(row) {+ this.list.toggle(row.key);+ }++ @action+ moveUp(row) {+ this.list.moveUp(row.key);+ }++ @action+ moveDown(row) {+ this.list.moveDown(row.key);+ }++ @action+ onDragStart(key) {+ this.list.onDragStart(key);+ }++ @action+ onDrop(targetKey, dropAbove) {+ this.list.onDrop(targetKey, dropAbove);+ }++ @action+ onDragEnd() {+ this.list.onDragEnd();+ }++ @action+ apply() {+ this.applying = true;+ this.args.model?.onApply?.(this.list.enabledOrder);+ this.args.closeModal?.();+ }++ <template>+ <DModal+ @title={{i18n+ "admin.dashboard.sections.engagement.whos_posting.modal.title"+ }}+ @closeModal={{@closeModal}}+ @inline={{@inline}}+ class="compare-groups has-search manageable-row-list"+ >++ <:belowModalTitle>+ <span class="manageable-row-list__counter">+ {{i18n+ "admin.dashboard.sections.engagement.whos_posting.modal.counter"+ count=this.list.enabledOrder.length+ max=VISIBLE_CAP+ }}+ </span>+ </:belowModalTitle>++ <:belowHeader>+ <div class="manageable-row-list__search-wrapper">+ <DFilterInput+ @icons={{hash left="magnifying-glass"}}+ @value={{this.search}}+ @filterAction={{this.updateSearch}}+ placeholder={{i18n+ "admin.dashboard.sections.engagement.whos_posting.modal.search_placeholder"+ }}+ />+ </div>+ </:belowHeader>++ <:body>+ <ul+ class={{dConcatClass+ "manageable-row-list__list"+ (if this.list.draggedId "--dragging")+ (if this.list.reorderable "--reorderable")+ }}+ >+ {{#each this.visibleRows key="key" as |row index|}}+ <ManageableRowListItem+ @ariaLabelPrefix={{ARIA_LABEL_PREFIX}}+ @row={{row}}+ @index={{index}}+ @lastEnabledIndex={{this.lastEnabledIndex}}+ @reorderable={{this.list.reorderable}}+ @toggleDisabled={{this.toggleDisabled row}}+ @onToggle={{this.toggle}}+ @onMoveUp={{this.moveUp}}+ @onMoveDown={{this.moveDown}}+ @onDragStart={{this.onDragStart}}+ @onDrop={{this.onDrop}}+ @onDragEnd={{this.onDragEnd}}+ />+ {{/each}}+ </ul>+ </:body>++ <:footer>+ {{#if @model.footerNote}}+ <p class="manageable-row-list__footer-note">{{@model.footerNote}}</p>+ {{/if}}+ <div class="compare-groups__footer-actions">+ <DButton+ @label="js.cancel_value"+ @action={{@closeModal}}+ class="btn-transparent compare-groups__cancel"+ />+ <DButton+ @label="admin.dashboard.sections.engagement.whos_posting.modal.apply"+ @action={{this.apply}}+ @disabled={{this.applying}}+ @isLoading={{this.applying}}+ class="btn-primary compare-groups__apply"+ />+ </div>+ </:footer>+ </DModal>+ </template>+}diff --git a/frontend/discourse/admin/components/modal/manage-reports.gjs b/frontend/discourse/admin/components/modal/manage-reports.gjsindex 5bfe89f5e30..c7ea3b395ab 100644--- a/frontend/discourse/admin/components/modal/manage-reports.gjs+++ b/frontend/discourse/admin/components/modal/manage-reports.gjs@@ -1,177 +1,27 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";-import { fn, hash } from "@ember/helper";-import { on } from "@ember/modifier";+import { hash } from "@ember/helper";import { action } from "@ember/object";-import { service } from "@ember/service";+import ManageableRowListItem from "discourse/admin/components/manageable-row-list-item";+import ToggleableOrderedList from "discourse/admin/lib/toggleable-ordered-list";import PluginOutlet from "discourse/components/plugin-outlet";import lazyHash from "discourse/helpers/lazy-hash";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import discourseDebounce from "discourse/lib/debounce";-import { and, eq } from "discourse/truth-helpers";import DButton from "discourse/ui-kit/d-button";import DFilterInput from "discourse/ui-kit/d-filter-input";import DLoadMore from "discourse/ui-kit/d-load-more";import DModal from "discourse/ui-kit/d-modal";-import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";-import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const VISIBLE_CAP = 10;const SEARCH_DEBOUNCE_MS = 200;--class ManageReportsRow extends Component {- @service site;-- @tracked dragCssClass;- dragCount = 0;-- isAboveElement(event) {- const domRect = event.currentTarget.getBoundingClientRect();- return event.offsetY < domRect.height / 2;- }-- @action- dragStart(event) {- event.dataTransfer.effectAllowed = "move";- this.args.onDragStart(this.args.row.key);- this.dragCssClass = "dragging";- }-- @action- dragOver(event) {- if (!this.args.row.enabled) {- return;- }- event.preventDefault();- if (this.dragCssClass === "dragging") {- return;- }- this.dragCssClass = this.isAboveElement(event)- ? "drag-above"- : "drag-below";- }-- @action- dragEnter() {- this.dragCount++;- }-- @action- dragLeave() {- this.dragCount--;- if (- this.dragCount === 0 &&- (this.dragCssClass === "drag-above" || this.dragCssClass === "drag-below")- ) {- this.dragCssClass = null;- }- }-- @action- drop(event) {- if (!this.args.row.enabled) {- return;- }- event.preventDefault();- event.stopPropagation();- this.dragCount = 0;- const dropAbove = this.isAboveElement(event);- this.dragCssClass = null;- this.args.onDrop(this.args.row.key, dropAbove);- }-- @action- dragEnd() {- this.dragCount = 0;- this.dragCssClass = null;- this.args.onDragEnd();- }-- <template>- <li- class={{dConcatClass- "manage-reports__row"- (if @row.enabled "--enabled")- this.dragCssClass- }}- data-identifier={{@row.key}}- draggable={{and @row.enabled @reorderable}}- {{on "dragstart" this.dragStart}}- {{on "dragover" this.dragOver}}- {{on "dragenter" this.dragEnter}}- {{on "dragleave" this.dragLeave}}- {{on "drop" this.drop}}- {{on "dragend" this.dragEnd}}- >-- {{#unless this.site.mobileView}}- <span class="manage-reports__grip">- {{dIcon "grip-vertical"}}- </span>- {{/unless}}-- {{#if this.site.mobileView}}- <div class="manage-reports__order-mobile">- <DButton- @icon="arrow-up"- @action={{fn @onMoveUp @row}}- @disabled={{eq @index 0}}- @translatedAriaLabel={{i18n- "admin.dashboard.reports_section.modal.move_up"- }}- class="manage-reports__arrow btn-transparent"- />- <DButton- @icon="arrow-down"- @action={{fn @onMoveDown @row}}- @disabled={{eq @index @lastEnabledIndex}}- @translatedAriaLabel={{i18n- "admin.dashboard.reports_section.modal.move_down"- }}- class="manage-reports__arrow btn-transparent"- />- </div>- {{/if}}-- <div class="manage-reports__row-text">- <div class="manage-reports__row-heading">- <span class="manage-reports__title">{{@row.title}}</span>- {{#if @row.label}}- <span class="db-report__label">- {{@row.label}}- </span>- {{/if}}- </div>- {{#if @row.description}}- <p class="manage-reports__description">{{@row.description}}</p>- {{/if}}- </div>-- <DToggleSwitch- @state={{@row.enabled}}- disabled={{@toggleDisabled}}- aria-label={{i18n- (if- @row.enabled- "admin.dashboard.reports_section.modal.disable"- "admin.dashboard.reports_section.modal.enable"- )- }}- {{on "click" (fn @onToggle @row)}}- />- </li>- </template>-}+const ARIA_LABEL_PREFIX = "admin.dashboard.reports_section.modal";export default class ManageReports extends Component {@tracked allKeys = [];- @tracked enabledOrder = [];@tracked providers = [];@tracked search = "";@tracked nextCursor = null;@@ -179,23 +29,19 @@ export default class ManageReports extends Component {@tracked loading = true;@tracked loadingMore = false;@tracked applying = false;- @tracked draggedId = null;+ list = new ToggleableOrderedList({ cap: VISIBLE_CAP });+itemsByKey = new Map();- isEnabled = (row) => this.enabledKeys.has(row.key);- toggleDisabled = (row) => this.atCap && !this.isEnabled(row);+ toggleDisabled = (row) => this.list.toggleDisabled(row.key);constructor() {super(...arguments);this.load();}- get enabledKeys() {- return new Set(this.enabledOrder);- }-get enabledRows() {- return this.enabledOrder+ return this.list.enabledOrder.map((key) => this.itemsByKey.get(key)).filter(Boolean);}@@ -205,7 +51,8 @@ export default class ManageReports extends Component {}get disabledRows() {- return this.allRows.filter((row) => !this.enabledKeys.has(row.key));+ const enabled = this.list.enabledKeys;+ return this.allRows.filter((row) => !enabled.has(row.key));}get filteredEnabledRows() {@@ -227,14 +74,6 @@ export default class ManageReports extends Component {];}- get atCap() {- return this.enabledOrder.length >= VISIBLE_CAP;- }-- get reorderable() {- return this.enabledOrder.length > 1;- }-get lastEnabledIndex() {return this.filteredEnabledRows.length - 1;}@@ -256,7 +95,7 @@ export default class ManageReports extends Component {this.providers = response.providers ?? [];this.cacheItems(enabled);this.cacheItems(page);- this.enabledOrder = enabled.map((item) => item.key);+ this.list.enabledOrder = enabled.map((item) => item.key);this.allKeys = page.map((item) => item.key);this.nextCursor = response.cursor ?? null;this.hasMore = !!response.has_more;@@ -323,70 +162,32 @@ export default class ManageReports extends Component {@actiontoggle(row) {this.itemsByKey.set(row.key, row);- if (this.enabledKeys.has(row.key)) {- this.enabledOrder = this.enabledOrder.filter((k) => k !== row.key);- } else if (!this.atCap) {- this.enabledOrder = [...this.enabledOrder, row.key];- }+ this.list.toggle(row.key);}@actionmoveUp(row) {- const index = this.enabledOrder.indexOf(row.key);- if (index <= 0) {- return;- }- const next = [...this.enabledOrder];- [next[index - 1], next[index]] = [next[index], next[index - 1]];- this.enabledOrder = next;+ this.list.moveUp(row.key);}@actionmoveDown(row) {- const index = this.enabledOrder.indexOf(row.key);- if (index < 0 || index === this.enabledOrder.length - 1) {- return;- }- const next = [...this.enabledOrder];- [next[index], next[index + 1]] = [next[index + 1], next[index]];- this.enabledOrder = next;+ this.list.moveDown(row.key);}@actiononDragStart(key) {- this.draggedId = key;+ this.list.onDragStart(key);}@actiononDrop(targetKey, dropAbove) {- const fromIndex = this.enabledOrder.indexOf(this.draggedId);- this.draggedId = null;- if (fromIndex < 0) {- return;- }-- const targetIndex = this.enabledOrder.indexOf(targetKey);- if (targetIndex < 0) {- return;- }-- let toIndex = dropAbove ? targetIndex : targetIndex + 1;- if (fromIndex < toIndex) {- toIndex -= 1;- }- if (fromIndex === toIndex) {- return;- }-- const next = [...this.enabledOrder];- const [moved] = next.splice(fromIndex, 1);- next.splice(toIndex, 0, moved);- this.enabledOrder = next;+ this.list.onDrop(targetKey, dropAbove);}@actiononDragEnd() {- this.draggedId = null;+ this.list.onDragEnd();}@action@@ -416,21 +217,21 @@ export default class ManageReports extends Component {<DModal@title={{i18n "admin.dashboard.reports_section.modal.title"}}@closeModal={{@closeModal}}- class="manage-reports has-search"+ class="manage-reports has-search manageable-row-list"><:belowModalTitle>- <span class="manage-reports__counter">+ <span class="manageable-row-list__counter">{{i18n"admin.dashboard.reports_section.modal.counter"- count=this.enabledOrder.length+ count=this.list.enabledOrder.lengthmax=VISIBLE_CAP}}</span></:belowModalTitle><:belowHeader>- <div class="manage-reports__search-wrapper">+ <div class="manageable-row-list__search-wrapper"><DFilterInput@icons={{hash left="magnifying-glass"}}@value={{this.search}}@@ -447,17 +248,18 @@ export default class ManageReports extends Component {{{#if this.visibleRows.length}}<ulclass={{dConcatClass- "manage-reports__list"- (if this.draggedId "--dragging")- (if this.reorderable "--reorderable")+ "manageable-row-list__list"+ (if this.list.draggedId "--dragging")+ (if this.list.reorderable "--reorderable")}}>{{#each this.visibleRows key="key" as |row index|}}- <ManageReportsRow+ <ManageableRowListItem+ @ariaLabelPrefix={{ARIA_LABEL_PREFIX}}@row={{row}}@index={{index}}@lastEnabledIndex={{this.lastEnabledIndex}}- @reorderable={{this.reorderable}}+ @reorderable={{this.list.reorderable}}@toggleDisabled={{this.toggleDisabled row}}@onToggle={{this.toggle}}@onMoveUp={{this.moveUp}}@@ -488,7 +290,7 @@ export default class ManageReports extends Component {</:aboveFooter><:footer>- <p class="manage-reports__footer-note">+ <p class="manageable-row-list__footer-note">{{i18n "admin.dashboard.reports_section.modal.footer_note"}}</p><div class="manage-reports__footer-actions">diff --git a/frontend/discourse/admin/components/report-filters/groups.gjs b/frontend/discourse/admin/components/report-filters/groups.gjsnew file mode 100644index 00000000000..659c42c3078--- /dev/null+++ b/frontend/discourse/admin/components/report-filters/groups.gjs@@ -0,0 +1,28 @@+import { action } from "@ember/object";+import { service } from "@ember/service";+import CompareGroups from "discourse/admin/components/modal/compare-groups";+import FilterComponent from "discourse/admin/components/report-filters/filter";+import DButton from "discourse/ui-kit/d-button";++export default class Groups extends FilterComponent {+ @service modal;++ @action+ openCompareGroups() {+ this.modal.show(CompareGroups, {+ model: {+ currentTokens: this.filter?.default ?? [],+ onApply: (tokens) => this.applyFilter(this.filter.id, tokens.join(",")),+ },+ });+ }++ <template>+ <DButton+ @action={{this.openCompareGroups}}+ @icon="plus"+ @label="admin.dashboard.sections.engagement.whos_posting.add_group"+ class="btn-default report-filter-groups__button"+ />+ </template>+}diff --git a/frontend/discourse/admin/components/reports/posters-by-member-type-report.gjs b/frontend/discourse/admin/components/reports/posters-by-member-type-report.gjsnew file mode 100644index 00000000000..222736ce048--- /dev/null+++ b/frontend/discourse/admin/components/reports/posters-by-member-type-report.gjs@@ -0,0 +1,232 @@+import Component from "@glimmer/component";+import { tracked } from "@glimmer/tracking";+import { array, fn, hash } from "@ember/helper";+import { on } from "@ember/modifier";+import { action } from "@ember/object";+import didUpdate from "@ember/render-modifiers/modifiers/did-update";+import AdminReport from "discourse/admin/components/admin-report";+import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import { i18n } from "discourse-i18n";++export default class PostersByMemberTypeReport extends Component {+ @tracked selectedGroupKey = this.args.model?.data?.[0]?.type ?? null;+ @tracked memberCount = null;++ get rows() {+ return this.args.model?.data ?? [];+ }++ get labels() {+ return this.args.model?.labels ?? [];+ }++ get nameLabel() {+ return this.labels[0]?.title;+ }++ get countLabel() {+ return this.labels[1]?.title;+ }++ get shareLabel() {+ return this.labels[2]?.title;+ }++ get selectedRow() {+ return this.rows.find((row) => row.type === this.selectedGroupKey);+ }++ get hasMemberCount() {+ return this.memberCount !== null;+ }++ get membersUsersLabel() {+ return i18n(+ "admin.dashboard.reports.posters_by_member_type_members.users_count",+ { count: this.memberCount }+ );+ }++ get membersPostsLabel() {+ return i18n(+ "admin.dashboard.reports.posters_by_member_type_members.posts_count",+ { count: this.selectedRow?.count ?? 0 }+ );+ }++ get membersAriaLabel() {+ return i18n(+ "admin.dashboard.reports.posters_by_member_type_members.title",+ {+ name: this.selectedRow?.name,+ users: this.membersUsersLabel,+ posts: this.membersPostsLabel,+ }+ );+ }++ get membersSubtitle() {+ return `${this.membersUsersLabel} · ${this.membersPostsLabel}`;+ }++ get deselectAriaLabel() {+ return i18n(+ "admin.dashboard.reports.posters_by_member_type_members.deselect",+ {+ name: this.selectedRow?.name,+ }+ );+ }++ get categoryIds() {+ const filter = this.args.model?.available_filters?.find(+ (f) => f.id === "category_ids"+ );+ return filter?.default ?? [];+ }++ get categoryIdsParam() {+ return this.categoryIds.join(",");+ }++ get startDate() {+ return moment(this.args.model?.start_date).format("YYYY-MM-DD");+ }++ get endDate() {+ return moment(this.args.model?.end_date).format("YYYY-MM-DD");+ }++ setSelectedGroupKey(key) {+ this.selectedGroupKey = key;+ this.memberCount = null;+ }++ @action+ resyncSelection() {+ if (!this.rows.some((row) => row.type === this.selectedGroupKey)) {+ this.setSelectedGroupKey(this.rows[0]?.type ?? null);+ }+ }++ @action+ selectRow(row) {+ this.setSelectedGroupKey(row.type);+ }++ @action+ selectRowOnKeydown(row, event) {+ if (event.key === "Enter" || event.key === " ") {+ event.preventDefault();+ this.selectRow(row);+ }+ }++ @action+ deselectGroup() {+ this.setSelectedGroupKey(null);+ }++ @action+ onMembersLoaded(report) {+ this.memberCount = report?.data?.length ?? 0;+ }++ <template>+ <div+ class="posters-by-member-type-report admin-report-table"+ {{didUpdate this.resyncSelection @model.data}}+ >+ <table class="posters-by-member-type-report__table table">+ <thead>+ <tr>+ <th>{{this.nameLabel}}</th>+ <th class="posters-by-member-type-report__numeric">+ {{this.countLabel}}+ </th>+ <th class="posters-by-member-type-report__numeric">+ {{this.shareLabel}}+ </th>+ </tr>+ </thead>+ <tbody>+ {{#each this.rows as |row|}}+ <tr+ class={{dConcatClass+ "posters-by-member-type-report__row"+ (if (eq row.type this.selectedGroupKey) "--selected")+ }}+ role="button"+ tabindex="0"+ {{on "click" (fn this.selectRow row)}}+ {{on "keydown" (fn this.selectRowOnKeydown row)}}+ >+ <td class="posters-by-member-type-report__name">{{row.name}}</td>+ <td+ class="posters-by-member-type-report__numeric"+ >{{row.count}}</td>+ <td+ class="posters-by-member-type-report__numeric"+ >{{row.share_formatted}}</td>+ </tr>+ {{/each}}+ <tr class="total-row">+ <td colspan="3">+ {{i18n "admin.dashboard.reports.totals_for_sample"}}+ </td>+ </tr>+ <tr>+ <td>—</td>+ <td class="posters-by-member-type-report__numeric">+ {{@model.total}}+ </td>+ <td class="posters-by-member-type-report__numeric">—</td>+ </tr>+ </tbody>+ </table>++ {{#if this.selectedRow}}+ <div class="posters-by-member-type-report__members">+ <div+ class="posters-by-member-type-report__members-header"+ aria-label={{this.membersAriaLabel}}+ >+ <div class="posters-by-member-type-report__members-heading">+ <h3 class="posters-by-member-type-report__members-name">+ {{this.selectedRow.name}}+ </h3>+ {{#if this.hasMemberCount}}+ <p class="posters-by-member-type-report__members-stats">+ {{this.membersSubtitle}}+ </p>+ {{/if}}+ </div>+ <DButton+ class="btn-flat posters-by-member-type-report__members-close"+ @icon="xmark"+ @translatedAriaLabel={{this.deselectAriaLabel}}+ @action={{this.deselectGroup}}+ />+ </div>+ {{#each (array this.selectedGroupKey) key="@identity" as |groupKey|}}+ <AdminReport+ @dataSourceName="posters_by_member_type_members"+ @showHeader={{false}}+ @showFilteringUI={{false}}+ @onDataLoaded={{this.onMembersLoaded}}+ @filters={{hash+ startDate=this.startDate+ endDate=this.endDate+ customFilters=(hash+ group=groupKey category_ids=this.categoryIdsParam+ )+ }}+ />+ {{/each}}+ </div>+ {{/if}}+ </div>+ </template>+}diff --git a/frontend/discourse/admin/lib/toggleable-ordered-list.js b/frontend/discourse/admin/lib/toggleable-ordered-list.jsnew file mode 100644index 00000000000..74af20a9de0--- /dev/null+++ b/frontend/discourse/admin/lib/toggleable-ordered-list.js@@ -0,0 +1,100 @@+import { tracked } from "@glimmer/tracking";++export default class ToggleableOrderedList {+ @tracked enabledOrder;+ @tracked draggedId = null;++ constructor({ cap, minSelected = 0, initialOrder = [] } = {}) {+ this.cap = cap;+ this.minSelected = minSelected;+ this.enabledOrder = [...initialOrder];+ }++ get enabledKeys() {+ return new Set(this.enabledOrder);+ }++ get atCap() {+ return this.cap != null && this.enabledOrder.length >= this.cap;+ }++ get reorderable() {+ return this.enabledOrder.length > 1;+ }++ isEnabled(key) {+ return this.enabledKeys.has(key);+ }++ toggleDisabled(key) {+ if (this.isEnabled(key)) {+ return this.enabledOrder.length <= this.minSelected;+ }+ return this.atCap;+ }++ toggle(key) {+ if (this.isEnabled(key)) {+ if (this.enabledOrder.length <= this.minSelected) {+ return;+ }+ this.enabledOrder = this.enabledOrder.filter((k) => k !== key);+ } else if (!this.atCap) {+ this.enabledOrder = [...this.enabledOrder, key];+ }+ }++ moveUp(key) {+ const index = this.enabledOrder.indexOf(key);+ if (index <= 0) {+ return;+ }+ const next = [...this.enabledOrder];+ [next[index - 1], next[index]] = [next[index], next[index - 1]];+ this.enabledOrder = next;+ }++ moveDown(key) {+ const index = this.enabledOrder.indexOf(key);+ if (index < 0 || index === this.enabledOrder.length - 1) {+ return;+ }+ const next = [...this.enabledOrder];+ [next[index], next[index + 1]] = [next[index + 1], next[index]];+ this.enabledOrder = next;+ }++ onDragStart(key) {+ this.draggedId = key;+ }++ onDrop(targetKey, dropAbove) {+ const fromIndex = this.enabledOrder.indexOf(this.draggedId);+ this.draggedId = null;+ if (fromIndex < 0) {+ return;+ }++ const targetIndex = this.enabledOrder.indexOf(targetKey);+ if (targetIndex < 0) {+ return;+ }++ let toIndex = dropAbove ? targetIndex : targetIndex + 1;+ if (fromIndex < toIndex) {+ toIndex -= 1;+ }+ if (fromIndex === toIndex) {+ return;+ }++ const next = [...this.enabledOrder];+ const [moved] = next.splice(fromIndex, 1);+ next.splice(toIndex, 0, moved);+ this.enabledOrder = next;+ }++ onDragEnd() {+ this.draggedId = null;+ }+}diff --git a/frontend/discourse/tests/integration/components/admin-report-test.gjs b/frontend/discourse/tests/integration/components/admin-report-test.gjsindex 2afe2edcd13..63e580bc888 100644--- a/frontend/discourse/tests/integration/components/admin-report-test.gjs+++ b/frontend/discourse/tests/integration/components/admin-report-test.gjs@@ -61,6 +61,23 @@ module("Integration | Component | AdminReport", function (hooks) {.hasText("7", "can sort rows");});+ test("onDataLoaded", async function (assert) {+ let loadedReport;+ const onDataLoaded = (report) => (loadedReport = report);++ await render(+ <template>+ <AdminReport @dataSourceName="signups" @onDataLoaded={{onDataLoaded}} />+ </template>+ );++ assert.strictEqual(+ loadedReport?.type,+ "signups",+ "calls onDataLoaded with the fetched report once it's loaded"+ );+ });+test("options", async function (assert) {this.set("options", {table: {diff --git a/frontend/discourse/tests/integration/components/dashboard/whos-posting-test.gjs b/frontend/discourse/tests/integration/components/dashboard/whos-posting-test.gjsindex 60484776ff2..c48c1c8b93e 100644--- a/frontend/discourse/tests/integration/components/dashboard/whos-posting-test.gjs+++ b/frontend/discourse/tests/integration/components/dashboard/whos-posting-test.gjs@@ -13,14 +13,27 @@ module("Integration | Component | Dashboard | WhosPosting", function (hooks) {const posters = {total: 100,+ groups: ["new_members", "returning", "staff"],rows: [- { type: "new_members", count: 34, share: 34 },- { type: "returning", count: 51, share: 51 },- { type: "staff", count: 15, share: 15 },+ {+ type: "new_members",+ kind: "synthetic",+ name: "New members",+ count: 34,+ share: 34,+ },+ {+ type: "returning",+ kind: "synthetic",+ name: "Returning",+ count: 51,+ share: 51,+ },+ { type: "staff", kind: "synthetic", name: "Staff", count: 15, share: 15 },],};- test("renders a bar row with label, fill and share for each bucket", async function (assert) {+ test("renders a bar row with label, fill and share for each row", async function (assert) {await render(<template><WhosPosting@@ -42,6 +55,41 @@ module("Integration | Component | Dashboard | WhosPosting", function (hooks) {.hasText("51%");});+ test("renders a dynamic number of rows, including added groups", async function (assert) {+ const withGroup = {+ total: 120,+ groups: ["new_members", "returning", "staff", "group:5"],+ rows: [+ ...posters.rows,+ {+ type: "group:5",+ kind: "group",+ name: "Support",+ count: 20,+ share: 16.67,+ },+ ],+ };++ await render(+ <template>+ <WhosPosting+ @posters={{withGroup}}+ @startDate={{start}}+ @endDate={{end}}+ />+ </template>+ );++ assert.dom(".db-whos-posting__bar-row").exists({ count: 4 });+ assert+ .dom(".db-whos-posting__bar-row:nth-child(4) .db-whos-posting__bar-label")+ .hasText("Support");+ assert+ .dom(".db-whos-posting__bar-row:nth-child(4) .db-whos-posting__bar-fill")+ .hasClass("--group-0");+ });+test("renders the section header linking to the posters_by_member_type report", async function (assert) {await render(<template>@@ -60,6 +108,20 @@ module("Integration | Component | Dashboard | WhosPosting", function (hooks) {assert.dom(".multiple-categories-selector").exists();});+ test("renders an 'Add group' button", async function (assert) {+ await render(+ <template>+ <WhosPosting+ @posters={{posters}}+ @startDate={{start}}+ @endDate={{end}}+ />+ </template>+ );++ assert.dom(".db-whos-posting__add-group").exists();+ });+test("shows an 'All categories' placeholder when nothing is selected", async function (assert) {await render(<template>@@ -97,7 +159,7 @@ module("Integration | Component | Dashboard | WhosPosting", function (hooks) {});test("falls back to an empty-state message when there are no posts", async function (assert) {- const empty = { total: 0, rows: [] };+ const empty = { total: 0, rows: [], groups: [] };await render(<template>@@ -109,13 +171,26 @@ module("Integration | Component | Dashboard | WhosPosting", function (hooks) {assert.dom(".db-whos-posting__empty").exists();});- test("renders a zero-share bucket with a 0% share", async function (assert) {+ test("renders a zero-share row with a 0% share", async function (assert) {const noStaff = {total: 85,+ groups: ["new_members", "returning", "staff"],rows: [- { type: "new_members", count: 34, share: 40 },- { type: "returning", count: 51, share: 60 },- { type: "staff", count: 0, share: 0 },+ {+ type: "new_members",+ kind: "synthetic",+ name: "New members",+ count: 34,+ share: 40,+ },+ {+ type: "returning",+ kind: "synthetic",+ name: "Returning",+ count: 51,+ share: 60,+ },+ { type: "staff", kind: "synthetic", name: "Staff", count: 0, share: 0 },],};diff --git a/frontend/discourse/tests/integration/components/modal/compare-groups-test.gjs b/frontend/discourse/tests/integration/components/modal/compare-groups-test.gjsnew file mode 100644index 00000000000..953c5f164c4--- /dev/null+++ b/frontend/discourse/tests/integration/components/modal/compare-groups-test.gjs@@ -0,0 +1,193 @@+import { array, hash } from "@ember/helper";+import { click, fillIn, render } from "@ember/test-helpers";+import { module, test } from "qunit";+import CompareGroups from "discourse/admin/components/modal/compare-groups";+import { setupRenderingTest } from "discourse/tests/helpers/component-test";++module("Integration | Component | Modal | compare-groups", function (hooks) {+ setupRenderingTest(hooks);++ hooks.beforeEach(function () {+ this.site.groups = [+ { id: 0, name: "everyone" },+ { id: 1, name: "admins" },+ { id: 2, name: "moderators" },+ { id: 3, name: "staff" },+ { id: 4, name: "anonymous_users" },+ { id: 5, name: "logged_in_users" },+ { id: 10, name: "support", full_name: "Support" },+ { id: 11, name: "beta_testers", full_name: "Beta testers" },+ ];+ });++ const noop = () => {};++ test("pre-selects the given current tokens", async function (assert) {+ await render(+ <template>+ <CompareGroups+ @inline={{true}}+ @model={{hash+ currentTokens=(array "new_members" "returning" "staff")+ }}+ @closeModal={{noop}}+ />+ </template>+ );++ assert+ .dom(".manageable-row-list__counter")+ .hasText("3 of 10 groups selected");+ assert+ .dom("[data-identifier='new_members'].manageable-row-list__row.--enabled")+ .exists();+ assert+ .dom("[data-identifier='returning'].manageable-row-list__row.--enabled")+ .exists();+ assert+ .dom("[data-identifier='staff'].manageable-row-list__row.--enabled")+ .exists();+ });++ test("excludes the everyone/anonymous/logged-in pseudogroups and the real staff auto-group", async function (assert) {+ await render(+ <template>+ <CompareGroups+ @inline={{true}}+ @model={{hash currentTokens=(array "staff")}}+ @closeModal={{noop}}+ />+ </template>+ );++ assert.dom("[data-identifier='group:0']").doesNotExist();+ assert.dom("[data-identifier='group:3']").doesNotExist();+ assert.dom("[data-identifier='group:4']").doesNotExist();+ assert.dom("[data-identifier='group:5']").doesNotExist();+ assert.dom("[data-identifier='group:1']").exists();+ assert.dom("[data-identifier='group:10']").exists();+ });++ test("search filters the disabled rows by title", async function (assert) {+ await render(+ <template>+ <CompareGroups+ @inline={{true}}+ @model={{hash currentTokens=(array "staff")}}+ @closeModal={{noop}}+ />+ </template>+ );++ await fillIn(".compare-groups input", "support");++ assert.dom("[data-identifier='group:10']").exists();+ assert.dom("[data-identifier='group:11']").doesNotExist();+ assert.dom("[data-identifier='staff']").exists();+ });++ test("toggling a row on adds it to the selection, and off removes it", async function (assert) {+ await render(+ <template>+ <CompareGroups+ @inline={{true}}+ @model={{hash currentTokens=(array "staff")}}+ @closeModal={{noop}}+ />+ </template>+ );++ await click("[data-identifier='group:10'] .d-toggle-switch__checkbox");+ assert+ .dom(".manageable-row-list__counter")+ .hasText("2 of 10 groups selected");++ await click("[data-identifier='staff'] .d-toggle-switch__checkbox");+ assert+ .dom(".manageable-row-list__counter")+ .hasText("1 of 10 groups selected");+ });++ test("prevents disabling the last remaining selected row", async function (assert) {+ await render(+ <template>+ <CompareGroups+ @inline={{true}}+ @model={{hash currentTokens=(array "staff")}}+ @closeModal={{noop}}+ />+ </template>+ );++ assert+ .dom("[data-identifier='staff'] .d-toggle-switch__checkbox")+ .isDisabled();+ assert+ .dom(".manageable-row-list__counter")+ .hasText("1 of 10 groups selected");+ assert+ .dom("[data-identifier='staff'].manageable-row-list__row.--enabled")+ .exists();+ });++ test("disables further toggles once the cap of 10 is reached", async function (assert) {+ this.site.groups = Array.from({ length: 12 }, (_, i) => ({+ id: 100 + i,+ name: `group-${i}`,+ }));++ await render(+ <template>+ <CompareGroups+ @inline={{true}}+ @model={{hash+ currentTokens=(array+ "group:100"+ "group:101"+ "group:102"+ "group:103"+ "group:104"+ "group:105"+ "group:106"+ "group:107"+ "group:108"+ "group:109"+ )+ }}+ @closeModal={{noop}}+ />+ </template>+ );++ assert+ .dom(".manageable-row-list__counter")+ .hasText("10 of 10 groups selected");+ assert+ .dom("[data-identifier='group:110'] .d-toggle-switch__checkbox")+ .isDisabled();+ });++ test("apply calls onApply with the ordered selection and closes the modal", async function (assert) {+ let appliedTokens;+ let closed = false;++ const onApply = (tokens) => (appliedTokens = tokens);+ const closeModal = () => (closed = true);++ await render(+ <template>+ <CompareGroups+ @inline={{true}}+ @model={{hash currentTokens=(array "staff") onApply=onApply}}+ @closeModal={{closeModal}}+ />+ </template>+ );++ await click("[data-identifier='group:10'] .d-toggle-switch__checkbox");+ await click(".compare-groups__apply");++ assert.deepEqual(appliedTokens, ["staff", "group:10"]);+ assert.true(closed);+ });+});diff --git a/frontend/discourse/tests/integration/components/reports/posters-by-member-type-report-test.gjs b/frontend/discourse/tests/integration/components/reports/posters-by-member-type-report-test.gjsnew file mode 100644index 00000000000..96ac1213e51--- /dev/null+++ b/frontend/discourse/tests/integration/components/reports/posters-by-member-type-report-test.gjs@@ -0,0 +1,122 @@+import { click, render } from "@ember/test-helpers";+import { module, test } from "qunit";+import PostersByMemberTypeReport from "discourse/admin/components/reports/posters-by-member-type-report";+import { setupRenderingTest } from "discourse/tests/helpers/component-test";++module(+ "Integration | Component | Reports | posters-by-member-type-report",+ function (hooks) {+ setupRenderingTest(hooks);++ const model = {+ total: 25,+ start_date: "2026-04-01T00:00:00Z",+ end_date: "2026-04-30T23:59:59Z",+ available_filters: [+ { id: "category_ids", type: "category_list", default: [] },+ ],+ data: [+ {+ type: "new_members",+ kind: "synthetic",+ name: "New members",+ count: 5,+ share: 20,+ share_formatted: "20%",+ },+ {+ type: "returning",+ kind: "synthetic",+ name: "Returning",+ count: 15,+ share: 60,+ share_formatted: "60%",+ },+ {+ type: "staff",+ kind: "synthetic",+ name: "Staff",+ count: 5,+ share: 20,+ share_formatted: "20%",+ },+ ],+ };++ test("renders a row per group plus a totals row", async function (assert) {+ await render(+ <template><PostersByMemberTypeReport @model={{model}} /></template>+ );++ assert.dom(".posters-by-member-type-report__row").exists({ count: 3 });+ assert.dom(".total-row").exists();+ assert.dom(".total-row + tr td:nth-child(2)").hasText("25");+ });++ test("selects the first group by default", async function (assert) {+ await render(+ <template><PostersByMemberTypeReport @model={{model}} /></template>+ );++ assert+ .dom(".posters-by-member-type-report__row:nth-child(1)")+ .hasClass("--selected");+ assert+ .dom(".posters-by-member-type-report__row:nth-child(2)")+ .doesNotHaveClass("--selected");+ assert.dom(".posters-by-member-type-report__members").exists();+ });++ test("clicking a different row moves the selection", async function (assert) {+ await render(+ <template><PostersByMemberTypeReport @model={{model}} /></template>+ );++ await click(".posters-by-member-type-report__row:nth-child(2)");++ assert+ .dom(".posters-by-member-type-report__row:nth-child(1)")+ .doesNotHaveClass("--selected");+ assert+ .dom(".posters-by-member-type-report__row:nth-child(2)")+ .hasClass("--selected");+ });++ test("shows the selected group's name and a way to deselect it", async function (assert) {+ await render(+ <template><PostersByMemberTypeReport @model={{model}} /></template>+ );++ assert+ .dom(".posters-by-member-type-report__members-name")+ .hasText("New members");+ assert+ .dom(".posters-by-member-type-report__members-stats")+ .doesNotExist("doesn't show a stale count before the drill-down loads");++ await click(".posters-by-member-type-report__row:nth-child(2)");++ assert+ .dom(".posters-by-member-type-report__members-name")+ .hasText("Returning");++ await click(".posters-by-member-type-report__members-close");++ assert.dom(".posters-by-member-type-report__members").doesNotExist();+ assert+ .dom(".posters-by-member-type-report__row.--selected")+ .doesNotExist();+ });++ test("shows no members panel when there are no groups", async function (assert) {+ const empty = { ...model, data: [], total: 0 };++ await render(+ <template><PostersByMemberTypeReport @model={{empty}} /></template>+ );++ assert.dom(".posters-by-member-type-report__row").doesNotExist();+ assert.dom(".posters-by-member-type-report__members").doesNotExist();+ });+ }+);diff --git a/spec/jobs/export_csv_file_spec.rb b/spec/jobs/export_csv_file_spec.rbindex 802d1f21f79..57ea2f204b4 100644--- a/spec/jobs/export_csv_file_spec.rb+++ b/spec/jobs/export_csv_file_spec.rb@@ -274,6 +274,35 @@ RSpec.describe Jobs::ExportCsvFile doexpect(report.second).to contain_exactly("2010-01-03", "1", "")end+ it "threads comma-separated category_ids and groups filters through for posters_by_member_type" do+ target_category = Fabricate(:category)+ other_category = Fabricate(:category)+ group = Fabricate(:group)+ member = Fabricate(:user)+ Fabricate(:group_user, group: group, user: member)+ Fabricate(+ :post,+ user: member,+ topic: Fabricate(:topic, category: target_category),+ created_at: "2010-06-01",+ )+ Fabricate(+ :post,+ user: member,+ topic: Fabricate(:topic, category: other_category),+ created_at: "2010-06-01",+ )++ exporter.extra["name"] = "posters_by_member_type"+ exporter.extra["category_ids"] = target_category.id.to_s+ exporter.extra["groups"] = Report.group_token(group.id)++ report = export_report++ expect(report.first).to contain_exactly("Member type", "Posts", "Share")+ expect(report.second).to contain_exactly(group.name, "1", "100.0%")+ end+it "works with single-column reports with default label" douser.user_visits.create!(visited_at: "2010-01-01", mobile: true)Fabricate(:user).user_visits.create!(visited_at: "2010-01-03", mobile: true)diff --git a/spec/models/concerns/reports/posters_by_member_type_spec.rb b/spec/models/concerns/reports/posters_by_member_type_spec.rbindex 9cb7c864bbe..0ddecc4ce33 100644--- a/spec/models/concerns/reports/posters_by_member_type_spec.rb+++ b/spec/models/concerns/reports/posters_by_member_type_spec.rb@@ -13,15 +13,32 @@ describe Reports::PostersByMemberType do)end+ def build_members(group:, filters: {}, current_user: nil)+ Report.find(+ "posters_by_member_type_members",+ {+ start_date: start_date,+ end_date: end_date,+ filters: filters.merge(group: group),+ current_user: current_user,+ },+ )+ end+def row(report, type)- report.data.find { |r| r[:type] == type }+ report.data.find { |r| r[:type] == type.to_s }+ end++ def group_token(group)+ Report.group_token(group.id)end- it "returns three rows in fixed order: new_members, returning, staff" do+ it "returns three rows in fixed order by default: new_members, returning, staff" doreport = buildtypes = report.data.map { |r| r[:type] }- expect(types).to eq(%i[new_members returning staff])+ expect(types).to eq(%w[new_members returning staff])+ expect(report.data.map { |r| r[:kind] }).to eq(%w[synthetic synthetic synthetic])endit "counts staff posts in the staff bucket regardless of join date" do@@ -165,7 +182,7 @@ describe Reports::PostersByMemberType doexpect(row(report, :returning)[:count]).to eq(1)end- it "returns zero counts when a requested filter resolves to no valid ids" do+ it "returns zero counts when a requested category filter resolves to no valid ids" douser = Fabricate(:user, created_at: start_date - 30.days)topic = Fabricate(:topic, category: Fabricate(:category))Fabricate(:post, user: user, topic: topic, created_at: start_date + 1.day)@@ -209,7 +226,7 @@ describe Reports::PostersByMemberType do)end- it "caps the requested ids at MAX_CATEGORY_IDS" do+ it "caps the requested category ids at MAX_CATEGORY_IDS" docats = Array.new(60) { Fabricate(:category) }report = build(filters: { category_ids: cats.map(&:id).join(",") })@@ -266,4 +283,255 @@ describe Reports::PostersByMemberType doexpect(row(report, :returning)[:count]).to eq(1)endend++ describe "groups" do+ fab!(:admin)++ it "includes a real group's posts alongside the synthetic buckets, in the requested order" do+ group = Fabricate(:group)+ member = Fabricate(:user, created_at: start_date - 30.days)+ Fabricate(:group_user, group: group, user: member)+ Fabricate(:post, user: member, created_at: start_date + 1.day)++ report =+ build(filters: { groups: "staff,#{group_token(group)},new_members" }, current_user: admin)++ expect(report.data.map { |r| r[:type] }).to eq(%W[staff #{group_token(group)} new_members])+ group_row = row(report, group_token(group))+ expect(group_row[:kind]).to eq("group")+ expect(group_row[:name]).to eq(group.name)+ expect(group_row[:count]).to eq(1)+ end++ it "prefers a group's full name over its internal name" do+ group = Fabricate(:group, name: "customer_support", full_name: "Customer support")++ report = build(filters: { groups: group_token(group) }, current_user: admin)++ expect(row(report, group_token(group))[:name]).to eq("Customer support")+ end++ it "allows overlap between a group and a synthetic bucket without shares summing to 100" do+ group = Fabricate(:group)+ member = Fabricate(:user, created_at: start_date - 30.days)+ Fabricate(:group_user, group: group, user: member)+ Fabricate(:post, user: member, created_at: start_date + 1.day)+ Fabricate(+ :post,+ user: Fabricate(:user, created_at: start_date - 30.days),+ created_at: start_date + 1.day,+ )++ report = build(filters: { groups: "returning,#{group_token(group)}" }, current_user: admin)++ returning_row = row(report, :returning)+ group_row = row(report, group_token(group))+ expect(returning_row[:count]).to eq(2)+ expect(group_row[:count]).to eq(1)+ expect(returning_row[:share]).to eq(100.0)+ expect(group_row[:share]).to eq(50.0)+ end++ it "computes the grand total across all posts in the period, independent of which groups are selected" do+ group = Fabricate(:group)+ member = Fabricate(:user, created_at: start_date - 30.days)+ Fabricate(:group_user, group: group, user: member)+ Fabricate(:post, user: member, created_at: start_date + 1.day)+ Fabricate(:post, user: Fabricate(:admin), created_at: start_date + 1.day)++ report = build(filters: { groups: group_token(group) }, current_user: admin)++ expect(report.total).to eq(2)+ expect(row(report, group_token(group))[:count]).to eq(1)+ end++ it "falls back to the default 3 synthetic groups when nothing valid is requested" do+ nonexistent_token = Report.group_token(Group.unscoped.maximum(:id).to_i + 1)++ report = build(filters: { groups: "bogus,#{nonexistent_token}" }, current_user: admin)++ expect(report.data.map { |r| r[:type] }).to eq(%w[new_members returning staff])+ end++ it "drops duplicate and invalid tokens, and caps at MAX_GROUPS" do+ groups = Array.new(12) { Fabricate(:group) }+ tokens = (%w[new_members new_members] + groups.map { |g| group_token(g) }).join(",")++ report = build(filters: { groups: tokens }, current_user: admin)++ expect(report.data.length).to eq(Reports::PostersByMemberType::MAX_GROUPS)+ expect(report.data.map { |r| r[:type] }.uniq.length).to eq(report.data.length)+ end++ it "rejects the real staff automatic group and other reserved auto-groups" do+ staff_group_token = Report.group_token(Group::AUTO_GROUPS[:staff])+ everyone_token = Report.group_token(Group::AUTO_GROUPS[:everyone])++ report =+ build(+ filters: {+ groups: "#{staff_group_token},#{everyone_token},staff",+ },+ current_user: admin,+ )++ expect(report.data.map { |r| r[:type] }).to eq(%w[staff])+ end++ it "drops a group id that doesn't exist" do+ nonexistent_token = Report.group_token(Group.unscoped.maximum(:id).to_i + 1)++ report = build(filters: { groups: "staff,#{nonexistent_token}" }, current_user: admin)++ expect(report.data.map { |r| r[:type] }).to eq(%w[staff])+ end++ it "drops a group the current user (a non-staff moderator scope) cannot see" do+ moderator = Fabricate(:moderator)+ hidden_group = Fabricate(:group, visibility_level: Group.visibility_levels[:staff])++ report =+ build(+ filters: {+ groups: "staff,#{group_token(hidden_group)}",+ },+ current_user: Fabricate(:user),+ )++ expect(report.data.map { |r| r[:type] }).to eq(%w[staff])+ end++ it "drops a group whose members are hidden from the current user, even when the group itself is visible" do+ group = Fabricate(:group, members_visibility_level: Group.visibility_levels[:owners])+ member = Fabricate(:user, created_at: start_date - 30.days)+ Fabricate(:group_user, group: group, user: member)+ Fabricate(:post, user: member, created_at: start_date + 1.day)++ report =+ build(filters: { groups: "staff,#{group_token(group)}" }, current_user: Fabricate(:user))++ expect(report.data.map { |r| r[:type] }).to eq(%w[staff])+ end++ it "counts every requested group's posts in a single grouped query, not one query per group" do+ groups = Array.new(5) { Fabricate(:group) }+ groups.each do |group|+ member = Fabricate(:user, created_at: start_date - 30.days)+ Fabricate(:group_user, group: group, user: member)+ Fabricate(:post, user: member, created_at: start_date + 1.day)+ end+ tokens = groups.map { |g| group_token(g) }.join(",")++ queries = track_sql_queries { build(filters: { groups: tokens }, current_user: admin) }+ group_scan_queries = queries.select { |sql| sql.include?("group_users") }++ expect(group_scan_queries.length).to eq(1)+ end+ end++ describe ".report_posters_by_member_type_members" do+ fab!(:admin)++ it "returns per-user rows for a synthetic bucket, ordered by count desc" do+ top_poster = Fabricate(:user, created_at: start_date - 30.days, username: "topposter")+ other_poster = Fabricate(:user, created_at: start_date - 30.days, username: "otherposter")+ 2.times { |i| Fabricate(:post, user: top_poster, created_at: start_date + i.days) }+ Fabricate(:post, user: other_poster, created_at: start_date + 1.day)++ report = build_members(group: "returning", current_user: admin)++ expect(report.error).to be_nil+ expect(report.total).to eq(3)+ expect(report.data.map { |r| r[:username] }).to eq(%w[topposter otherposter])+ expect(report.data.first[:count]).to eq(2)+ expect(report.data.first[:share]).to eq(66.67)+ end++ it "computes the share denominator from every poster, not just the displayed rows" do+ stub_const(Reports::PostersByMemberType, :MAX_MEMBER_ROWS, 2) do+ posters = Array.new(3) { Fabricate(:user, created_at: start_date - 30.days) }+ posters.each { |user| Fabricate(:post, user: user, created_at: start_date + 1.day) }++ report = build_members(group: "returning", current_user: admin)++ expect(report.data.length).to eq(2)+ expect(report.total).to eq(3)+ expect(report.data.sum { |r| r[:share] }).to be < 100+ end+ end++ it "returns per-user rows for a real group, scoped to that group's members only" do+ group = Fabricate(:group)+ member = Fabricate(:user, created_at: start_date - 30.days)+ non_member = Fabricate(:user, created_at: start_date - 30.days)+ Fabricate(:group_user, group: group, user: member)+ Fabricate(:post, user: member, created_at: start_date + 1.day)+ Fabricate(:post, user: non_member, created_at: start_date + 1.day)++ report = build_members(group: group_token(group), current_user: admin)++ expect(report.data.map { |r| r[:user_id] }).to eq([member.id])+ expect(report.total).to eq(1)+ end++ it "returns :not_found for an unparseable group token" do+ report = build_members(group: "not-a-real-token", current_user: admin)++ expect(report.error).to eq(:not_found)+ end++ it "returns :not_found when the guardian cannot see the group's members" do+ private_group = Fabricate(:group, members_visibility_level: Group.visibility_levels[:owners])+ member = Fabricate(:user, created_at: start_date - 30.days)+ Fabricate(:group_user, group: private_group, user: member)+ Fabricate(:post, user: member, created_at: start_date + 1.day)++ report = build_members(group: group_token(private_group), current_user: Fabricate(:user))++ expect(report.error).to eq(:not_found)+ end++ it "lets a staff user see members of a staff-visible group" do+ staff_visible_group =+ Fabricate(:group, members_visibility_level: Group.visibility_levels[:staff])+ member = Fabricate(:user, created_at: start_date - 30.days)+ Fabricate(:group_user, group: staff_visible_group, user: member)+ Fabricate(:post, user: member, created_at: start_date + 1.day)++ report =+ build_members(group: group_token(staff_visible_group), current_user: Fabricate(:moderator))++ expect(report.error).to be_nil+ expect(report.data.map { |r| r[:user_id] }).to eq([member.id])+ end++ it "respects the category filter" do+ target_category = Fabricate(:category)+ other_category = Fabricate(:category)+ user = Fabricate(:user, created_at: start_date - 30.days)+ Fabricate(+ :post,+ user: user,+ topic: Fabricate(:topic, category: target_category),+ created_at: start_date + 1.day,+ )+ Fabricate(+ :post,+ user: user,+ topic: Fabricate(:topic, category: other_category),+ created_at: start_date + 1.day,+ )++ report =+ build_members(+ group: "returning",+ filters: {+ category_ids: [target_category.id],+ },+ current_user: admin,+ )++ expect(report.total).to eq(1)+ end+ endenddiff --git a/spec/queries/reports/list_query_spec.rb b/spec/queries/reports/list_query_spec.rbindex 6a4a29565ef..a4904532060 100644--- a/spec/queries/reports/list_query_spec.rb+++ b/spec/queries/reports/list_query_spec.rb@@ -105,6 +105,11 @@ RSpec.describe Reports::ListQuery doexpect(report_types).not_to include(*Report::LEGACY_REPORTS)end+ it "excludes internal reports meant only to be fetched by another report's UI" do+ report_types = result.map { |r| r[:type] }+ expect(report_types).not_to include(*Report::INTERNAL_REPORT_TYPES)+ end+it "does not include plugin name for core reports" dotopics_report = result.find { |r| r[:type] == "topics" }expect(topics_report[:plugin]).to be_nildiff --git a/spec/requests/admin/reports_controller_spec.rb b/spec/requests/admin/reports_controller_spec.rbindex d42522da030..b9f4c0bd2ac 100644--- a/spec/requests/admin/reports_controller_spec.rb+++ b/spec/requests/admin/reports_controller_spec.rb@@ -438,6 +438,37 @@ RSpec.describe Admin::ReportsController doexpect(report["data"].count).to eq(1)endend++ describe "posters_by_member_type_members (internal drill-down report)" do+ it "is excluded from the reports catalog but still fetchable directly" do+ get "/admin/reports.json"+ expect(response.parsed_body["reports"].map { |r| r["type"] }).not_to include(+ "posters_by_member_type_members",+ )++ get "/admin/reports/posters_by_member_type_members.json",+ params: {+ filters: {+ group: "staff",+ },+ }++ expect(response.status).to eq(200)+ expect(response.parsed_body["report"]["type"]).to eq("posters_by_member_type_members")+ end++ it "returns a not_found error for an unparseable group token" do+ get "/admin/reports/posters_by_member_type_members.json",+ params: {+ filters: {+ group: "not-a-real-token",+ },+ }++ expect(response.status).to eq(200)+ expect(response.parsed_body["report"]["error"]).to eq("not_found")+ end+ endendcontext "when logged in as a moderator" dodiff --git a/spec/requests/export_csv_controller_spec.rb b/spec/requests/export_csv_controller_spec.rbindex a32a6874ff6..22cf1a186aa 100644--- a/spec/requests/export_csv_controller_spec.rb+++ b/spec/requests/export_csv_controller_spec.rb@@ -168,7 +168,36 @@ RSpec.describe ExportCsvController doendit "fails requests where the name arg is too long" do- post "/export_csv/export_entity.json", params: { entity: "foo", args: { name: "x" * 200 } }+ post "/export_csv/export_entity.json", params: { entity: "foo", args: { name: "x" * 300 } }+ expect(response.status).to eq(400)+ end++ it "accepts comma-separated filter args like category_ids and groups" do+ post "/export_csv/export_entity.json",+ params: {+ entity: "report",+ args: {+ name: "posters_by_member_type",+ category_ids: "1,2",+ groups: "new_members,staff",+ },+ }+ expect(response.status).to eq(200)++ job_data = Jobs::ExportCsvFile.jobs.last["args"].first+ expect(job_data["args"]["category_ids"]).to eq("1,2")+ expect(job_data["args"]["groups"]).to eq("new_members,staff")+ end++ it "fails requests where a filter arg is too long" do+ post "/export_csv/export_entity.json",+ params: {+ entity: "report",+ args: {+ name: "posters_by_member_type",+ groups: "x" * 300,+ },+ }expect(response.status).to eq(400)endenddiff --git a/spec/services/admin_dashboard_engagement_spec.rb b/spec/services/admin_dashboard_engagement_spec.rbindex db06c62c410..05fd01cb615 100644--- a/spec/services/admin_dashboard_engagement_spec.rb+++ b/spec/services/admin_dashboard_engagement_spec.rb@@ -112,12 +112,86 @@ describe AdminDashboardEngagement doenddescribe "posters" do- it "includes the posters block with rows and total" do+ it "includes the posters block with rows, total, and the default groups selection" doresult = 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[:rows].map { |r| r[:type] }).to eq(%w[new_members returning staff])expect(posters).to have_key(:total)+ expect(posters[:groups]).to eq(%w[new_members returning staff])+ end++ it "includes a persisted group, and omits it for a viewer who can't see the group" do+ group = Fabricate(:group, visibility_level: Group.visibility_levels[:staff])++ AdminDashboardSectionConfiguration.update_setting(+ section_id: "engagement",+ key: "whos_posting",+ attrs: {+ category_ids: [],+ groups: ["staff", Report.group_token(group.id)],+ },+ )++ admin_result =+ described_class.build(+ start_date: "2026-04-01",+ end_date: "2026-04-28",+ current_user: Fabricate(:admin),+ )+ expect(admin_result[:posters][:groups]).to eq(["staff", Report.group_token(group.id)])++ regular_user_result =+ described_class.build(+ start_date: "2026-04-01",+ end_date: "2026-04-28",+ current_user: Fabricate(:user),+ )+ expect(regular_user_result[:posters][:groups]).to eq(["staff"])+ end++ it "omits a persisted group whose members are hidden, even when the group itself is visible" do+ group = Fabricate(:group, members_visibility_level: Group.visibility_levels[:owners])++ AdminDashboardSectionConfiguration.update_setting(+ section_id: "engagement",+ key: "whos_posting",+ attrs: {+ category_ids: [],+ groups: ["staff", Report.group_token(group.id)],+ },+ )++ result =+ described_class.build(+ start_date: "2026-04-01",+ end_date: "2026-04-28",+ current_user: Fabricate(:user),+ )++ expect(result[:posters][:groups]).to eq(["staff"])+ end++ it "falls back to the default groups when every persisted group becomes invisible" do+ group = Fabricate(:group, visibility_level: Group.visibility_levels[:staff])++ AdminDashboardSectionConfiguration.update_setting(+ section_id: "engagement",+ key: "whos_posting",+ attrs: {+ category_ids: [],+ groups: [Report.group_token(group.id)],+ },+ )++ result =+ described_class.build(+ start_date: "2026-04-01",+ end_date: "2026-04-28",+ current_user: Fabricate(:user),+ )++ expect(result[:posters][:groups]).to eq(%w[new_members returning staff])endit "honours category visibility when current_user is a moderator" dodiff --git a/spec/services/admin_dashboard_section_configuration_spec.rb b/spec/services/admin_dashboard_section_configuration_spec.rbindex 4a51df61f6f..fd00c6c5f7b 100644--- a/spec/services/admin_dashboard_section_configuration_spec.rb+++ b/spec/services/admin_dashboard_section_configuration_spec.rb@@ -316,6 +316,137 @@ describe AdminDashboardSectionConfiguration do}.to raise_error(Discourse::InvalidParameters)end+ it "persists groups alongside category_ids for whos_posting" do+ group = Fabricate(:group)++ described_class.update_setting(+ section_id: "engagement",+ key: "whos_posting",+ attrs: {+ category_ids: [category.id],+ groups: ["staff", "returning", Report.group_token(group.id)],+ },+ )++ expect(described_class.settings_for("engagement")).to eq(+ {+ "whos_posting" => {+ "category_ids" => [category.id],+ "groups" => ["staff", "returning", Report.group_token(group.id)],+ },+ },+ )+ end++ it "preserves the previously persisted groups when a later update omits the key" do+ group = Fabricate(:group)++ described_class.update_setting(+ section_id: "engagement",+ key: "whos_posting",+ attrs: {+ category_ids: [],+ groups: [Report.group_token(group.id)],+ },+ )++ described_class.update_setting(+ section_id: "engagement",+ key: "whos_posting",+ attrs: {+ category_ids: [category.id],+ },+ )++ expect(described_class.settings_for("engagement")["whos_posting"]).to eq(+ { "category_ids" => [category.id], "groups" => [Report.group_token(group.id)] },+ )+ end++ it "raises when groups is not an array" do+ expect {+ described_class.update_setting(+ section_id: "engagement",+ key: "whos_posting",+ attrs: {+ category_ids: [],+ groups: "staff",+ },+ )+ }.to raise_error(Discourse::InvalidParameters)+ end++ it "raises when groups is empty" do+ expect {+ described_class.update_setting(+ section_id: "engagement",+ key: "whos_posting",+ attrs: {+ category_ids: [],+ groups: [],+ },+ )+ }.to raise_error(Discourse::InvalidParameters)+ end++ it "raises when groups has more than WHOS_POSTING_GROUPS_MAX tokens" do+ groups = Array.new(11) { Fabricate(:group) }++ expect {+ described_class.update_setting(+ section_id: "engagement",+ key: "whos_posting",+ attrs: {+ category_ids: [],+ groups: groups.map { |g| Report.group_token(g.id) },+ },+ )+ }.to raise_error(Discourse::InvalidParameters)+ end++ it "raises when groups contains duplicate tokens" do+ expect {+ described_class.update_setting(+ section_id: "engagement",+ key: "whos_posting",+ attrs: {+ category_ids: [],+ groups: %w[staff staff],+ },+ )+ }.to raise_error(Discourse::InvalidParameters)+ end++ it "raises when groups references a nonexistent group" do+ nonexistent_token = Report.group_token(Group.unscoped.maximum(:id).to_i + 1)++ expect {+ described_class.update_setting(+ section_id: "engagement",+ key: "whos_posting",+ attrs: {+ category_ids: [],+ groups: [nonexistent_token],+ },+ )+ }.to raise_error(Discourse::InvalidParameters)+ end++ it "raises when groups references the real staff automatic group" do+ staff_token = Report.group_token(Group::AUTO_GROUPS[:staff])++ expect {+ described_class.update_setting(+ section_id: "engagement",+ key: "whos_posting",+ attrs: {+ category_ids: [],+ groups: [staff_token],+ },+ )+ }.to raise_error(Discourse::InvalidParameters)+ end+it "raises when a category with the given id does not exist" doexpect {described_class.update_setting(diff --git a/spec/system/admin_dashboard_redesign/engagement_section_spec.rb b/spec/system/admin_dashboard_redesign/engagement_section_spec.rbindex 60c13afbad4..2fad03d7185 100644--- a/spec/system/admin_dashboard_redesign/engagement_section_spec.rb+++ b/spec/system/admin_dashboard_redesign/engagement_section_spec.rb@@ -116,6 +116,48 @@ describe "Admin Dashboard Redesign | Engagement section" doexpect(engagement).to have_no_selected_whos_posting_category(category_alpha)end+ it "adds a group via the Compare groups modal and persists it across a refresh",+ time: Time.zone.local(2026, 6, 15, 12, 0, 0) do+ support_group = Fabricate(:group, name: "support")+ poster = Fabricate(:user, created_at: "2026-05-01")+ Fabricate(:group_user, group: support_group, user: poster)+ Fabricate(:post, user: poster, created_at: "2026-06-12")++ dashboard.visit+ expect(dashboard).to have_section("engagement")+ expect(engagement).to have_no_whos_posting_bar("support")++ engagement.open_compare_groups_modal+ engagement.toggle_compare_groups_row("group:#{support_group.id}")+ engagement.apply_compare_groups++ expect(engagement).to have_whos_posting_bar("support")++ dashboard.visit++ expect(engagement).to have_whos_posting_bar("support")+ end++ it "does not persist a moderator's group selection",+ time: Time.zone.local(2026, 6, 15, 12, 0, 0) do+ support_group = Fabricate(:group, name: "support")+ poster = Fabricate(:user, created_at: "2026-05-01")+ Fabricate(:group_user, group: support_group, user: poster)+ Fabricate(:post, user: poster, created_at: "2026-06-12")+ sign_in(moderator)++ dashboard.visit+ engagement.open_compare_groups_modal+ engagement.toggle_compare_groups_row("group:#{support_group.id}")+ engagement.apply_compare_groups++ expect(engagement).to have_whos_posting_bar("support")++ dashboard.visit++ expect(engagement).to have_no_whos_posting_bar("support")+ end+it "shows that engagement is up when every engagement metric improves",time: Time.zone.local(2026, 6, 15, 12, 0, 0) doFabricate(:user_visit_daily_rollup, date: Date.new(2026, 5, 1), dau: 1, mau: 2)diff --git a/spec/system/admin_dashboard_redesign/reports_section_spec.rb b/spec/system/admin_dashboard_redesign/reports_section_spec.rbindex c62431b20f3..d714bc8535c 100644--- a/spec/system/admin_dashboard_redesign/reports_section_spec.rb+++ b/spec/system/admin_dashboard_redesign/reports_section_spec.rb@@ -4,7 +4,12 @@ describe "Admin Dashboard Redesign | Reports section" dofab!(:current_user, :admin)let(:dashboard) { PageObjects::Pages::AdminDashboardReports.new }- let(:modal) { PageObjects::Components::ManageReportsModal.new }+ let(:modal) do+ PageObjects::Components::ManageableRowListModal.new(+ ".manage-reports",+ "admin_js.admin.dashboard.reports_section.modal.counter",+ )+ endbefore doSiteSetting.dashboard_improvements = truediff --git a/spec/system/page_objects/components/admin_dashboard_engagement.rb b/spec/system/page_objects/components/admin_dashboard_engagement.rbindex ec5bef9c88c..bfc812be851 100644--- a/spec/system/page_objects/components/admin_dashboard_engagement.rb+++ b/spec/system/page_objects/components/admin_dashboard_engagement.rb@@ -7,6 +7,8 @@ module PageObjectsACTIVITY_CATEGORY_FILTER = "#{SECTION} .db-activity .multiple-categories-selector"WHOS_POSTING_CATEGORY_FILTER = "#{SECTION} .db-whos-posting .multiple-categories-selector"ACTIVITY_CATEGORY_CELL = "#{SECTION} .db-activity-table__cell-category"+ ADD_GROUP_BUTTON = "#{SECTION} .db-whos-posting__add-group"+ WHOS_POSTING_BAR_LABEL = "#{SECTION} .db-whos-posting__bar-label"def activity_category_filterPageObjects::Components::SelectKit.new(ACTIVITY_CATEGORY_FILTER)@@ -69,6 +71,39 @@ module PageObjectshas_no_css?("#{WHOS_POSTING_CATEGORY_FILTER} .selected-choice[data-value='#{category.id}']")end+ def compare_groups_modal+ @compare_groups_modal ||=+ PageObjects::Components::ManageableRowListModal.new(+ ".compare-groups",+ "admin_js.admin.dashboard.sections.engagement.whos_posting.modal.counter",+ )+ end++ def open_compare_groups_modal+ find(ADD_GROUP_BUTTON).click+ compare_groups_modal.has_open?+ self+ end++ def toggle_compare_groups_row(identifier)+ compare_groups_modal.toggle(identifier)+ self+ end++ def apply_compare_groups+ compare_groups_modal.apply+ compare_groups_modal.has_closed?+ self+ end++ def has_whos_posting_bar?(name)+ has_css?(WHOS_POSTING_BAR_LABEL, text: name)+ end++ def has_no_whos_posting_bar?(name)+ has_no_css?(WHOS_POSTING_BAR_LABEL, text: name)+ end+def has_headline?(title, summary)has_css?("#{SECTION} .db-section__subintro h3", exact_text: title) &&has_css?("#{SECTION} .db-section__subintro p", exact_text: summary)diff --git a/spec/system/page_objects/components/manage_reports_modal.rb b/spec/system/page_objects/components/manage_reports_modal.rbdeleted file mode 100644index eeb0dcde939..00000000000--- a/spec/system/page_objects/components/manage_reports_modal.rb+++ /dev/null@@ -1,106 +0,0 @@-# frozen_string_literal: true--module PageObjects- module Components- class ManageReportsModal < PageObjects::Components::Base- MODAL = ".manage-reports"- ROW = ".manage-reports__row"- ENABLED_ROW = ".manage-reports__row.--enabled"-- def has_open?- has_css?(MODAL)- end-- def has_closed?- has_no_css?(MODAL)- end-- def search(query)- find("#{MODAL} .manage-reports__search-wrapper .filter-input").set(query)- self- end-- def enabled_identifiers- all("#{MODAL} #{ENABLED_ROW}").map { |el| el["data-identifier"] }- end-- def has_all_row?(identifier)- has_css?("#{MODAL} #{ROW}[data-identifier='#{identifier}']")- end-- def has_no_all_row?(identifier)- has_no_css?("#{MODAL} #{ROW}[data-identifier='#{identifier}']")- end-- def toggle(identifier)- toggle_for(identifier).toggle- self- end-- def has_toggle_on?(identifier)- has_css?("#{MODAL} #{ENABLED_ROW}[data-identifier='#{identifier}']")- end-- def has_toggle_off?(identifier)- has_css?("#{MODAL} #{ROW}[data-identifier='#{identifier}']") &&- has_no_css?("#{MODAL} #{ENABLED_ROW}[data-identifier='#{identifier}']")- end-- def toggle_for(identifier)- PageObjects::Components::DToggleSwitch.new(- "#{MODAL} #{ROW}[data-identifier='#{identifier}'] .d-toggle-switch__checkbox",- )- end-- def apply- within(MODAL) { find(".manage-reports__apply").click }- self- end-- def close- find("#{MODAL} .d-modal__header .modal-close").click- self- end-- def has_disabled_move_up?(identifier)- has_css?(- "#{MODAL} #{ROW}[data-identifier='#{identifier}'] button.manage-reports__arrow[disabled] .d-icon-arrow-up",- )- end-- def has_disabled_move_down?(identifier)- has_css?(- "#{MODAL} #{ROW}[data-identifier='#{identifier}'] button.manage-reports__arrow[disabled] .d-icon-arrow-down",- )- end-- def has_enabled_move_up?(identifier)- has_css?(- "#{MODAL} #{ROW}[data-identifier='#{identifier}'] button.manage-reports__arrow:not([disabled]) .d-icon-arrow-up",- )- end-- def has_enabled_move_down?(identifier)- has_css?(- "#{MODAL} #{ROW}[data-identifier='#{identifier}'] button.manage-reports__arrow:not([disabled]) .d-icon-arrow-down",- )- end-- def has_drag_controls?- has_css?("#{MODAL} .manage-reports__list.--reorderable")- end-- def has_no_drag_controls?- has_css?("#{MODAL} .manage-reports__list") &&- has_no_css?("#{MODAL} .manage-reports__list.--reorderable")- end-- def has_counter?(count, max)- has_css?(- "#{MODAL} .manage-reports__counter",- text: I18n.t("admin_js.admin.dashboard.reports_section.modal.counter", count:, max:),- )- end- end- end-enddiff --git a/spec/system/page_objects/components/manageable_row_list_modal.rb b/spec/system/page_objects/components/manageable_row_list_modal.rbnew file mode 100644index 00000000000..c21b062cdb8--- /dev/null+++ b/spec/system/page_objects/components/manageable_row_list_modal.rb@@ -0,0 +1,111 @@+# frozen_string_literal: true++module PageObjects+ module Components+ class ManageableRowListModal < PageObjects::Components::Base+ ROW = ".manageable-row-list__row"+ ENABLED_ROW = ".manageable-row-list__row.--enabled"++ def initialize(modal_selector, counter_i18n_key)+ super()+ @modal = modal_selector+ @counter_i18n_key = counter_i18n_key+ end++ def has_open?+ has_css?(@modal)+ end++ def has_closed?+ has_no_css?(@modal)+ end++ def search(query)+ find("#{@modal} .manageable-row-list__search-wrapper .filter-input").set(query)+ self+ end++ def enabled_identifiers+ all("#{@modal} #{ENABLED_ROW}").map { |el| el["data-identifier"] }+ end++ def has_all_row?(identifier)+ has_css?("#{@modal} #{ROW}[data-identifier='#{identifier}']")+ end++ def has_no_all_row?(identifier)+ has_no_css?("#{@modal} #{ROW}[data-identifier='#{identifier}']")+ end++ def toggle(identifier)+ toggle_for(identifier).toggle+ self+ end++ def has_toggle_on?(identifier)+ has_css?("#{@modal} #{ENABLED_ROW}[data-identifier='#{identifier}']")+ end++ def has_toggle_off?(identifier)+ has_css?("#{@modal} #{ROW}[data-identifier='#{identifier}']") &&+ has_no_css?("#{@modal} #{ENABLED_ROW}[data-identifier='#{identifier}']")+ end++ def toggle_for(identifier)+ PageObjects::Components::DToggleSwitch.new(+ "#{@modal} #{ROW}[data-identifier='#{identifier}'] .d-toggle-switch__checkbox",+ )+ end++ def apply+ within(@modal) { find("#{@modal}__apply").click }+ self+ end++ def close+ find("#{@modal} .d-modal__header .modal-close").click+ self+ end++ def has_disabled_move_up?(identifier)+ has_css?(+ "#{@modal} #{ROW}[data-identifier='#{identifier}'] button.manageable-row-list__arrow[disabled] .d-icon-arrow-up",+ )+ end++ def has_disabled_move_down?(identifier)+ has_css?(+ "#{@modal} #{ROW}[data-identifier='#{identifier}'] button.manageable-row-list__arrow[disabled] .d-icon-arrow-down",+ )+ end++ def has_enabled_move_up?(identifier)+ has_css?(+ "#{@modal} #{ROW}[data-identifier='#{identifier}'] button.manageable-row-list__arrow:not([disabled]) .d-icon-arrow-up",+ )+ end++ def has_enabled_move_down?(identifier)+ has_css?(+ "#{@modal} #{ROW}[data-identifier='#{identifier}'] button.manageable-row-list__arrow:not([disabled]) .d-icon-arrow-down",+ )+ end++ def has_drag_controls?+ has_css?("#{@modal} .manageable-row-list__list.--reorderable")+ end++ def has_no_drag_controls?+ has_css?("#{@modal} .manageable-row-list__list") &&+ has_no_css?("#{@modal} .manageable-row-list__list.--reorderable")+ end++ def has_counter?(count, max)+ has_css?(+ "#{@modal} .manageable-row-list__counter",+ text: I18n.t(@counter_i18n_key, count:, max:),+ )+ end+ end+ end+enddiff --git a/spec/system/page_objects/pages/admin_dashboard_reports.rb b/spec/system/page_objects/pages/admin_dashboard_reports.rbindex ce238982e54..16091126cdf 100644--- a/spec/system/page_objects/pages/admin_dashboard_reports.rb+++ b/spec/system/page_objects/pages/admin_dashboard_reports.rb@@ -65,7 +65,10 @@ module PageObjectsenddef manage_reports_modal- PageObjects::Components::ManageReportsModal.new+ PageObjects::Components::ManageableRowListModal.new(+ ".manage-reports",+ "admin_js.admin.dashboard.reports_section.modal.counter",+ )enddef has_label_for?(identifier, label)