Skip to content

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

FEATURE: Category management UI for admins (#41218)

Martin Brennand9dfa85e1bd3
diff --git a/app/assets/stylesheets/admin/admin_base.scss b/app/assets/stylesheets/admin/admin_base.scss
index 84dee7eeba6..17700a24041 100644
--- a/app/assets/stylesheets/admin/admin_base.scss
+++ b/app/assets/stylesheets/admin/admin_base.scss
@@ -1307,6 +1307,7 @@ a.inline-editable-field {
@import "admin/color-palette-editor";
@import "admin/admin_config_color_palettes";
@import "admin/admin_config_components";
+@import "admin/admin_category_management";
@import "admin/upcoming-changes";
@import "admin/discourse_id";
@import "admin/admin_new_category_setup";
diff --git a/app/assets/stylesheets/admin/admin_category_management.scss b/app/assets/stylesheets/admin/admin_category_management.scss
new file mode 100644
index 00000000000..fc97d2816f7
--- /dev/null
+++ b/app/assets/stylesheets/admin/admin_category_management.scss
@@ -0,0 +1,52 @@
+.admin-category-management-list {
+ &__visibility {
+ display: inline-flex;
+ align-items: center;
+ gap: 0.25em;
+
+ .d-icon {
+ font-size: var(--font-down-2);
+ color: var(--primary-high);
+ }
+ }
+
+ &__visibility-cell {
+ font-size: var(--font-down-1);
+ }
+
+ &__category-badges {
+ margin-bottom: var(--space-1);
+ display: flex;
+ flex-wrap: wrap;
+ gap: 0 var(--space-2);
+ }
+
+ &__topic-count {
+ font-size: var(--font-down-1);
+ }
+
+ &__description {
+ font-size: var(--font-down-1);
+ color: var(--primary-high);
+ max-width: 70ch;
+
+ @include line-clamp(4);
+ }
+
+ &__type-badges {
+ margin-top: var(--space-1);
+ }
+
+ &__controls-cell {
+ .btn .d-icon {
+ margin: 0;
+ }
+ }
+
+ &__visibility-header,
+ &__visibility-cell,
+ &__topics-header,
+ &__topic-count {
+ text-align: center;
+ }
+}
diff --git a/app/assets/stylesheets/admin/admin_new_category_setup.scss b/app/assets/stylesheets/admin/admin_new_category_setup.scss
index 9db2b1184d2..ffaf4ee7c86 100644
--- a/app/assets/stylesheets/admin/admin_new_category_setup.scss
+++ b/app/assets/stylesheets/admin/admin_new_category_setup.scss
@@ -1,133 +1,130 @@
@use "lib/viewport";
-.admin-new-category-setup {
- .category-type-cards {
- display: flex;
- flex-direction: column;
- gap: var(--space-6);
- margin-block: var(--space-8);
-
- &__card {
- position: relative;
- border: 1px solid var(--primary-low);
- border-radius: var(--d-border-radius);
-
- &-select {
- all: unset; // reset browser button styles
- width: 100%;
- display: grid;
- grid-template-areas: "icon title" "icon description";
- grid-template-columns: auto 1fr;
- cursor: pointer;
- text-align: left;
- gap: 0 var(--space-6);
- padding: var(--space-9) 0 var(--space-9);
-
- @include viewport.from(sm) {
- padding: var(--space-8) 0 var(--space-9);
- gap: 0 var(--space-8);
- }
+.category-type-cards {
+ display: flex;
+ flex-direction: column;
+ gap: var(--space-6);
+ margin-block: var(--space-8);
+
+ &__card {
+ position: relative;
+ border: 1px solid var(--primary-low);
+ border-radius: var(--d-border-radius);
+
+ &-select {
+ all: unset; // reset browser button styles
+ width: 100%;
+ display: grid;
+ grid-template-areas: "icon title" "icon description";
+ grid-template-columns: auto 1fr;
+ cursor: pointer;
+ text-align: left;
+ gap: 0 var(--space-6);
+ padding: var(--space-9) 0 var(--space-9);
+
+ @include viewport.from(sm) {
+ padding: var(--space-8) 0 var(--space-9);
+ gap: 0 var(--space-8);
}
+ }
- &-icon {
- grid-area: icon;
- font-size: 2.75em;
- margin-top: -0.1em;
- padding-left: var(--space-6);
- }
+ &-icon {
+ grid-area: icon;
+ font-size: 2.75em;
+ margin-top: -0.1em;
+ padding-left: var(--space-6);
+ }
- &-name {
- grid-area: title;
- font-size: var(--font-up-1);
- font-weight: bold;
- }
+ &-name {
+ grid-area: title;
+ font-size: var(--font-up-1);
+ font-weight: bold;
+ }
- &-description {
- grid-area: description;
- color: var(--primary-high);
- }
+ &-description {
+ grid-area: description;
+ color: var(--primary-high);
+ }
- &-bottom {
- display: flex;
+ &-bottom {
+ display: flex;
+ }
+
+ &:hover,
+ &:focus-within {
+ border-color: var(--tertiary);
+ }
+
+ &.--unavailable {
+ padding-bottom: 0;
+
+ .category-type-cards__card-select {
+ cursor: not-allowed;
}
&:hover,
- &:focus-within {
- border-color: var(--tertiary);
+ &:focus-visible {
+ border-color: var(--primary-low);
}
- &.--unavailable {
- padding-bottom: 0;
+ [class^="category-type-cards__card-"] {
+ opacity: 0.5;
+ }
- .category-type-cards__card-select {
- cursor: not-allowed;
- }
+ .category-type-cards__card-bottom,
+ .category-type-cards__card-badge {
+ opacity: 1;
+ }
+ }
+ }
- &:hover,
- &:focus-visible {
- border-color: var(--primary-low);
- }
+ &__card-badge {
+ position: absolute;
+ right: 0;
+ top: 0;
+ font-size: var(--font-down-2);
+ color: var(--primary);
+ padding: var(--space-1) var(--space-2);
+ background: var(--highlight-low);
+ border-radius: 0 calc(var(--d-border-radius) - 1px) 0 var(--d-border-radius);
+ }
- [class^="category-type-cards__card-"] {
- opacity: 0.5;
- }
+ &__ask-admin-message {
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+ padding: var(--space-3) var(--space-6);
+ background-color: var(--tertiary-very-low);
+ color: var(--tertiary);
+ border-radius: 0 0 var(--d-border-radius) var(--d-border-radius);
+ gap: var(--space-6);
- .category-type-cards__card-bottom,
- .category-type-cards__card-badge {
- opacity: 1;
- }
- }
+ .d-icon {
+ color: currentcolor;
}
- &__card-badge {
- position: absolute;
- right: 0;
- top: 0;
- font-size: var(--font-down-2);
- color: var(--primary);
- padding: var(--space-1) var(--space-2);
- background: var(--highlight-low);
- border-radius: 0 calc(var(--d-border-radius) - 1px) 0
- var(--d-border-radius);
+ &:hover,
+ &:focus-visible {
+ background: var(--tertiary);
+ color: var(--secondary);
}
- &__ask-admin-message {
- width: 100%;
+ &-text {
display: flex;
- flex-direction: row;
- justify-content: space-between;
align-items: center;
- padding: var(--space-3) var(--space-6);
- background-color: var(--tertiary-very-low);
- color: var(--tertiary);
- border-radius: 0 0 var(--d-border-radius) var(--d-border-radius);
- gap: var(--space-6);
-
- .d-icon {
- color: currentcolor;
- }
-
- &:hover,
- &:focus-visible {
- background: var(--tertiary);
- color: var(--secondary);
- }
-
- &-text {
- display: flex;
- align-items: center;
- gap: var(--space-2);
- text-align: left;
- }
+ gap: var(--space-2);
+ text-align: left;
+ }
- &-link {
- display: flex;
- align-items: center;
- gap: var(--space-1);
+ &-link {
+ display: flex;
+ align-items: center;
+ gap: var(--space-1);
- .d-icon {
- font-size: var(--font-down-1);
- }
+ .d-icon {
+ font-size: var(--font-down-1);
}
}
}
diff --git a/app/assets/stylesheets/admin/upcoming-changes.scss b/app/assets/stylesheets/admin/upcoming-changes.scss
index a4f617aed36..d41d830142a 100644
--- a/app/assets/stylesheets/admin/upcoming-changes.scss
+++ b/app/assets/stylesheets/admin/upcoming-changes.scss
@@ -38,14 +38,6 @@
color: var(--primary-medium);
}
- &__badges {
- display: flex;
- flex-wrap: wrap;
- gap: var(--space-2);
- align-items: center;
- min-height: var(--space-8);
- }
-
&__image-preview.lightbox[href] {
// very specific to override
&:hover {
@@ -60,35 +52,6 @@
}
&__badge {
- display: flex;
- font-size: var(--font-down-2);
- border-radius: var(--d-button-border-radius);
- color: var(--primary-very-high);
- background: var(--tertiary-very-low);
- letter-spacing: 0.25px;
-
- span {
- display: flex;
- align-items: center;
- gap: 0 var(--space-1);
- }
-
- &-content {
- padding: var(--space-half) var(--space-2);
- }
-
- svg {
- font-size: var(--font-down-2);
- color: var(--primary-high);
- }
-
- &-info {
- border-left: 1px solid var(--secondary);
- border-radius: 0 var(--d-button-border-radius)
- var(--d-button-border-radius) 0;
- padding: var(--space-half) var(--space-1);
- }
-
&:focus-visible,
&:hover {
.upcoming-change__badge-info {
diff --git a/app/assets/stylesheets/common/components/table-layout.scss b/app/assets/stylesheets/common/components/table-layout.scss
index 60977615607..e1707340da7 100644
--- a/app/assets/stylesheets/common/components/table-layout.scss
+++ b/app/assets/stylesheets/common/components/table-layout.scss
@@ -236,3 +236,42 @@
align-items: center;
gap: var(--space-1);
}
+
+.d-table__badges {
+ display: flex;
+ flex-wrap: wrap;
+ gap: var(--space-1);
+ align-items: center;
+ min-height: var(--space-8);
+}
+
+.d-table-badge {
+ display: flex;
+ font-size: var(--font-down-2);
+ border-radius: var(--d-button-border-radius);
+ color: var(--primary-very-high);
+ background: var(--tertiary-very-low);
+ letter-spacing: 0.25px;
+
+ span {
+ display: flex;
+ align-items: center;
+ gap: 0 var(--space-1);
+ }
+
+ &__content {
+ padding: var(--space-half) var(--space-2);
+ }
+
+ &__info {
+ border-left: 1px solid var(--secondary);
+ border-radius: 0 var(--d-button-border-radius) var(--d-button-border-radius)
+ 0;
+ padding: var(--space-half) var(--space-1);
+ }
+
+ svg {
+ font-size: var(--font-down-2);
+ color: var(--primary-high);
+ }
+}
diff --git a/app/controllers/admin/config/category_management_controller.rb b/app/controllers/admin/config/category_management_controller.rb
new file mode 100644
index 00000000000..d385325924b
--- /dev/null
+++ b/app/controllers/admin/config/category_management_controller.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class Admin::Config::CategoryManagementController < Admin::AdminController
+ def categories
+ per_page =
+ if params[:per_page].present?
+ params[:per_page].to_i.clamp(1, ListAdminCategories::MAX_PER_PAGE)
+ else
+ ListAdminCategories::DEFAULT_PER_PAGE
+ end
+ page = fetch_page_from_params(max: per_page)
+
+ ListAdminCategories.call(
+ **service_params.deep_merge(params: { per_page: per_page, page: page }),
+ ) do
+ on_success do |category_page:|
+ render_json_dump(
+ categories:
+ ActiveModel::ArraySerializer.new(
+ category_page[:categories],
+ each_serializer: AdminCategorySerializer,
+ scope: guardian,
+ ).as_json,
+ has_more: category_page[:has_more],
+ )
+ end
+
+ on_failed_policy(:category_type_exists) { raise Discourse::NotFound }
+ end
+ end
+end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7b4719e2fbc..1047565469b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1065,6 +1065,10 @@ class ApplicationController < ActionController::Base
fetch_int_from_params(:limit, params: params, default: default, max: max)
end
+ def fetch_page_from_params(params: self.params, default: 0, max: nil)
+ fetch_int_from_params(:page, params: params, default: default, min: 0, max: max)
+ end
+
def fetch_int_from_params(key, params: self.params, default:, min: 0, max: nil)
key = key.to_sym
diff --git a/app/models/category.rb b/app/models/category.rb
index f5edfce2310..a4ef907cf21 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -251,6 +251,44 @@ class Category < ActiveRecord::Base
id IN (SELECT DISTINCT parent_category_id FROM categories WHERE id IN (:ids))
SQL
+ scope :for_category_type,
+ ->(type_id, type = nil) do
+ if type_id == "all"
+ all
+ elsif type&.type_id == :discussion
+ where.not(id: Categories::TypeRegistry.non_discussion_category_ids)
+ else
+ where(id: type.find_matches.select(:id))
+ end
+ end
+
+ scope :matching_name_or_slug_ref,
+ ->(filter) do
+ filter = filter.to_s.strip.delete_prefix("#")
+ next all if filter.blank?
+
+ normalized_search =
+ filter.tr("/", SLUG_REF_SEPARATOR).gsub(
+ /#{Regexp.escape(SLUG_REF_SEPARATOR)}+/,
+ SLUG_REF_SEPARATOR,
+ )
+ normalized_filter = "%#{ActiveRecord::Base.sanitize_sql_like(normalized_search)}%"
+
+ where(
+ "#{normalize_sql("categories.name")} ILIKE #{normalize_sql("?")} OR " \
+ "#{normalize_sql("categories.slug")} ILIKE #{normalize_sql("?")} OR " \
+ "EXISTS (
+ SELECT 1
+ FROM categories parent_categories
+ WHERE parent_categories.id = categories.parent_category_id
+ AND #{normalize_sql("parent_categories.slug || '#{SLUG_REF_SEPARATOR}' || categories.slug")} ILIKE #{normalize_sql("?")}
+ )",
+ normalized_filter,
+ normalized_filter,
+ normalized_filter,
+ )
+ end
+
delegate :post_template, to: "self.class"
# permission is just used by serialization
diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb
index 1eb3a90302d..fa611479d1f 100644
--- a/app/models/site_setting.rb
+++ b/app/models/site_setting.rb
@@ -11,6 +11,7 @@ class SiteSetting < ActiveRecord::Base
oidc
saml
badges
+ categories
categories_and_tags
email
embedding
diff --git a/app/serializers/admin_category_badge_serializer.rb b/app/serializers/admin_category_badge_serializer.rb
new file mode 100644
index 00000000000..23081d4e4ba
--- /dev/null
+++ b/app/serializers/admin_category_badge_serializer.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AdminCategoryBadgeSerializer < CategoryBadgeSerializer
+ def include_parent_category_id?
+ true
+ end
+end
diff --git a/app/serializers/admin_category_serializer.rb b/app/serializers/admin_category_serializer.rb
new file mode 100644
index 00000000000..75afe43ebe8
--- /dev/null
+++ b/app/serializers/admin_category_serializer.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+class AdminCategorySerializer < ApplicationSerializer
+ attributes :id,
+ :badge_chain,
+ :category_types,
+ :description_text,
+ :read_restricted,
+ :topic_count,
+ :edit_url
+
+ def badge_chain
+ ancestors
+ .push(object)
+ .map { |category| AdminCategoryBadgeSerializer.new(category, scope:, root: false).as_json }
+ end
+
+ def category_types
+ Categories::TypeRegistry
+ .all
+ .values
+ .select { |type| type.category_matches?(object) }
+ .map { |type| { id: type.type_id, name: type.metadata(guardian: scope)[:name] } }
+ end
+
+ def edit_url
+ "#{object.slug_url_without_id}/edit/general"
+ end
+
+ private
+
+ def ancestors
+ ancestors = []
+ parent = object.parent_category
+
+ while parent.present?
+ ancestors.unshift(parent)
+ parent = parent.parent_category
+ end
+
+ ancestors
+ end
+end
diff --git a/app/serializers/site_serializer.rb b/app/serializers/site_serializer.rb
index 9c4d42809ce..af032d13adb 100644
--- a/app/serializers/site_serializer.rb
+++ b/app/serializers/site_serializer.rb
@@ -56,6 +56,7 @@ class SiteSerializer < ApplicationSerializer
:upcoming_changes_with_css,
:permanent_upcoming_change_names,
:access_control,
+ :category_types,
)
has_many :archetypes, embed: :objects, serializer: ArchetypeSerializer
@@ -465,6 +466,14 @@ class SiteSerializer < ApplicationSerializer
scope.is_staff?
end
+ def category_types
+ Categories::TypeRegistry.list(only_visible: true, guardian: scope)
+ end
+
+ def include_category_types?
+ scope.is_staff?
+ end
+
private
def ordered_flags(flags)
diff --git a/app/services/categories/type_registry.rb b/app/services/categories/type_registry.rb
index 4f83333ce8b..2b3f0cec59f 100644
--- a/app/services/categories/type_registry.rb
+++ b/app/services/categories/type_registry.rb
@@ -87,6 +87,14 @@ module Categories
end
end
+ def non_discussion_category_ids
+ types
+ .values
+ .reject { |type| type.type_id == :discussion }
+ .flat_map { |type| type.find_matches.pluck(:id) }
+ .uniq
+ end
+
private
def types
diff --git a/app/services/list_admin_categories.rb b/app/services/list_admin_categories.rb
new file mode 100644
index 00000000000..9dedd04e717
--- /dev/null
+++ b/app/services/list_admin_categories.rb
@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+class ListAdminCategories
+ include Service::Base
+
+ DEFAULT_PER_PAGE = 50
+ MAX_PER_PAGE = 100
+
+ params do
+ attribute :type, :string, default: "discussion"
+ attribute :filter, :string
+ attribute :visibility, :string
+ attribute :per_page, :integer, default: DEFAULT_PER_PAGE
+ attribute :page, :integer, default: 0
+
+ validates :per_page,
+ numericality: {
+ greater_than_or_equal_to: 1,
+ less_than_or_equal_to: MAX_PER_PAGE,
+ }
+ validates :page, numericality: { greater_than_or_equal_to: 0 }
+
+ after_validation { self.type = type.presence || "discussion" }
+
+ def type_id
+ type
+ end
+ end
+
+ model :category_type, optional: true
+ policy :category_type_exists
+ model :categories, optional: true
+ model :category_page, :paginate_categories
+ step :preload_category_custom_fields
+
+ private
+
+ def fetch_category_type(params:)
+ return if params.type_id == "all"
+
+ Categories::TypeRegistry.get(params.type_id)
+ end
+
+ def category_type_exists(params:, category_type:)
+ params.type_id == "all" || category_type.present?
+ end
+
+ def fetch_categories(guardian:, params:, category_type:)
+ categories =
+ Category
+ .secured(guardian)
+ .includes(:parent_category)
+ .for_category_type(params.type_id, category_type)
+
+ categories = categories.matching_name_or_slug_ref(params.filter) if params.filter.present?
+
+ if params.visibility.present?
+ categories =
+ case params.visibility
+ when "public"
+ categories.where(read_restricted: false)
+ when "restricted"
+ categories.where(read_restricted: true)
+ else
+ categories
+ end
+ end
+
+ categories.order(Category.normalize_sql("categories.name"), "categories.id ASC")
+ end
+
+ def paginate_categories(categories:, params:)
+ paginated_categories =
+ categories.offset(params.page * params.per_page).limit(params.per_page + 1).to_a
+
+ {
+ categories: paginated_categories.take(params.per_page),
+ has_more: paginated_categories.length > params.per_page,
+ }
+ end
+
+ def preload_category_custom_fields(category_page:)
+ return if Site.preloaded_category_custom_fields.blank? || category_page[:categories].blank?
+
+ Category.preload_custom_fields(
+ category_page[:categories],
+ Site.preloaded_category_custom_fields,
+ )
+ end
+end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index ea1fbf7d936..4a73821ff14 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -6929,6 +6929,31 @@ en:
title: "Posts & topics"
stats_and_thresholds:
title: "Stats & thresholds"
+ category_management:
+ title: "Category management"
+ header_description: "Review category types, hierarchy, and the categories currently assigned to each type."
+ keywords: "categories|category types|discussion|category management"
+ tabs:
+ settings: "Settings"
+ types:
+ unavailable: "The category type %{categoryType} is not available."
+ all:
+ title: "All categories"
+ description: "All categories across every configured category type."
+ filter_placeholder: "Filter categories"
+ no_results: "No %{type} categories found."
+ open_settings: "Open settings"
+ table:
+ category: "Category"
+ visibility: "Visibility"
+ topics: "Topics"
+ visibility:
+ public: "Public"
+ restricted: "Restricted"
+ visibility_filter:
+ all: "All categories"
+ public: "Public categories"
+ restricted: "Restricted categories"
permalinks:
title: "Permalinks"
header_description: "Redirections to apply for URLs not known by the forum"
diff --git a/config/routes.rb b/config/routes.rb
index 90dacb42f5e..a645c1b8254 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -462,6 +462,9 @@ Discourse::Application.routes.draw do
get "upcoming-changes" => "upcoming_changes#index"
put "upcoming-changes/groups" => "upcoming_changes#update_groups"
put "upcoming-changes/toggle" => "upcoming_changes#toggle_change"
+ get "category-management/categories" => "category_management#categories"
+ get "category-management" => "site_settings#index"
+ get "category-management/*path" => "site_settings#index"
resources :flags, only: %i[index new create update destroy] do
put "toggle"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 39fa335003f..97c130997b1 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -391,24 +391,25 @@ basic:
client: true
enum: "CategoryPageStyle"
default: "categories_and_latest_topics"
- area: "interface"
+ area: "categories|interface"
mobile_category_page_style:
client: true
enum: "MobileCategoryPageStyle"
default: "categories_with_featured_topics"
- area: "interface"
+ area: "categories|interface"
category_colors:
client: true
type: list
list_type: compact
default: "BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|231F20|808281|B3B5B4|E45735"
- area: "interface"
+ area: "categories|interface"
max_category_nesting:
client: true
default: 2
min: 2
max: 3
hidden: true
+ area: "categories"
enable_direct_s3_uploads:
client: true
default: false
@@ -446,11 +447,11 @@ basic:
fixed_category_positions:
client: true
default: false
- area: "interface"
+ area: "categories|interface"
fixed_category_positions_on_create:
client: true
default: false
- area: "interface"
+ area: "categories|interface"
enable_badges:
client: true
default: true
@@ -1270,6 +1271,7 @@ groups:
enable_category_group_moderation:
client: true
default: false
+ area: "group_permissions|categories"
max_automatic_membership_email_domains:
default: 50
hidden: true
@@ -1606,7 +1608,7 @@ posting:
default_subcategory_on_read_only_category:
client: true
default: false
- area: "posts_and_topics"
+ area: "posts_and_topics|categories"
hide_disabled_create_topic_button:
client: true
default: false
@@ -2043,7 +2045,7 @@ email:
digest_suppress_categories:
type: category_list
default: ""
- area: "email"
+ area: "email|categories"
digest_suppress_tags:
type: tag_list
default: ""
@@ -3459,7 +3461,7 @@ navigation:
type: category_list
default: ""
client: true
- area: "navigation"
+ area: "navigation|categories"
default_navigation_menu_tags:
type: tag_list
default: ""
@@ -3653,10 +3655,12 @@ search:
default: 0.8
hidden: true
validator: "CategorySearchPriorityWeightsValidator"
+ area: "categories"
category_search_priority_high_weight:
default: 1.2
hidden: true
validator: "CategorySearchPriorityWeightsValidator"
+ area: "categories"
search_page_size:
default: 50
hidden: true
@@ -3693,7 +3697,7 @@ uncategorized:
header_dropdown_category_count:
client: true
default: 8
- area: "navigation"
+ area: "navigation|categories"
slug_generation_method:
default: "ascii"
@@ -3846,21 +3850,25 @@ uncategorized:
default: -1
hidden: true
client: true
+ area: "categories"
meta_category_id:
default: -1
hidden: true
+ area: "categories"
staff_category_id:
default: -1
hidden: true
+ area: "categories"
uncategorized_category_id:
default: -1
hidden: true
+ area: "categories"
default_composer_category:
client: true
type: category
default: ""
validator: "DefaultComposerCategoryValidator"
- area: "posts_and_topics"
+ area: "posts_and_topics|categories"
moderator_guide_topic:
type: "topic"
@@ -4049,6 +4057,7 @@ uncategorized:
default: false
hidden: true
client: true
+ area: "categories"
max_topic_query_page_param:
default: 2000
@@ -4198,27 +4207,27 @@ user_preferences:
default_categories_watching:
type: category_list
default: ""
- area: "user_defaults"
+ area: "categories|user_defaults"
default_categories_tracking:
type: category_list
default: ""
- area: "user_defaults"
+ area: "categories|user_defaults"
default_categories_muted:
type: category_list
default: ""
- area: "user_defaults"
+ area: "categories|user_defaults"
default_categories_watching_first_post:
type: category_list
default: ""
- area: "user_defaults"
+ area: "categories|user_defaults"
default_categories_normal:
type: category_list
default: ""
- area: "user_defaults"
+ area: "categories|user_defaults"
mute_all_categories_by_default:
default: false
client: true
- area: "user_defaults"
+ area: "categories|user_defaults"
default_tags_watching:
type: tag_list
@@ -4446,10 +4455,10 @@ tags:
area: "categories_and_tags"
create_post_for_category_and_tag_changes:
default: false
- area: "categories_and_tags"
+ area: "categories_and_tags|categories"
automatically_clean_unused_tags:
default: false
- area: "categories_and_tags"
+ area: "categories_and_tags|categories"
dashboard:
dashboard_hidden_reports:
diff --git a/frontend/discourse/admin/components/admin-category-management-list.gjs b/frontend/discourse/admin/components/admin-category-management-list.gjs
new file mode 100644
index 00000000000..369d01c4791
--- /dev/null
+++ b/frontend/discourse/admin/components/admin-category-management-list.gjs
@@ -0,0 +1,385 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { hash } from "@ember/helper";
+import { action } from "@ember/object";
+import didUpdate from "@ember/render-modifiers/modifiers/did-update";
+import { service } from "@ember/service";
+import AdminFilterControls from "discourse/admin/components/admin-filter-controls";
+import PluginOutlet from "discourse/components/plugin-outlet";
+import lazyHash from "discourse/helpers/lazy-hash";
+import { ajax } from "discourse/lib/ajax";
+import { availableCategoryType } from "discourse/lib/category-type-utils";
+import discourseDebounce from "discourse/lib/debounce";
+import { INPUT_DELAY } from "discourse/lib/environment";
+import DButton from "discourse/ui-kit/d-button";
+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";
+import DLoadMore from "discourse/ui-kit/d-load-more";
+import DPageSubheader from "discourse/ui-kit/d-page-subheader";
+import dCategoryBadge from "discourse/ui-kit/helpers/d-category-badge";
+import dIcon from "discourse/ui-kit/helpers/d-icon";
+import { i18n } from "discourse-i18n";
+
+const PAGE_SIZE = 50;
+const DESCRIPTION_MAX_LENGTH = 500;
+const VISIBILITY_FILTER_OPTIONS = [
+ {
+ value: "all",
+ label: i18n("admin.config.category_management.visibility_filter.all"),
+ },
+ {
+ value: "public",
+ label: i18n("admin.config.category_management.visibility_filter.public"),
+ },
+ {
+ value: "restricted",
+ label: i18n(
+ "admin.config.category_management.visibility_filter.restricted"
+ ),
+ },
+];
+
+export default class AdminCategoryManagementList extends Component {
+ @service capabilities;
+
+ @tracked categories = [];
+ @tracked loading = true;
+ @tracked loadingMore = false;
+ @tracked filter;
+ @tracked visibilityFilter;
+
+ page = 0;
+ hasMore = false;
+
+ constructor() {
+ super(...arguments);
+ this.load();
+ }
+
+ get titleLabel() {
+ return this.args.categoryType.name;
+ }
+
+ get descriptionLabel() {
+ return this.args.categoryType.description;
+ }
+
+ get noResultsMessage() {
+ return i18n("admin.config.category_management.no_results", {
+ type: this.titleLabel,
+ });
+ }
+
+ get showEmptyList() {
+ return (
+ !this.loading &&
+ !this.filter &&
+ !this.visibilityFilter &&
+ this.categories.length === 0
+ );
+ }
+
+ get showCategoryTypeBadges() {
+ return this.args.categoryType.id === "all";
+ }
+
+ @action
+ typeChanged() {
+ this.categories = [];
+ this.loading = true;
+ this.loadingMore = false;
+ this.filter = null;
+ this.visibilityFilter = null;
+ this.page = 0;
+ this.hasMore = false;
+ this.load();
+ }
+
+ @action
+ onTextFilterChange(event) {
+ this.loading = true;
+ this.filter = event.target.value;
+ this.page = 0;
+ discourseDebounce(this, this.load, INPUT_DELAY);
+ }
+
+ @action
+ onVisibilityFilterChange(value) {
+ this.loading = true;
+ this.visibilityFilter = value === "all" ? null : value;
+ this.page = 0;
+ this.load();
+ }
+
+ @action
+ onResetFilters() {
+ this.loading = true;
+ this.filter = null;
+ this.visibilityFilter = null;
+ this.page = 0;
+ this.load();
+ }
+
+ @action
+ async load({ append = false } = {}) {
+ try {
+ const data = await ajax("/admin/config/category-management/categories", {
+ data: {
+ type: this.args.categoryType.id,
+ filter: this.filter,
+ visibility: this.visibilityFilter,
+ page: this.page,
+ per_page: PAGE_SIZE,
+ },
+ });
+
+ if (append) {
+ this.categories = [...this.categories, ...data.categories];
+ } else {
+ this.categories = data.categories;
+ }
+
+ this.hasMore = data.has_more;
+ } finally {
+ this.loading = false;
+ }
+ }
+
+ @action
+ async loadMore() {
+ if (this.loadingMore || !this.hasMore) {
+ return;
+ }
+
+ this.page += 1;
+ this.loadingMore = true;
+
+ try {
+ await this.load({ append: true });
+ } finally {
+ this.loadingMore = false;
+ }
+ }
+
+ truncatedDescription(category) {
+ const description = category.description_text || "";
+
+ if (description.length <= DESCRIPTION_MAX_LENGTH) {
+ return description;
+ }
+
+ return `${description.slice(0, DESCRIPTION_MAX_LENGTH - 3).trimEnd()}...`;
+ }
+
+ <template>
+ <div
+ class="admin-category-management-list admin-detail"
+ {{didUpdate this.typeChanged @categoryType}}
+ >
+ <DPageSubheader
+ @titleLabel={{this.titleLabel}}
+ @descriptionLabel={{this.descriptionLabel}}
+ />
+
+ <PluginOutlet
+ @name="admin-category-management-type-tab"
+ @outletArgs={{lazyHash
+ categoryType=@categoryType
+ categories=this.categories
+ }}
+ />
+
+ {{#unless (availableCategoryType @categoryType)}}
+ <PluginOutlet
+ @name="admin-category-management-type-unavailable"
+ @outletArgs={{lazyHash type=@categoryType}}
+ >
+ <div class="admin-category-management-list__unavailable">
+ {{i18n
+ "admin.config.category_management.types.unavailable"
+ }}
+ </div>
+ </PluginOutlet>
+ {{/unless}}
+
+ {{#if (availableCategoryType @categoryType)}}
+ <AdminFilterControls
+ @array={{this.categories}}
+ @dropdownOptions={{VISIBILITY_FILTER_OPTIONS}}
+ @inputPlaceholder={{i18n
+ "admin.config.category_management.filter_placeholder"
+ }}
+ @noResultsMessage={{this.noResultsMessage}}
+ @onTextFilterChange={{this.onTextFilterChange}}
+ @onDropdownFilterChange={{this.onVisibilityFilterChange}}
+ @onResetFilters={{this.onResetFilters}}
+ @loading={{this.loading}}
+ >
+ <:aboveContent>
+ <DConditionalLoadingSpinner @condition={{this.loading}} />
+
+ {{#if this.showEmptyList}}
+ <p class="admin-category-management-list__empty">
+ {{this.noResultsMessage}}
+ </p>
+ {{/if}}
+ </:aboveContent>
+
+ <:content as |categories|>
+ {{#if categories.length}}
+ <DLoadMore
+ @action={{this.loadMore}}
+ @enabled={{this.hasMore}}
+ @isLoading={{this.loadingMore}}
+ @rootMargin="0px 0px 250px 0px"
+ >
+ <table class="d-table admin-category-management-list__table">
+ <colgroup>
+ <col
+ class="admin-category-management-list__overview-column"
+ />
+ <col
+ class="admin-category-management-list__visibility-column"
+ />
+ <col
+ class="admin-category-management-list__topics-column"
+ />
+ <col
+ class="admin-category-management-list__controls-column"
+ />
+ </colgroup>
+ <thead class="d-table__header">
+ <tr class="d-table__row">
+ <th
+ class="d-table__header-cell admin-category-management-list__category-header"
+ >
+ {{i18n
+ "admin.config.category_management.table.category"
+ }}
+ </th>
+ <th
+ class="d-table__header-cell admin-category-management-list__visibility-header"
+ >
+ {{i18n
+ "admin.config.category_management.table.visibility"
+ }}
+ </th>
+ <th
+ class="d-table__header-cell admin-category-management-list__topics-header"
+ >
+ {{i18n "admin.config.category_management.table.topics"}}
+ </th>
+ <th
+ class="d-table__header-cell admin-category-management-list__controls-header"
+ ></th>
+ </tr>
+ </thead>
+ <tbody class="d-table__body">
+ {{#each categories as |category|}}
+ <tr class="d-table__row" data-category-id={{category.id}}>
+ <td
+ class="d-table__cell --overview admin-category-management-list__category"
+ >
+ <div
+ class="admin-category-management-list__category-badges"
+ >
+ {{#each category.badge_chain as |badge|}}
+ {{dCategoryBadge
+ badge
+ (hash link=false hideParent=true)
+ }}
+ {{/each}}
+ </div>
+
+ <div
+ class="d-table__overview-about admin-category-management-list__description"
+ >
+ {{this.truncatedDescription category}}
+ </div>
+
+ {{#if this.showCategoryTypeBadges}}
+ <div
+ class="d-table__badges admin-category-management-list__type-badges"
+ >
+ {{#each
+ category.category_types
+ as |categoryType|
+ }}
+ <span
+ class="d-table-badge admin-category-management-list__type-badge"
+ data-category-type={{categoryType.id}}
+ >
+ <span class="d-table-badge__content">
+ {{categoryType.name}}
+ </span>
+ </span>
+ {{/each}}
+ </div>
+ {{/if}}
+ </td>
+ <td
+ class="d-table__cell --detail admin-category-management-list__visibility-cell"
+ >
+ <div class="d-table__mobile-label">
+ {{i18n
+ "admin.config.category_management.table.visibility"
+ }}
+ </div>
+
+ <span
+ class="admin-category-management-list__visibility"
+ >
+ {{#if category.read_restricted}}
+ {{dIcon "lock"}}
+ {{i18n
+ "admin.config.category_management.visibility.restricted"
+ }}
+ {{else}}
+ {{i18n
+ "admin.config.category_management.visibility.public"
+ }}
+ {{/if}}
+ </span>
+ </td>
+ <td
+ class="d-table__cell --detail admin-category-management-list__topic-count"
+ >
+ <div class="d-table__mobile-label">
+ {{i18n
+ "admin.config.category_management.table.topics"
+ }}
+ </div>
+
+ {{category.topic_count}}
+ </td>
+ <td
+ class="d-table__cell --controls admin-category-management-list__controls-cell"
+ >
+ <div class="d-table__cell-actions">
+ <DButton
+ @href={{category.edit_url}}
+ @icon={{unless
+ this.capabilities.viewport.md
+ "gear"
+ }}
+ @label={{if
+ this.capabilities.viewport.md
+ "admin.config.category_management.open_settings"
+ }}
+ @title="admin.config.category_management.open_settings"
+ class="btn-default btn-small admin-category-management-list__open-settings"
+ />
+ </div>
+ </td>
+ </tr>
+ {{/each}}
+ </tbody>
+ </table>
+ </DLoadMore>
+ {{/if}}
+ </:content>
+ </AdminFilterControls>
+ {{/if}}
+ </div>
+ </template>
+}
diff --git a/frontend/discourse/admin/components/admin-config-areas/upcoming-change-badges.gjs b/frontend/discourse/admin/components/admin-config-areas/upcoming-change-badges.gjs
index bba5f005721..82d83903e54 100644
--- a/frontend/discourse/admin/components/admin-config-areas/upcoming-change-badges.gjs
+++ b/frontend/discourse/admin/components/admin-config-areas/upcoming-change-badges.gjs
@@ -7,9 +7,13 @@ import { i18n } from "discourse-i18n";
const UpcomingChangeBadge = <template>
<span
- class={{dConcatClass "upcoming-change__badge" "--has-tooltip" @badgeClass}}
+ class={{dConcatClass
+ "d-table-badge upcoming-change__badge"
+ "--has-tooltip"
+ @badgeClass
+ }}
>
- <span class="upcoming-change__badge-content">
+ <span class="d-table-badge__content upcoming-change__badge-content">
{{dIcon @icon}}
{{i18n @badgeLabelKey}}
</span>
@@ -43,7 +47,7 @@ export default class UpcomingChangeBadges extends Component {
}
<template>
- <div class="upcoming-change__badges">
+ <div class="d-table__badges upcoming-change__badges">
<DTooltip
@content={{i18n
(concat
@@ -61,7 +65,7 @@ export default class UpcomingChangeBadges extends Component {
}}
>
- <span class="upcoming-change__badge-info">
+ <span class="d-table-badge__info upcoming-change__badge-info">
{{dIcon "info"}}
</span>
</UpcomingChangeBadge>
diff --git a/frontend/discourse/admin/controllers/admin-config/category-management/settings.js b/frontend/discourse/admin/controllers/admin-config/category-management/settings.js
new file mode 100644
index 00000000000..bf1673c56af
--- /dev/null
+++ b/frontend/discourse/admin/controllers/admin-config/category-management/settings.js
@@ -0,0 +1,3 @@
+import AdminAreaSettingsBaseController from "discourse/admin/controllers/admin-area-settings-base";
+
+export default class AdminConfigCategoryManagementSettingsController extends AdminAreaSettingsBaseController {}
diff --git a/frontend/discourse/admin/routes/admin-config/category-management.js b/frontend/discourse/admin/routes/admin-config/category-management.js
new file mode 100644
index 00000000000..28e2df1312b
--- /dev/null
+++ b/frontend/discourse/admin/routes/admin-config/category-management.js
@@ -0,0 +1,8 @@
+import DiscourseRoute from "discourse/routes/discourse";
+import { i18n } from "discourse-i18n";
+
+export default class AdminConfigCategoryManagementRoute extends DiscourseRoute {
+ titleToken() {
+ return i18n("admin.config.category_management.title");
+ }
+}
diff --git a/frontend/discourse/admin/routes/admin-config/category-management/index.js b/frontend/discourse/admin/routes/admin-config/category-management/index.js
new file mode 100644
index 00000000000..b357fe2f79f
--- /dev/null
+++ b/frontend/discourse/admin/routes/admin-config/category-management/index.js
@@ -0,0 +1,10 @@
+import { service } from "@ember/service";
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default class AdminConfigCategoryManagementIndexRoute extends DiscourseRoute {
+ @service router;
+
+ beforeModel() {
+ this.router.replaceWith("adminConfig.categoryManagement.type", "all");
+ }
+}
diff --git a/frontend/discourse/admin/routes/admin-config/category-management/settings.js b/frontend/discourse/admin/routes/admin-config/category-management/settings.js
new file mode 100644
index 00000000000..cfbeeb101be
--- /dev/null
+++ b/frontend/discourse/admin/routes/admin-config/category-management/settings.js
@@ -0,0 +1,8 @@
+import DiscourseRoute from "discourse/routes/discourse";
+import { i18n } from "discourse-i18n";
+
+export default class AdminConfigCategoryManagementSettingsRoute extends DiscourseRoute {
+ titleToken() {
+ return i18n("admin.config.category_management.tabs.settings");
+ }
+}
diff --git a/frontend/discourse/admin/routes/admin-config/category-management/type.js b/frontend/discourse/admin/routes/admin-config/category-management/type.js
new file mode 100644
index 00000000000..8f9e0902701
--- /dev/null
+++ b/frontend/discourse/admin/routes/admin-config/category-management/type.js
@@ -0,0 +1,39 @@
+import { service } from "@ember/service";
+import DiscourseRoute from "discourse/routes/discourse";
+import { i18n } from "discourse-i18n";
+
+export default class AdminConfigCategoryManagementTypeRoute extends DiscourseRoute {
+ @service site;
+
+ model(params) {
+ if (params.category_type_id === "all") {
+ return {
+ id: "all",
+ name: i18n("admin.config.category_management.types.all.title"),
+ title: i18n("admin.config.category_management.types.all.title"),
+ description: i18n(
+ "admin.config.category_management.types.all.description"
+ ),
+ available: true,
+ visible: true,
+ };
+ }
+
+ return this.site.category_types.find(
+ (type) => type.id === params.category_type_id
+ );
+ }
+
+ titleToken() {
+ const categoryTypeId = this.paramsFor(
+ "adminConfig.categoryManagement.type"
+ ).category_type_id;
+
+ if (categoryTypeId === "all") {
+ return i18n("admin.config.category_management.types.all.title");
+ }
+
+ return this.site.category_types.find((type) => type.id === categoryTypeId)
+ ?.title;
+ }
+}
diff --git a/frontend/discourse/admin/routes/admin-route-map.js b/frontend/discourse/admin/routes/admin-route-map.js
index 82fd4d7525c..6f5c0ebc8d8 100644
--- a/frontend/discourse/admin/routes/admin-route-map.js
+++ b/frontend/discourse/admin/routes/admin-route-map.js
@@ -268,6 +268,19 @@ export default function () {
this.route("postsAndTopics", { path: "/posts-and-topics" });
this.route("statsAndThresholds", { path: "/stats-and-thresholds" });
});
+ this.route(
+ "categoryManagement",
+ { path: "/category-management" },
+ function () {
+ this.route("index", {
+ path: "/",
+ });
+ this.route("settings");
+ this.route("type", {
+ path: "/:category_type_id",
+ });
+ }
+ );
this.route("localization", function () {
this.route("settings", {
path: "/",
diff --git a/frontend/discourse/admin/templates/admin-config/category-management.gjs b/frontend/discourse/admin/templates/admin-config/category-management.gjs
new file mode 100644
index 00000000000..191fdbe8d1c
--- /dev/null
+++ b/frontend/discourse/admin/templates/admin-config/category-management.gjs
@@ -0,0 +1,50 @@
+import Component from "@glimmer/component";
+import { service } from "@ember/service";
+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";
+import DNavItem from "discourse/ui-kit/d-nav-item";
+import DPageHeader from "discourse/ui-kit/d-page-header";
+import { i18n } from "discourse-i18n";
+
+export default class AdminConfigCategoryManagement extends Component {
+ @service site;
+
+ <template>
+ <DPageHeader
+ @titleLabel={{i18n "admin.config.category_management.title"}}
+ @descriptionLabel={{i18n
+ "admin.config.category_management.header_description"
+ }}
+ >
+ <:breadcrumbs>
+ <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />
+ <DBreadcrumbsItem
+ @path="/admin/config/category-management"
+ @label={{i18n "admin.config.category_management.title"}}
+ />
+ </:breadcrumbs>
+
+ <:tabs>
+ <DNavItem
+ @route="adminConfig.categoryManagement.settings"
+ @label="admin.config.category_management.tabs.settings"
+ />
+ <DNavItem
+ @route="adminConfig.categoryManagement.type"
+ @routeParam="all"
+ @label="admin.config.category_management.types.all.title"
+ />
+ {{#each this.site.category_types as |categoryType|}}
+ <DNavItem
+ @route="adminConfig.categoryManagement.type"
+ @routeParam={{categoryType.id}}
+ @i18nLabel={{categoryType.name}}
+ />
+ {{/each}}
+ </:tabs>
+ </DPageHeader>
+
+ <div class="admin-config-page__main-area">
+ {{outlet}}
+ </div>
+ </template>
+}
diff --git a/frontend/discourse/admin/templates/admin-config/category-management/settings.gjs b/frontend/discourse/admin/templates/admin-config/category-management/settings.gjs
new file mode 100644
index 00000000000..57e96fa83a0
--- /dev/null
+++ b/frontend/discourse/admin/templates/admin-config/category-management/settings.gjs
@@ -0,0 +1,11 @@
+import AdminAreaSettings from "discourse/admin/components/admin-area-settings";
+
+export default <template>
+ <AdminAreaSettings
+ @area="categories"
+ @path="/admin/config/category-management"
+ @filter={{@controller.filter}}
+ @adminSettingsFilterChangedCallback={{@controller.adminSettingsFilterChangedCallback}}
+ @showBreadcrumb={{false}}
+ />
+</template>
diff --git a/frontend/discourse/admin/templates/admin-config/category-management/type.gjs b/frontend/discourse/admin/templates/admin-config/category-management/type.gjs
new file mode 100644
index 00000000000..5a464b05500
--- /dev/null
+++ b/frontend/discourse/admin/templates/admin-config/category-management/type.gjs
@@ -0,0 +1,5 @@
+import AdminCategoryManagementList from "discourse/admin/components/admin-category-management-list";
+
+export default <template>
+ <AdminCategoryManagementList @categoryType={{@model}} />
+</template>
diff --git a/frontend/discourse/admin/templates/new-category/setup.gjs b/frontend/discourse/admin/templates/new-category/setup.gjs
index 0551139085b..ae64b4eab57 100644
--- a/frontend/discourse/admin/templates/new-category/setup.gjs
+++ b/frontend/discourse/admin/templates/new-category/setup.gjs
@@ -3,7 +3,7 @@ import DPageHeader from "discourse/ui-kit/d-page-header";
import { i18n } from "discourse-i18n";
export default <template>
- <div class="edit-category admin-new-category-setup">
+ <div class="edit-category">
<DPageHeader @titleLabel={{i18n "category.choose_type.title"}} />
<CategoryTypeCards @types={{@model.types}} @counts={{@model.counts}} />
</div>
diff --git a/frontend/discourse/app/lib/sidebar/admin-nav-map.js b/frontend/discourse/app/lib/sidebar/admin-nav-map.js
index ce09e7c5f4f..64465e45ee5 100644
--- a/frontend/discourse/app/lib/sidebar/admin-nav-map.js
+++ b/frontend/discourse/app/lib/sidebar/admin-nav-map.js
@@ -101,6 +101,16 @@ export const ADMIN_NAV_MAP = [
settings_area: "categories_and_tags",
multi_tabbed: true,
},
+ {
+ name: "admin_category_management",
+ route: "adminConfig.categoryManagement",
+ label: "admin.config.category_management.title",
+ description: "admin.config.category_management.header_description",
+ keywords: "admin.config.category_management.keywords",
+ icon: "folder",
+ settings_area: "categories_and_tags",
+ multi_tabbed: true,
+ },
{
name: "admin_badges",
route: "adminBadges",
diff --git a/plugins/discourse-solved/spec/system/admin_category_management_support_spec.rb b/plugins/discourse-solved/spec/system/admin_category_management_support_spec.rb
new file mode 100644
index 00000000000..4c7e1db8571
--- /dev/null
+++ b/plugins/discourse-solved/spec/system/admin_category_management_support_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+RSpec.describe "Admin category management support tab" do
+ fab!(:admin)
+
+ fab!(:support_category) do
+ Fabricate(
+ :category,
+ name: "Support Queue",
+ slug: "support-queue",
+ description: "Questions that need accepted answers.",
+ topic_count: 9,
+ ).tap do |category|
+ DiscourseSolved::Categories::Types::Support.configure_category(
+ category,
+ guardian: admin.guardian,
+ )
+ end
+ end
+
+ fab!(:discussion_category) do
+ Fabricate(
+ :category,
+ name: "General Discussion",
+ slug: "general-discussion",
+ description: "Open community conversation.",
+ topic_count: 4,
+ )
+ end
+
+ let(:category_management_page) { PageObjects::Pages::AdminCategoryManagement.new }
+
+ before do
+ SiteSetting.solved_enabled = true
+ sign_in(admin)
+ end
+
+ it "lets admins see only support categories" do
+ category_management_page.visit_support
+
+ expect(category_management_page).to have_category(support_category)
+ expect(category_management_page).to have_no_category(discussion_category)
+ end
+end
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index ae62da79da0..5a9208428f2 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -99,6 +99,30 @@ RSpec.describe Category do
end
end
+ describe ".matching_name_or_slug_ref" do
+ fab!(:guides_category) { Fabricate(:category, name: "Alpha Guides", slug: "alpha-guides") }
+ fab!(:support_category) { Fabricate(:category, name: "Support", slug: "support") }
+ fab!(:bugs_subcategory) do
+ Fabricate(:category, name: "Bug reports", slug: "bugs", parent_category: support_category)
+ end
+
+ it "matches category names, slugs, and parent slug refs" do
+ expect(Category.matching_name_or_slug_ref("alpha")).to contain_exactly(guides_category)
+ expect(Category.matching_name_or_slug_ref("#alpha-guides")).to contain_exactly(
+ guides_category,
+ )
+ expect(Category.matching_name_or_slug_ref("support/bugs")).to contain_exactly(
+ bugs_subcategory,
+ )
+ end
+
+ it "returns the current relation when the filter is blank" do
+ expect(
+ Category.where(id: guides_category.id).matching_name_or_slug_ref(" "),
+ ).to contain_exactly(guides_category)
+ end
+ end
+
describe "#topic_posting_review_mode" do
fab!(:category)
fab!(:group)
diff --git a/spec/requests/admin/config/category_management_controller_spec.rb b/spec/requests/admin/config/category_management_controller_spec.rb
new file mode 100644
index 00000000000..7c59288b00d
--- /dev/null
+++ b/spec/requests/admin/config/category_management_controller_spec.rb
@@ -0,0 +1,184 @@
+# frozen_string_literal: true
+
+RSpec.describe Admin::Config::CategoryManagementController do
+ fab!(:admin)
+
+ describe "#categories" do
+ before { sign_in(admin) }
+
+ around do |example|
+ types = Categories::TypeRegistry.all.dup
+ owners = types.keys.index_with { |type_id| Categories::TypeRegistry.owner(type_id) }
+
+ example.run
+ ensure
+ Categories::TypeRegistry.instance_variable_set(:@types, types)
+ Categories::TypeRegistry.instance_variable_set(:@owners, owners)
+ end
+
+ it "returns discussion categories with hierarchy data" do
+ SiteSetting.max_category_nesting = 3
+
+ parent = Fabricate(:category, name: "Knowledge", slug: "knowledge")
+ child = Fabricate(:category, name: "Guides", slug: "guides", parent_category: parent)
+ grandchild = Fabricate(:category, name: "API", slug: "api", parent_category: child)
+
+ get "/admin/config/category-management/categories.json",
+ params: {
+ type: "discussion",
+ filter: "API",
+ }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["categories"]).to contain_exactly(
+ a_hash_including(
+ "id" => grandchild.id,
+ "badge_chain" => [
+ a_hash_including("id" => parent.id, "name" => "Knowledge"),
+ a_hash_including("id" => child.id, "name" => "Guides"),
+ a_hash_including("id" => grandchild.id, "name" => "API"),
+ ],
+ "edit_url" => "/c/knowledge/guides/api/edit/general",
+ ),
+ )
+ end
+
+ it "returns all, discussion-only, and typed categories" do
+ typed_category = Fabricate(:category, name: "Virtual all typed", slug: "virtual-all-typed")
+ discussion_category =
+ Fabricate(:category, name: "Virtual all discussion", slug: "virtual-all-discussion")
+
+ fake_type =
+ Class.new(Categories::Types::Base) do
+ class << self
+ attr_accessor :matching_category_ids
+
+ def type_id
+ :test_admin_type
+ end
+
+ def category_matches?(category)
+ matching_category_ids.include?(category.id)
+ end
+
+ def find_matches
+ Category.where(id: matching_category_ids)
+ end
+ end
+ end
+ fake_type.matching_category_ids = [typed_category.id]
+ Categories::TypeRegistry.register(fake_type)
+
+ get "/admin/config/category-management/categories.json", params: { type: "test_admin_type" }
+
+ expect(response.status).to eq(200)
+ expect(
+ response.parsed_body["categories"].map { |category| category["id"] },
+ ).to contain_exactly(typed_category.id)
+
+ get "/admin/config/category-management/categories.json",
+ params: {
+ type: "all",
+ filter: "Virtual all",
+ }
+
+ expect(
+ response.parsed_body["categories"].map { |category| category["id"] },
+ ).to contain_exactly(discussion_category.id, typed_category.id)
+ expect(
+ response.parsed_body["categories"].find { |category| category["id"] == typed_category.id }[
+ "category_types"
+ ],
+ ).to contain_exactly(
+ a_hash_including("id" => "discussion", "name" => "Discussion"),
+ a_hash_including("id" => "test_admin_type", "name" => "Test Admin Type"),
+ )
+
+ get "/admin/config/category-management/categories.json",
+ params: {
+ type: "discussion",
+ filter: "Virtual all",
+ }
+
+ expect(
+ response.parsed_body["categories"].map { |category| category["id"] },
+ ).to contain_exactly(discussion_category.id)
+ end
+
+ it "filters categories by hashtag reference" do
+ parent = Fabricate(:category, name: "Project parent", slug: "project-parent")
+ child =
+ Fabricate(:category, name: "Project child", slug: "project-child", parent_category: parent)
+
+ get "/admin/config/category-management/categories.json",
+ params: {
+ type: "discussion",
+ filter: "#project-parent::project-child",
+ }
+
+ expect(response.status).to eq(200)
+ expect(
+ response.parsed_body["categories"].map { |category| category["id"] },
+ ).to contain_exactly(child.id)
+ end
+
+ it "orders categories by name and paginates results" do
+ third = Fabricate(:category, name: "Paginated category Charlie")
+ first = Fabricate(:category, name: "Paginated category Alpha")
+ second = Fabricate(:category, name: "Paginated category Bravo")
+
+ get "/admin/config/category-management/categories.json",
+ params: {
+ type: "discussion",
+ filter: "Paginated category",
+ per_page: 2,
+ }
+
+ expect(response.parsed_body).to include(
+ "categories" => [a_hash_including("id" => first.id), a_hash_including("id" => second.id)],
+ "has_more" => true,
+ )
+
+ get "/admin/config/category-management/categories.json",
+ params: {
+ type: "discussion",
+ filter: "Paginated category",
+ per_page: 2,
+ page: 1,
+ }
+
+ expect(response.parsed_body).to include(
+ "categories" => [a_hash_including("id" => third.id)],
+ "has_more" => false,
+ )
+ end
+
+ it "filters categories by visibility" do
+ public_category = Fabricate(:category, name: "Visible public category")
+ restricted_category =
+ Fabricate(:private_category, group: Group[:admins], name: "Visible restricted category")
+
+ get "/admin/config/category-management/categories.json",
+ params: {
+ type: "discussion",
+ filter: "Visible",
+ visibility: "public",
+ }
+
+ expect(
+ response.parsed_body["categories"].map { |category| category["id"] },
+ ).to contain_exactly(public_category.id)
+
+ get "/admin/config/category-management/categories.json",
+ params: {
+ type: "discussion",
+ filter: "Visible",
+ visibility: "restricted",
+ }
+
+ expect(
+ response.parsed_body["categories"].map { |category| category["id"] },
+ ).to contain_exactly(restricted_category.id)
+ end
+ end
+end
diff --git a/spec/requests/api/schemas/json/site_response.json b/spec/requests/api/schemas/json/site_response.json
index c7f3e66b62c..0af5d19473d 100644
--- a/spec/requests/api/schemas/json/site_response.json
+++ b/spec/requests/api/schemas/json/site_response.json
@@ -983,6 +983,50 @@
"items": {
"type": "string"
}
+ },
+ "category_types": {
+ "type": "array",
+ "items": {
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "id": {
+ "type": "string"
+ },
+ "name": {
+ "type": "string"
+ },
+ "title": {
+ "type": "string"
+ },
+ "description": {
+ "type": "string"
+ },
+ "icon": {
+ "type": "string"
+ },
+ "available": {
+ "type": "boolean"
+ },
+ "visible": {
+ "type": "boolean"
+ },
+ "configuration_schema": {
+ "type": "object",
+ "additionalProperties": true
+ }
+ },
+ "required": [
+ "id",
+ "name",
+ "title",
+ "description",
+ "icon",
+ "available",
+ "visible",
+ "configuration_schema"
+ ]
+ }
}
},
"required": [
diff --git a/spec/serializers/admin_category_serializer_spec.rb b/spec/serializers/admin_category_serializer_spec.rb
new file mode 100644
index 00000000000..1fdd2d54513
--- /dev/null
+++ b/spec/serializers/admin_category_serializer_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+RSpec.describe AdminCategorySerializer do
+ fab!(:admin)
+
+ it "serializes admin category management data" do
+ parent = Fabricate(:category, name: "Knowledge", slug: "knowledge")
+ child = Fabricate(:category, name: "Guides", slug: "guides", parent_category: parent)
+
+ serialized = described_class.new(child, scope: Guardian.new(admin), root: false).as_json
+
+ expect(serialized).to include(
+ id: child.id,
+ badge_chain: [
+ a_hash_including(id: parent.id, name: "Knowledge", parent_category_id: nil),
+ a_hash_including(id: child.id, name: "Guides", parent_category_id: parent.id),
+ ],
+ category_types: [a_hash_including(id: :discussion, name: "Discussion")],
+ description_text: child.description_text,
+ read_restricted: false,
+ topic_count: child.topic_count,
+ edit_url: "/c/knowledge/guides/edit/general",
+ )
+ end
+end
diff --git a/spec/services/list_admin_categories_spec.rb b/spec/services/list_admin_categories_spec.rb
new file mode 100644
index 00000000000..2383af0e6c4
--- /dev/null
+++ b/spec/services/list_admin_categories_spec.rb
@@ -0,0 +1,160 @@
+# frozen_string_literal: true
+
+RSpec.describe ListAdminCategories do
+ describe described_class::Contract, type: :model do
+ it { is_expected.to allow_values(1, ListAdminCategories::MAX_PER_PAGE).for(:per_page) }
+ it { is_expected.not_to allow_values(0, ListAdminCategories::MAX_PER_PAGE + 1).for(:per_page) }
+ it { is_expected.to allow_values(0, 1).for(:page) }
+ it { is_expected.not_to allow_values(-1).for(:page) }
+
+ it "defaults to the discussion category type" do
+ contract = described_class.new(type: nil)
+
+ contract.valid?
+
+ expect(contract.type_id).to eq("discussion")
+ end
+ end
+
+ describe ".call" do
+ subject(:result) { described_class.call(params:, **dependencies) }
+
+ fab!(:admin)
+ fab!(:alpha_category) { Fabricate(:category, name: "Alpha", slug: "alpha") }
+ fab!(:beta_category) { Fabricate(:category, name: "Beta", slug: "beta") }
+
+ let(:params) { { type: "all", page: 0, per_page: 2 } }
+ let(:dependencies) { { guardian: admin.guardian } }
+
+ around do |example|
+ types = Categories::TypeRegistry.all.dup
+ owners = types.keys.index_with { |type_id| Categories::TypeRegistry.owner(type_id) }
+
+ example.run
+ ensure
+ Categories::TypeRegistry.instance_variable_set(:@types, types)
+ Categories::TypeRegistry.instance_variable_set(:@owners, owners)
+ end
+
+ context "when contract is invalid" do
+ let(:params) { super().merge(per_page: 0) }
+
+ it { is_expected.to fail_a_contract }
+ end
+
+ context "when category type is unknown" do
+ let(:params) { super().merge(type: "unknown") }
+
+ it { is_expected.to fail_a_policy(:category_type_exists) }
+ end
+
+ context "when everything is valid" do
+ fab!(:gamma_category) { Fabricate(:category, name: "Gamma", slug: "gamma") }
+
+ it { is_expected.to run_successfully }
+
+ it "returns the first page of ordered categories with pagination state" do
+ expect(result.category_page[:categories]).to eq([alpha_category, beta_category])
+ expect(result.category_page[:has_more]).to eq(true)
+ end
+
+ context "with a later page" do
+ let(:params) { super().merge(page: 1) }
+
+ it "returns categories offset by the requested page" do
+ expect(result.category_page[:categories].first).to eq(gamma_category)
+ expect(result.category_page[:has_more]).to eq(false)
+ end
+ end
+ end
+
+ context "with a filter" do
+ let(:params) { super().merge(filter: "alp") }
+
+ it "returns matching categories" do
+ expect(result.category_page[:categories]).to contain_exactly(alpha_category)
+ end
+ end
+
+ context "with public visibility" do
+ fab!(:private_group, :group)
+ fab!(:restricted_category) do
+ Fabricate(:private_category, group: private_group, name: "Restricted")
+ end
+
+ let(:params) { super().merge(visibility: "public") }
+
+ it "returns only public categories" do
+ expect(result.category_page[:categories]).to contain_exactly(alpha_category, beta_category)
+ end
+ end
+
+ context "with restricted visibility" do
+ fab!(:private_group, :group)
+ fab!(:restricted_category) do
+ Fabricate(:private_category, group: private_group, name: "Restricted")
+ end
+
+ let(:params) { super().merge(visibility: "restricted") }
+
+ it "returns only restricted categories" do
+ expect(result.category_page[:categories]).to contain_exactly(restricted_category)
+ end
+ end
+
+ context "with a category type filter" do
+ let(:test_type) do
+ Class.new(Categories::Types::Base) do
+ type_id :test_list_admin_categories
+
+ define_singleton_method(:category_matches?) { |category| category.name == "Alpha" }
+
+ define_singleton_method(:find_matches) { Category.where(name: "Alpha") }
+ end
+ end
+ let(:params) { super().merge(type: "test_list_admin_categories") }
+
+ before { Categories::TypeRegistry.register(test_type) }
+
+ it "returns categories matching the requested category type" do
+ expect(result.category_page[:categories]).to contain_exactly(alpha_category)
+ end
+ end
+
+ context "with preloaded category custom fields" do
+ before do
+ Site.reset_preloaded_category_custom_fields
+ Site.preloaded_category_custom_fields << "list_admin_categories_field"
+ alpha_category.custom_fields["list_admin_categories_field"] = "alpha value"
+ beta_category.custom_fields["list_admin_categories_field"] = "beta value"
+ alpha_category.save_custom_fields
+ beta_category.save_custom_fields
+ end
+
+ after { Site.reset_preloaded_category_custom_fields }
+
+ it "makes registered custom fields available without per-category refresh queries" do
+ result
+
+ queries =
+ track_sql_queries do
+ result.category_page[:categories].map do |category|
+ category.custom_fields["list_admin_categories_field"]
+ end
+ end
+
+ values =
+ result.category_page[:categories].map do |category|
+ category.custom_fields["list_admin_categories_field"]
+ end
+
+ expect(values).to eq(["alpha value", "beta value"])
+ expect(
+ queries.grep(
+ /FROM "category_custom_fields".*WHERE "category_custom_fields"."category_id"/,
+ ),
+ ).to be_empty
+ end
+ end
+ end
+end
diff --git a/spec/system/admin_category_management_spec.rb b/spec/system/admin_category_management_spec.rb
new file mode 100644
index 00000000000..d6fe1f90e5f
--- /dev/null
+++ b/spec/system/admin_category_management_spec.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+RSpec.describe "Admin category management" do
+ fab!(:admin)
+
+ fab!(:public_category) do
+ Fabricate(
+ :category,
+ name: "Alpha Guides",
+ slug: "alpha-guides",
+ description: "Documentation and onboarding articles.",
+ icon: "wrench",
+ style_type: "icon",
+ topic_count: 12,
+ )
+ end
+
+ fab!(:restricted_category) do
+ Fabricate(
+ :private_category,
+ group: Group[:staff],
+ name: "Beta Staff",
+ slug: "beta-staff",
+ description: "Private coordination for staff.",
+ emoji: "rocket",
+ style_type: "emoji",
+ topic_count: 3,
+ )
+ end
+
+ let(:category_management_page) { PageObjects::Pages::AdminCategoryManagement.new }
+
+ before { sign_in(admin) }
+
+ it "lets admins review and filter all categories", :aggregate_failures do
+ category_management_page.visit_all
+
+ expect(category_management_page).to have_category_details(
+ public_category,
+ description: "Documentation and onboarding articles.",
+ visibility: I18n.t("admin_js.admin.config.category_management.visibility.public"),
+ topic_count: 12,
+ )
+ expect(category_management_page).to have_category_icon(public_category)
+ expect(category_management_page).to have_open_settings_link(public_category)
+ expect(category_management_page).to have_category_details(
+ restricted_category,
+ description: "Private coordination for staff.",
+ visibility: I18n.t("admin_js.admin.config.category_management.visibility.restricted"),
+ topic_count: 3,
+ )
+ expect(category_management_page).to have_category_emoji(restricted_category)
+
+ category_management_page.filter_by_name("Alpha")
+
+ expect(category_management_page).to have_category(public_category)
+ expect(category_management_page).to have_no_category(restricted_category)
+
+ category_management_page.open_settings(public_category)
+ expect(page).to have_current_path("#{public_category.slug_url_without_id}/edit/general")
+ end
+end
diff --git a/spec/system/page_objects/pages/admin_category_management.rb b/spec/system/page_objects/pages/admin_category_management.rb
new file mode 100644
index 00000000000..00454c1be6a
--- /dev/null
+++ b/spec/system/page_objects/pages/admin_category_management.rb
@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module PageObjects
+ module Pages
+ class AdminCategoryManagement < AdminBase
+ ROW_SELECTOR = ".admin-category-management-list__table .d-table__row"
+
+ def visit_all
+ page.visit("/admin/config/category-management/all")
+ end
+
+ def visit_support
+ page.visit("/admin/config/category-management/support")
+ end
+
+ def filter_controls
+ PageObjects::Components::AdminFilterControls.new(".admin-filter-controls")
+ end
+
+ def filter_by_name(name)
+ filter_controls.type_in_search(name)
+ end
+
+ def open_settings(category)
+ row(category).find(".admin-category-management-list__open-settings").click
+ end
+
+ def has_category?(category)
+ page.has_css?(row_selector(category))
+ end
+
+ def has_no_category?(category)
+ page.has_no_css?(row_selector(category))
+ end
+
+ def has_category_details?(category, description:, visibility:, topic_count:)
+ page.has_css?(category_badge_selector(category), text: category.name) &&
+ page.has_css?(
+ "#{row_selector(category)} .admin-category-management-list__description",
+ text: description,
+ ) &&
+ page.has_css?(
+ "#{row_selector(category)} .admin-category-management-list__visibility",
+ text: visibility,
+ ) &&
+ page.has_css?(
+ "#{row_selector(category)} .admin-category-management-list__topic-count",
+ text: topic_count.to_s,
+ )
+ end
+
+ def has_category_icon?(category)
+ page.has_css?("#{category_badge_selector(category)} .d-icon-#{category.icon}")
+ end
+
+ def has_category_emoji?(category)
+ page.has_css?("#{category_badge_selector(category)} img.emoji[title='#{category.emoji}']")
+ end
+
+ def has_open_settings_link?(category)
+ page.has_css?(
+ "#{row_selector(category)} .admin-category-management-list__open-settings[href='#{category.slug_url_without_id}/edit/general']",
+ )
+ end
+
+ private
+
+ def row(category)
+ page.find(row_selector(category))
+ end
+
+ def row_selector(category)
+ "#{ROW_SELECTOR}[data-category-id='#{category.id}']"
+ end
+
+ def category_badge_selector(category)
+ "#{row_selector(category)} .admin-category-management-list__category-badges .badge-category[data-category-id='#{category.id}']"
+ end
+ end
+ end
+end