A platform for community discussion. Free, open, simple.
UX: show parent category alongside sub-categories in the admin dashboard (#43740)
Osama Sayegh716f5eb20e72
diff --git a/app/assets/stylesheets/common/select-kit/category-selector.scss b/app/assets/stylesheets/common/select-kit/category-selector.scssindex 13c30630495..bef67daf30c 100644--- a/app/assets/stylesheets/common/select-kit/category-selector.scss+++ b/app/assets/stylesheets/common/select-kit/category-selector.scss@@ -24,10 +24,14 @@margin: 0;}+ .badge-category__wrapper + .badge-category__wrapper {+ margin-inline-start: var(--space-1);+ }+&:hover,&:focus {.badge-category {- color: var(--secondary);+ color: var(--d-button-default-text-color--hover);}}}diff --git a/frontend/discourse/admin/components/dashboard/engagement/activity-by-category.gjs b/frontend/discourse/admin/components/dashboard/engagement/activity-by-category.gjsindex f7d40a502e5..962b53c37da 100644--- a/frontend/discourse/admin/components/dashboard/engagement/activity-by-category.gjs+++ b/frontend/discourse/admin/components/dashboard/engagement/activity-by-category.gjs@@ -205,7 +205,10 @@ export default class ActivityByCategory extends Component {<MultipleCategoriesSelector@categories={{this.selectedCategories}}@onChange={{this.onCategoriesChange}}- @options={{hash maximum=MAX_CATEGORIES}}+ @options={{hash+ maximum=MAX_CATEGORIES+ showAncestorsInSelectedChoice=true+ }}/></div>@@ -336,7 +339,11 @@ export default class ActivityByCategory extends Component {<tr><td class="db-activity-table__cell-category">{{#if row.category}}- {{dCategoryBadge row.category}}+ {{dCategoryBadge+ row.category+ ancestors=row.category.predecessors+ hideParent=true+ }}{{else}}<spanaria-hidden="true"diff --git a/frontend/discourse/admin/components/dashboard/engagement/whos-posting.gjs b/frontend/discourse/admin/components/dashboard/engagement/whos-posting.gjsindex ec2b9401b53..f243db5f679 100644--- a/frontend/discourse/admin/components/dashboard/engagement/whos-posting.gjs+++ b/frontend/discourse/admin/components/dashboard/engagement/whos-posting.gjs@@ -236,7 +236,11 @@ export default class WhosPosting extends Component {@categories={{this.selectedCategories}}@onChange={{this.onCategoriesChange}}@onClose={{this.onCategoriesClose}}- @options={{hash maximum=MAX_CATEGORIES none="category.all"}}+ @options={{hash+ maximum=MAX_CATEGORIES+ none="category.all"+ showAncestorsInSelectedChoice=true+ }}/></div></div>diff --git a/frontend/discourse/app/ui-kit/helpers/d-category-badge.js b/frontend/discourse/app/ui-kit/helpers/d-category-badge.jsindex 28808784f61..5ed46f9e17a 100644--- a/frontend/discourse/app/ui-kit/helpers/d-category-badge.js+++ b/frontend/discourse/app/ui-kit/helpers/d-category-badge.js@@ -4,6 +4,7 @@ import { categoryLinkHTML } from "discourse/ui-kit/helpers/d-category-link";export default function dCategoryBadge(cat, options = {}) {return categoryLinkHTML(cat, {hideParent: options.hideParent,+ ancestors: options.ancestors,allowUncategorized: options.allowUncategorized,categoryStyle: options.categoryStyle,styleType: options.styleType,diff --git a/frontend/discourse/select-kit/components/multiple-categories-selector.js b/frontend/discourse/select-kit/components/multiple-categories-selector.jsindex 90f891af408..9c231861f97 100644--- a/frontend/discourse/select-kit/components/multiple-categories-selector.js+++ b/frontend/discourse/select-kit/components/multiple-categories-selector.js@@ -24,6 +24,7 @@ export const LIMITED_RESULTS_NOTICE_VALUE =allowUncategorized: true,displayCategoryDescription: false,selectedChoiceComponent: SelectedChoiceCategory,+ showAncestorsInSelectedChoice: false,})@pluginApiIdentifiers(["multiple-categories-selector"])export default class MultipleCategoriesSelector extends MultiSelectComponent {diff --git a/frontend/discourse/select-kit/components/selected-choice-category.gjs b/frontend/discourse/select-kit/components/selected-choice-category.gjsindex 01afd87f704..b2e5a9ca92b 100644--- a/frontend/discourse/select-kit/components/selected-choice-category.gjs+++ b/frontend/discourse/select-kit/components/selected-choice-category.gjs@@ -10,12 +10,14 @@ export default class SelectedChoiceCategory extends SelectedChoiceComponent {@computed("item")get badge() {- return trustHTML(- categoryBadgeHTML(this.item, {- allowUncategorized: true,- link: false,- })- );+ const options = { allowUncategorized: true, link: false };++ if (this.selectKit.options.showAncestorsInSelectedChoice) {+ options.ancestors = this.item.predecessors;+ options.hideParent = true;+ }++ return trustHTML(categoryBadgeHTML(this.item, options));}<template>diff --git a/frontend/discourse/tests/integration/components/select-kit/multiple-categories-selector-test.gjs b/frontend/discourse/tests/integration/components/select-kit/multiple-categories-selector-test.gjsindex 54662a27118..56bd13bc11a 100644--- a/frontend/discourse/tests/integration/components/select-kit/multiple-categories-selector-test.gjs+++ b/frontend/discourse/tests/integration/components/select-kit/multiple-categories-selector-test.gjs@@ -1,4 +1,5 @@-import { render } from "@ember/test-helpers";+import { hash } from "@ember/helper";+import { findAll, render } from "@ember/test-helpers";import { module, test } from "qunit";import Category from "discourse/models/category";import Site from "discourse/models/site";@@ -42,6 +43,44 @@ module();});+ test("selected choices show only the category's own badge by default", async function (assert) {+ const value = [Category.findById(1002)];++ await render(+ <template>+ <MultipleCategoriesSelector @categories={{value}} />+ </template>+ );+ await this.subject.expand();++ assert+ .dom(".selected-choice-category .badge-category__name")+ .exists({ count: 1 }, "no ancestor badge is added to the chip")+ .hasText("Sub Category", "the chip shows the selected category");+ });++ test("selected choices include ancestor badges when showAncestorsInSelectedChoice is set", async function (assert) {+ const value = [Category.findById(1002)];++ await render(+ <template>+ <MultipleCategoriesSelector+ @categories={{value}}+ @options={{hash showAncestorsInSelectedChoice=true}}+ />+ </template>+ );+ await this.subject.expand();++ assert.deepEqual(+ findAll(".selected-choice-category .badge-category__name").map((el) =>+ el.textContent.trim()+ ),+ ["Parent Category", "Sub Category"],+ "the parent badge precedes the sub-category badge in the chip"+ );+ });+test("has +subcategories row", async function (assert) {const value = [];diff --git a/frontend/discourse/tests/integration/ui-kit/helpers/d-category-badge-test.gjs b/frontend/discourse/tests/integration/ui-kit/helpers/d-category-badge-test.gjsindex 929ac72c296..24f3ac8abda 100644--- a/frontend/discourse/tests/integration/ui-kit/helpers/d-category-badge-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/helpers/d-category-badge-test.gjs@@ -1,4 +1,4 @@-import { render } from "@ember/test-helpers";+import { findAll, render } from "@ember/test-helpers";import { module, test } from "qunit";import Category from "discourse/models/category";import { setupRenderingTest } from "discourse/tests/helpers/component-test";@@ -26,4 +26,25 @@ module("Integration | ui-kit | Helper | dCategoryBadge", function (hooks) {).exists();});++ test("options.ancestors", async function (assert) {+ const parent = Category.findById(1001);+ const subcategory = Category.findById(1002);+ const ancestors = subcategory.predecessors;++ await render(+ <template>+ {{dCategoryBadge subcategory ancestors=ancestors hideParent=true}}+ </template>+ );++ assert+ .dom(".badge-category__wrapper")+ .exists({ count: 2 }, "renders one badge per category in the chain");+ assert.deepEqual(+ findAll(".badge-category__name").map((el) => el.textContent.trim()),+ [parent.displayName, subcategory.displayName],+ "the parent badge precedes the sub-category badge"+ );+ });});diff --git a/plugins/discourse-solved/admin/assets/javascripts/admin/components/dashboard/support.gjs b/plugins/discourse-solved/admin/assets/javascripts/admin/components/dashboard/support.gjsindex eb0740363fa..2a62f6f5a2d 100644--- a/plugins/discourse-solved/admin/assets/javascripts/admin/components/dashboard/support.gjs+++ b/plugins/discourse-solved/admin/assets/javascripts/admin/components/dashboard/support.gjs@@ -414,7 +414,11 @@ export default class SupportSection extends Component {@categories={{this.selectedCategories}}@onChange={{this.onCategoriesChange}}@onClose={{this.onClose}}- @options={{hash maximum=MAX_CATEGORIES none="category.all"}}+ @options={{hash+ maximum=MAX_CATEGORIES+ none="category.all"+ showAncestorsInSelectedChoice=true+ }}/></div>{{/if}}diff --git a/plugins/discourse-solved/spec/system/admin_dashboard_support_section_spec.rb b/plugins/discourse-solved/spec/system/admin_dashboard_support_section_spec.rbindex a0a2a544493..8b55025aa3f 100644--- a/plugins/discourse-solved/spec/system/admin_dashboard_support_section_spec.rb+++ b/plugins/discourse-solved/spec/system/admin_dashboard_support_section_spec.rb@@ -79,6 +79,17 @@ describe "Admin dashboard Support section" doexpect(support).to have_selected_category(support_category)end+ it "shows the parent category next to a selected support sub-category in the filter" do+ support_subcategory = Fabricate(:support_category, parent_category: support_category)++ dashboard.visit+ support.select_category(support_subcategory)+ support.close_category_filter++ support.expand_category_filter+ expect(support).to have_selected_category_with_parent(support_subcategory)+ end+it "does not persist a moderator's category selection" dosign_in(moderator)diff --git a/plugins/discourse-solved/spec/system/page_objects/components/admin_dashboard_support.rb b/plugins/discourse-solved/spec/system/page_objects/components/admin_dashboard_support.rbindex 42d9deac42f..c047b7530a4 100644--- a/plugins/discourse-solved/spec/system/page_objects/components/admin_dashboard_support.rb+++ b/plugins/discourse-solved/spec/system/page_objects/components/admin_dashboard_support.rb@@ -73,6 +73,14 @@ module PageObjectsdef has_no_selected_category?(category)has_no_css?("#{CATEGORY_FILTER} .selected-choice[data-value='#{category.id}']")end++ def has_selected_category_with_parent?(category)+ has_css?(+ "#{CATEGORY_FILTER} .selected-choice[data-value='#{category.id}'] " \+ ".badge-category__wrapper:has(.badge-category[data-category-id='#{category.parent_category_id}']) + " \+ ".badge-category__wrapper .badge-category[data-category-id='#{category.id}']",+ )+ endendendenddiff --git a/spec/system/admin_dashboard_redesign/engagement_section_spec.rb b/spec/system/admin_dashboard_redesign/engagement_section_spec.rbindex 2fad03d7185..86fc426fe00 100644--- a/spec/system/admin_dashboard_redesign/engagement_section_spec.rb+++ b/spec/system/admin_dashboard_redesign/engagement_section_spec.rb@@ -7,6 +7,10 @@ describe "Admin Dashboard Redesign | Engagement section" dofab!(:category_alpha) { Fabricate(:category, name: "Category Alpha") }fab!(:category_bravo) { Fabricate(:category, name: "Category Bravo") }fab!(:category_dormant) { Fabricate(:category, name: "Category Dormant") }+ fab!(:category_delta) { Fabricate(:category, name: "Category Delta") }+ fab!(:category_charlie) do+ Fabricate(:category, name: "Category Charlie", parent_category: category_delta)+ endlet(:dashboard) { PageObjects::Pages::AdminDashboard.new }let(:engagement) { dashboard.engagement }@@ -25,6 +29,7 @@ describe "Admin Dashboard Redesign | Engagement section" do)Fabricate(:topic, category: category_alpha, created_at: "2026-06-12")Fabricate(:topic, category: category_bravo, created_at: "2026-06-12")+ Fabricate(:topic, category: category_charlie, created_at: "2026-06-12")Jobs::MaintainCategoryActivityDailyRollups.new.executesign_in(current_user)end@@ -85,6 +90,22 @@ describe "Admin Dashboard Redesign | Engagement section" doexpect(engagement).to have_selected_activity_category(category_dormant)end+ it "shows the parent category next to a sub-category in the Activity by category table and the category filters",+ time: Time.zone.local(2026, 6, 15, 12, 0, 0) do+ dashboard.visit+ expect(dashboard).to have_section("engagement")++ expect(engagement).to have_activity_row_with_parent(category_charlie)++ engagement.expand_activity_category_filter++ expect(engagement).to have_selected_activity_category_with_parent(category_charlie)++ engagement.select_whos_posting_category(category_charlie)++ expect(engagement).to have_selected_whos_posting_category_with_parent(category_charlie)+ end+it "saves an admin's 'Who's posting' selection when the picker closes, and persists it across a refresh",time: Time.zone.local(2026, 6, 15, 12, 0, 0) dodashboard.visitdiff --git a/spec/system/page_objects/components/admin_dashboard_engagement.rb b/spec/system/page_objects/components/admin_dashboard_engagement.rbindex bfc812be851..9bd08cdd7e3 100644--- a/spec/system/page_objects/components/admin_dashboard_engagement.rb+++ b/spec/system/page_objects/components/admin_dashboard_engagement.rb@@ -71,6 +71,24 @@ module PageObjectshas_no_css?("#{WHOS_POSTING_CATEGORY_FILTER} .selected-choice[data-value='#{category.id}']")end+ def has_activity_row_with_parent?(category)+ has_css?("#{ACTIVITY_CATEGORY_CELL} #{parent_then_child_badges(category)}")+ end++ def has_selected_activity_category_with_parent?(category)+ has_css?(+ "#{ACTIVITY_CATEGORY_FILTER} .selected-choice[data-value='#{category.id}'] " \+ "#{parent_then_child_badges(category)}",+ )+ end++ def has_selected_whos_posting_category_with_parent?(category)+ has_css?(+ "#{WHOS_POSTING_CATEGORY_FILTER} .selected-choice[data-value='#{category.id}'] " \+ "#{parent_then_child_badges(category)}",+ )+ end+def compare_groups_modal@compare_groups_modal ||=PageObjects::Components::ManageableRowListModal.new(@@ -108,6 +126,13 @@ module PageObjectshas_css?("#{SECTION} .db-section__subintro h3", exact_text: title) &&has_css?("#{SECTION} .db-section__subintro p", exact_text: summary)end++ private++ def parent_then_child_badges(category)+ ".badge-category__wrapper:has(.badge-category[data-category-id='#{category.parent_category_id}']) + " \+ ".badge-category__wrapper .badge-category[data-category-id='#{category.id}']"+ endendendend