Add hidden class helper to banner form and refactor

rubyforgood · Aug 11, 2023 · 19216e4 · 19216e4
1 parent b0baf2b
commit 19216e4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/app/controllers/banners_controller.rb b/app/controllers/banners_controller.rb
@@ -11,14 +11,14 @@ def new
     authorize :application, :admin_or_supervisor?
 
     @banner = Banner.new
-    @has_alternate_active_banner = current_organization.banners.where(active: true).where.not(id: @banner.id).exists?
+    @org_has_alternate_active_banner = current_organization.banners.where(active: true).where.not(id: @banner.id).exists?
   end
 
   def edit
     authorize :application, :admin_or_supervisor?
 
     @banner = current_organization.banners.find(params[:id])
-    @has_alternate_active_banner = current_organization.banners.where(active: true).where.not(id: @banner.id).exists?
+    @org_has_alternate_active_banner = current_organization.banners.where(active: true).where.not(id: @banner.id).exists?
   end
 
   def create

diff --git a/app/helpers/banner_helper.rb b/app/helpers/banner_helper.rb
@@ -0,0 +1,7 @@
+module BannerHelper
+  def conditionally_add_hidden_class(current_banner_is_active)
+    unless current_banner_is_active && @org_has_alternate_active_banner
+      "d-none"
+    end
+  end
+end
diff --git a/app/views/banners/_form.html.erb b/app/views/banners/_form.html.erb
@@ -22,9 +22,9 @@
       <%= form.text_field :name, required: true %>
     </div>
     <div data-controller="reveal" data-reveal-hidden-class="d-none" class="form-check checkbox-style mb-20">
-      <%= form.check_box :active, data: { action: @has_alternate_active_banner && 'click->reveal#toggle' }, class: 'form-check-input' %>
+      <%= form.check_box :active, data: { action: @org_has_alternate_active_banner && 'click->reveal#toggle' }, class: 'form-check-input' %>
       <%= form.label :active, "Active?", class: 'form-check-label' %>
-      <span data-reveal-target="item" class="text-danger<%= form.object.active && @has_alternate_active_banner ? '' : ' d-none' %>">Warning: This will replace your current active banner</span>
+      <span data-reveal-target="item" class="text-danger <%= conditionally_add_hidden_class(form.object.active) %>">Warning: This will replace your current active banner</span>
     </div>
     <div class="input-style-1">
       <%= form.label :content %>

diff --git a/app/views/banners/edit.html.erb b/app/views/banners/edit.html.erb
@@ -1 +1 @@
-<%= render 'banners/form', banner: @banner, has_alternate_active_banner: @has_alternate_active_banner %>
+<%= render 'banners/form', banner: @banner, org_has_alternate_active_banner: @org_has_alternate_active_banner %>
diff --git a/app/views/banners/new.html.erb b/app/views/banners/new.html.erb
@@ -1 +1 @@
-<%= render 'banners/form', banner: @banner, has_alternate_active_banner: @has_alternate_active_banner %>
+<%= render 'banners/form', banner: @banner, org_has_alternate_active_banner: @org_has_alternate_active_banner %>