Use a beta toggle for Color themes

mdeniz · Jan 18, 2024 · 6b28cf0 · 6b28cf0
1 parent a475116
commit 6b28cf0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/src/api/app/helpers/webui/webui_helper.rb b/src/api/app/helpers/webui/webui_helper.rb
@@ -326,6 +326,11 @@ def valid_xml_id(rawid)
     rawid = "_#{rawid}" unless /^[A-Za-z_]/.match?(rawid) # xs:ID elements have to start with character or '_'
     CGI.escapeHTML(rawid.gsub(%r{[+&: ./~()@#]}, '_'))
   end
+
+  def theme_from_user
+    return "light" unless feature_enabled?("color_themes")
+    User.session&.color_theme || "system"
+  end
 end
 
 # rubocop:enable Metrics/ModuleLength
diff --git a/src/api/app/models/user.rb b/src/api/app/models/user.rb
@@ -123,7 +123,7 @@ class User < ApplicationRecord
   validates :password, confirmation: true, allow_blank: true
   validates :biography, length: { maximum: MAX_BIOGRAPHY_LENGTH_ALLOWED }
   validates :rss_secret, uniqueness: true, length: { maximum: 200 }, allow_blank: true
-  validates :color_theme, inclusion: { in: color_themes.keys }
+  validates :color_theme, inclusion: { in: color_themes.keys }, if: -> { Flipper.enabled?("color_themes") }
 
   after_create :create_home_project, :measure_create
   after_update :measure_delete

diff --git a/src/api/app/views/layouts/webui/webui.html.haml b/src/api/app/views/layouts/webui/webui.html.haml
@@ -1,5 +1,5 @@
 !!!
-%html{ lang: 'en', "data-bs-theme-from-user": User.session&.color_theme || "system" }
+%html{ lang: 'en', "data-bs-theme-from-user": theme_from_user }
   %head
     %meta{ content: 'charset=utf-8' }/
     %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1, shrink-to-fit=no' }

diff --git a/src/api/app/views/webui/user/_edit_account_form.html.haml b/src/api/app/views/webui/user/_edit_account_form.html.haml
@@ -18,9 +18,10 @@
       %small.form-text#bio-chars-counter
   .mb-3
     = f.text_field(:email, required: true, email: true, placeholder: 'Email', readonly: behind_proxy, class: 'form-control')
-  .mb-3
-    = f.label :color_theme, "Theme"
-    = f.select(:color_theme, options_for_select(User.color_themes.keys), {}, class: 'form-select')
+  - if feature_enabled?("color_themes")
+    .mb-3
+      = f.label :color_theme, "Theme"
+      = f.select(:color_theme, options_for_select(User.color_themes.keys), {}, class: 'form-select')
   .mb-3
   - if behind_proxy
     %p

diff --git a/src/api/config/initializers/flipper.rb b/src/api/config/initializers/flipper.rb
@@ -3,7 +3,8 @@
 # to users in the web UI for beta features.
 ENABLED_FEATURE_TOGGLES = [
   { name: :request_show_redesign, description: 'Redesign of the request pages to improve the collaboration workflow' },
-  { name: :content_moderation, description: 'Reporting inappropriate content' }
+  { name: :content_moderation, description: 'Reporting inappropriate content' },
+  { name: :color_themes, description: 'Color themes' }
 ].freeze
 
 Flipper.configure do