Skip to content

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

FIX: highlight the "All site settings" admin sidebar link (#43530)

David Taylora39a24e42ded
diff --git a/frontend/discourse/app/lib/sidebar/admin-nav-map.js b/frontend/discourse/app/lib/sidebar/admin-nav-map.js
index 67296f4a2da..2a6fb6df379 100644
--- a/frontend/discourse/app/lib/sidebar/admin-nav-map.js
+++ b/frontend/discourse/app/lib/sidebar/admin-nav-map.js
@@ -31,7 +31,8 @@ export const ADMIN_NAV_MAP = [
{
name: "admin_all_site_settings",
route: "adminSiteSettingsCategory",
- routeModels: ["all_settings"],
+ routeModels: ["all_results"],
+ currentWhen: "adminSiteSettingsCategory",
label: "admin.config.site_settings.title",
description: "admin.config.site_settings.header_description",
icon: "gear",
diff --git a/spec/system/admin_sidebar_navigation_spec.rb b/spec/system/admin_sidebar_navigation_spec.rb
index 3f80d9d5e96..d3e744eb353 100644
--- a/spec/system/admin_sidebar_navigation_spec.rb
+++ b/spec/system/admin_sidebar_navigation_spec.rb
@@ -146,6 +146,14 @@ describe "Admin | Sidebar Navigation" do
)
end
+ it "highlights the 'All site settings' link on the all settings page" do
+ visit("/admin/site_settings/category/all_results")
+
+ expect(page).to have_css(
+ '.sidebar-section-link-wrapper[data-list-item-name="admin_all_site_settings"] a.active',
+ )
+ end
+
it "does not show the button to customize sidebar sections, that is only supported in the main panel" do
visit("/")
expect(sidebar).to have_add_section_button