A platform for community discussion. Free, open, simple.
FIX: Stop applying a color palette that is no longer user selectable (#40974)
Krzysztof Kotlarek6cc0544d5e34
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rbindex 6d509ad10bd..b9f8ff9cde6 100644--- a/app/helpers/application_helper.rb+++ b/app/helpers/application_helper.rb@@ -667,7 +667,11 @@ module ApplicationHelperdef user_scheme_idreturn @user_scheme_id if defined?(@user_scheme_id)scheme_id = cookies[:color_scheme_id] || current_user&.user_option&.color_scheme_id- @user_scheme_id = scheme_id if scheme_id && ColorScheme.find_by_id(scheme_id)+ @user_scheme_id = scheme_id if scheme_id &&+ (+ ColorScheme.exists?(id: scheme_id, user_selectable: true) ||+ theme&.color_scheme_id == scheme_id.to_i+ )enddef scheme_id@@ -683,10 +687,18 @@ module ApplicationHelper@scheme_id = Theme.where(id: theme_id).pick(:color_scheme_id)end+ def theme+ @theme = theme_id ? Theme.find_by_id(theme_id) : Theme.find_default+ end+def user_dark_scheme_idreturn @user_dark_scheme_id if defined?(@user_dark_scheme_id)scheme_id = cookies[:dark_scheme_id] || current_user&.user_option&.dark_scheme_id- @user_dark_scheme_id = scheme_id if scheme_id && ColorScheme.find_by_id(scheme_id)+ @user_dark_scheme_id = scheme_id if scheme_id &&+ (+ ColorScheme.exists?(id: scheme_id, user_selectable: true) ||+ theme&.dark_color_scheme_id == scheme_id.to_i+ )enddef dark_scheme_iddiff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rbindex f449416a377..c5eb6b030b1 100644--- a/spec/helpers/application_helper_spec.rb+++ b/spec/helpers/application_helper_spec.rb@@ -860,7 +860,7 @@ RSpec.describe ApplicationHelper docontext "with custom light scheme" dobefore do- @new_cs = Fabricate(:color_scheme, name: "Flamboyant")+ @new_cs = Fabricate(:color_scheme, name: "Flamboyant", user_selectable: true)user.user_option.color_scheme_id = @new_cs.iduser.user_option.save!helper.request.env[Auth::DefaultCurrentUserProvider::CURRENT_USER_KEY] = user@@ -871,6 +871,22 @@ RSpec.describe ApplicationHelper doexpect(color_stylesheets).to include("color_definitions_flamboyant")end+ it "falls back to base scheme when the scheme is no longer user selectable" do+ @new_cs.update!(user_selectable: false)++ color_stylesheets = helper.discourse_color_scheme_stylesheets+ expect(color_stylesheets).not_to include("color_definitions_flamboyant")+ expect(color_stylesheets).to include("color_definitions_light-default")+ end++ it "keeps a non-user-selectable scheme that is the theme's own color scheme" do+ @new_cs.update!(user_selectable: false)+ Theme.find_default.update!(color_scheme_id: @new_cs.id)++ color_stylesheets = helper.discourse_color_scheme_stylesheets+ expect(color_stylesheets).to include("color_definitions_flamboyant")+ end+it "returns color scheme from cookie value" docs = ColorScheme.where(name: "Dark").firsthelper.request.cookies["color_scheme_id"] = cs.id@@ -895,7 +911,7 @@ RSpec.describe ApplicationHelper douser.user_option.interface_color_mode = UserOption::LIGHT_MODEuser.user_option.save!helper.request.env[Auth::DefaultCurrentUserProvider::CURRENT_USER_KEY] = user- @new_cs = Fabricate(:color_scheme, name: "Custom Color Scheme")+ @new_cs = Fabricate(:color_scheme, name: "Custom Color Scheme", user_selectable: true)Theme.find_default.update!(dark_color_scheme_id: ColorScheme.where(name: "Dark").pick(:id))end@@ -976,12 +992,12 @@ RSpec.describe ApplicationHelper dodescribe "#discourse_theme_color_meta_tags" dobefore do- light = Fabricate(:color_scheme)+ light = Fabricate(:color_scheme, user_selectable: true)light.color_scheme_colors << ColorSchemeColor.new(name: "header_background", hex: "abcdef")light.save!helper.request.cookies["color_scheme_id"] = light.id- dark = Fabricate(:color_scheme)+ dark = Fabricate(:color_scheme, user_selectable: true)dark.color_scheme_colors << ColorSchemeColor.new(name: "header_background", hex: "defabc")dark.save!helper.request.cookies["dark_scheme_id"] = dark.id@@ -1035,7 +1051,7 @@ RSpec.describe ApplicationHelper doendit "renders a 'light dark' color-scheme if a dark scheme is set" do- dark = Fabricate(:color_scheme)+ dark = Fabricate(:color_scheme, user_selectable: true)dark.save!helper.request.cookies["dark_scheme_id"] = dark.id@@ -1046,8 +1062,8 @@ RSpec.describe ApplicationHelper doenddescribe "#dark_scheme_id" do- fab!(:dark_scheme, :color_scheme)- fab!(:light_scheme, :color_scheme)+ fab!(:dark_scheme) { Fabricate(:color_scheme, user_selectable: true) }+ fab!(:light_scheme) { Fabricate(:color_scheme, user_selectable: true) }before dohelper.request.cookies["color_scheme_id"] = light_scheme.iddiff --git a/spec/system/admin_color_palette_config_area_spec.rb b/spec/system/admin_color_palette_config_area_spec.rbindex 2930f6fb707..79da64aefc0 100644--- a/spec/system/admin_color_palette_config_area_spec.rb+++ b/spec/system/admin_color_palette_config_area_spec.rb@@ -160,6 +160,7 @@ describe "Admin Color Palette Config Area Page" doendit "applies the changes live when editing the currently active palette" do+ color_scheme.update!(user_selectable: true)admin.user_option.update!(color_scheme_id: color_scheme.id)config_area.visit(color_scheme.id)config_area.color_palette_editor.input_for_color("secondary").fill_in(with: "#aa339f")diff --git a/spec/system/admin_color_palettes_config_area_spec.rb b/spec/system/admin_color_palettes_config_area_spec.rbindex bc723b10086..31682149784 100644--- a/spec/system/admin_color_palettes_config_area_spec.rb+++ b/spec/system/admin_color_palettes_config_area_spec.rb@@ -248,7 +248,7 @@ describe "Admin Color Palettes Config Area Page" doendit "shows toast when admin cannot see live preview" do- custom_scheme = Fabricate(:color_scheme, name: "Custom Scheme")+ custom_scheme = Fabricate(:color_scheme, name: "Custom Scheme", user_selectable: true)admin.user_option.update!(theme_ids: [Theme.find_default.id],color_scheme_id: custom_scheme.id,diff --git a/spec/system/interface_color_selector_spec.rb b/spec/system/interface_color_selector_spec.rbindex 165e5a717b5..6ccc76dc6f6 100644--- a/spec/system/interface_color_selector_spec.rb+++ b/spec/system/interface_color_selector_spec.rb@@ -64,6 +64,7 @@ describe "Interface color selector" doendit "is not available if the user uses the same scheme for dark mode as the light mode" do+ light_scheme.update!(user_selectable: true)user.user_option.update!(color_scheme_id: light_scheme.id, dark_scheme_id: light_scheme.id)sign_in(user)