A platform for community discussion. Free, open, simple.
DEV: Remove alternate `dashboard_improvements` dashboard response (#41106)
Krzysztof Kotlareka714efbd2249
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rbindex e9c29da10f8..8abfac4da89 100644--- a/app/controllers/admin/dashboard_controller.rb+++ b/app/controllers/admin/dashboard_controller.rb@@ -7,7 +7,7 @@ class Admin::DashboardController < Admin::StaffControlleronly: %i[available_reports update_reports_section update_configuration]def index- if dashboard_improvements?+ if UpcomingChanges.enabled_for_user?(:dashboard_improvements, current_user)data = dashboard_sections_payloadelsedata = AdminDashboardIndexData.fetch_cached_stats@@ -152,21 +152,6 @@ class Admin::DashboardController < Admin::StaffControllerDiscourseUpdates.mark_new_features_as_seen(current_user.id)end- def ensure_dashboard_improvements_enabled- raise Discourse::NotFound if !dashboard_improvements?- end-- def dashboard_improvements?- dashboard_improvements_enabled =- UpcomingChanges.enabled_for_user?(:dashboard_improvements, current_user)-- if params[:version] == "alt"- !dashboard_improvements_enabled- else- dashboard_improvements_enabled- end- end-def parse_reports_items_payloadraise Discourse::InvalidParameters.new(:items) if !params[:items].is_a?(Array)if params[:items].size > AdminDashboardReport::VISIBLE_CAPdiff --git a/spec/requests/admin/dashboard_controller_spec.rb b/spec/requests/admin/dashboard_controller_spec.rbindex b6f9f02bc6e..22696c24148 100644--- a/spec/requests/admin/dashboard_controller_spec.rb+++ b/spec/requests/admin/dashboard_controller_spec.rb@@ -369,25 +369,6 @@ RSpec.describe Admin::DashboardController doexpect(response.parsed_body["configuration"]).to be_presentend- it "is returned with version=alt when the admin is not included" do- group = Fabricate(:group)- Fabricate(:site_setting_group, name: "dashboard_improvements", group_ids: group.id.to_s)-- get "/admin/dashboard.json", params: { version: "alt" }-- expect(response.status).to eq(200)- expect(response.parsed_body["sections"]).to be_present- expect(response.parsed_body["configuration"]).to be_present- end-- it "is omitted with version=alt when enabled for the admin" do- get "/admin/dashboard.json", params: { version: "alt" }-- expect(response.status).to eq(200)- expect(response.parsed_body["sections"]).to be_nil- expect(response.parsed_body["configuration"]).to be_nil- end-it "falls back to default dates when date params are malformed" doget "/admin/dashboard.json", params: { start_date: "garbage", end_date: "also-garbage" }