Skip to content

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

DEV: Remove `admin_dashboard_search_section_enabled` hidden site setting (#41016)

Alan Guo Xiang Tan160d84dbe32e
diff --git a/app/services/admin_dashboard_section_configuration.rb b/app/services/admin_dashboard_section_configuration.rb
index 1118057fc7e..70b902cc34d 100644
--- a/app/services/admin_dashboard_section_configuration.rb
+++ b/app/services/admin_dashboard_section_configuration.rb
@@ -5,18 +5,12 @@ class AdminDashboardSectionConfiguration
def self.sections
AdminDashboardSection
- .where(section_id: enabled_sections)
+ .where(section_id: KNOWN_SECTIONS)
.order(:position)
.pluck(:section_id, :visible)
.map { |id, visible| { id:, visible: } }
end
- def self.enabled_sections
- return KNOWN_SECTIONS if SiteSetting.admin_dashboard_search_section_enabled
- KNOWN_SECTIONS - %w[search]
- end
- private_class_method :enabled_sections
-
def self.visible_section_ids
sections.select { |s| s[:visible] }.map { |s| s[:id] }
end
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 3e60a8db59d..891c6d815aa 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2913,7 +2913,6 @@ en:
reporting_improvements: "Improvements to navigation, design, and usability for Discourse's admin reports."
granular_anonymous_and_logged_in_groups_permissions: "Makes group-based site setting permissions treat 'everyone' as 'all logged-in users', and enables the new 'anonymous_users' and 'logged_in_users' pseudogroups so admins can explicitly target anonymous visitors and authenticated users."
dashboard_improvements: "Enables the redesigned admin dashboard that lets you pin custom reports and includes improved site traffic, engagement, and other analytics tied to community success and value."
- admin_dashboard_search_section_enabled: "Show the Search section on the redesigned admin dashboard while it is in testing."
errors:
invalid_css_color: "Invalid color. Enter a color name or hex value."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index ef391f97e12..5aff238874f 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -4596,6 +4596,3 @@ experimental:
admin_dashboard_reports_seeded:
default: false
hidden: true
- admin_dashboard_search_section_enabled:
- default: false
- hidden: true
diff --git a/spec/requests/admin/dashboard_controller_spec.rb b/spec/requests/admin/dashboard_controller_spec.rb
index 38bcb639bf2..0e9076ec8e2 100644
--- a/spec/requests/admin/dashboard_controller_spec.rb
+++ b/spec/requests/admin/dashboard_controller_spec.rb
@@ -8,7 +8,6 @@ RSpec.describe Admin::DashboardController do
before do
AdminDashboardData.stubs(:fetch_cached_stats).returns(reports: [])
Jobs::CallDiscourseHub.any_instance.stubs(:execute).returns(true)
- SiteSetting.admin_dashboard_search_section_enabled = true
end
def configure_dashboard_sections(visible_ids)
@@ -308,19 +307,6 @@ RSpec.describe Admin::DashboardController do
context "with search_data" do
let(:search_data) { section_payloads["search"]&.dig("data") }
- it "omits the search section while admin_dashboard_search_section_enabled is disabled" do
- SiteSetting.admin_dashboard_search_section_enabled = false
- configure_dashboard_sections(%w[search highlights])
-
- get "/admin/dashboard.json"
-
- expect(response.status).to eq(200)
- expect(section_payloads.keys).not_to include("search")
- configuration_ids =
- response.parsed_body["configuration"]["sections"].map { |section| section["id"] }
- expect(configuration_ids).not_to include("search")
- end
-
it "returns the search payload for the selected dates" do
configure_dashboard_sections(%w[search])
member = Fabricate(:user)
diff --git a/spec/services/admin_dashboard_section_configuration_spec.rb b/spec/services/admin_dashboard_section_configuration_spec.rb
index 871b99aff4e..2b6e51764a6 100644
--- a/spec/services/admin_dashboard_section_configuration_spec.rb
+++ b/spec/services/admin_dashboard_section_configuration_spec.rb
@@ -3,22 +3,7 @@
describe AdminDashboardSectionConfiguration do
fab!(:admin)
- before { SiteSetting.admin_dashboard_search_section_enabled = true }
-
describe ".sections" do
- it "omits the search section while admin_dashboard_search_section_enabled is disabled" do
- SiteSetting.admin_dashboard_search_section_enabled = false
-
- expect(described_class.sections).to eq(
- [
- { id: "highlights", visible: true },
- { id: "reports", visible: true },
- { id: "traffic", visible: true },
- { id: "engagement", visible: true },
- ],
- )
- end
-
it "returns every seeded section, all visible, in canonical order by default" do
expect(described_class.sections).to eq(
[
diff --git a/spec/system/admin_dashboard_configure_spec.rb b/spec/system/admin_dashboard_configure_spec.rb
index 1e98defcbb9..3628e84f714 100644
--- a/spec/system/admin_dashboard_configure_spec.rb
+++ b/spec/system/admin_dashboard_configure_spec.rb
@@ -6,10 +6,7 @@ describe "Admin Dashboard Configure menu" do
let(:dashboard) { PageObjects::Pages::AdminDashboard.new }
- before do
- SiteSetting.dashboard_improvements = true
- SiteSetting.admin_dashboard_search_section_enabled = true
- end
+ before { SiteSetting.dashboard_improvements = true }
context "as an admin" do
before { sign_in(admin) }
diff --git a/spec/system/admin_dashboard_redesign/search_section_spec.rb b/spec/system/admin_dashboard_redesign/search_section_spec.rb
index 69dcbc36f26..50171cb48b6 100644
--- a/spec/system/admin_dashboard_redesign/search_section_spec.rb
+++ b/spec/system/admin_dashboard_redesign/search_section_spec.rb
@@ -9,7 +9,6 @@ describe "Admin Dashboard Redesign | Search section" do
before do
SiteSetting.dashboard_improvements = true
- SiteSetting.admin_dashboard_search_section_enabled = true
AdminDashboardSectionConfiguration.update(
[
{ id: "search", visible: true },