From 210de793c4eacd7f9d8d33664a191ed330c2eb7f Mon Sep 17 00:00:00 2001
From: "Sure Admin (bot)" <sure-admin@splashblot.com>
Date: Mon, 7 Sep 2026 13:46:19 -0700
Subject: [PATCH] Fix Sidekiq health banner overlap (#3432)

---
 app/views/layouts/application.html.erb        |  2 ++
 app/views/layouts/settings.html.erb           |  1 +
 app/views/layouts/shared/_htmldoc.html.erb    | 34 ++++++++++++-------
 .../shared/_sidekiq_health_banner.html.erb    |  1 +
 test/system/sidekiq_health_banner_test.rb     | 26 ++++++++++++++
 5 files changed, 51 insertions(+), 13 deletions(-)
 create mode 100644 test/system/sidekiq_health_banner_test.rb

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index e9967775f..f25f2f669 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -207,6 +207,8 @@ end %>
         </div>
       <% end %>
 
+      <%= yield :system_alerts %>
+
       <% if content_for?(:page_header) %>
         <%= yield :page_header %>
       <% end %>
diff --git a/app/views/layouts/settings.html.erb b/app/views/layouts/settings.html.erb
index 761203f47..f14a94eb7 100644
--- a/app/views/layouts/settings.html.erb
+++ b/app/views/layouts/settings.html.erb
@@ -36,6 +36,7 @@
           </div>
 
           <div class="grow space-y-4 px-3 md:px-10 pb-20 pt-4">
+            <%= yield :system_alerts %>
             <%= yield %>
             <%= settings_nav_footer_mobile %>
             <div class="my-4">
diff --git a/app/views/layouts/shared/_htmldoc.html.erb b/app/views/layouts/shared/_htmldoc.html.erb
index 444e053f1..8f8600e21 100644
--- a/app/views/layouts/shared/_htmldoc.html.erb
+++ b/app/views/layouts/shared/_htmldoc.html.erb
@@ -40,19 +40,27 @@
         and for managed-mode deployments — `current_sidekiq_health` returns
         nil in those cases. %>
     <% if Current.user&.super_admin? && current_sidekiq_health && !current_sidekiq_health.healthy? %>
-      <%# Stack below any sticky impersonation bars instead of hard-coding
-          80px (`top-20`). Each bar is ~60px tall (`py-4` + content), so
-          adjust the fixed offset based on how many are visible. %>
-      <% banner_top_class = if super_admin_bar_visible && approval_bar_visible
-                             "top-36"
-                           elsif super_admin_bar_visible || approval_bar_visible
-                             "top-20"
-                           else
-                             "top-4"
-                           end %>
-      <div class="fixed z-40 <%= banner_top_class %> left-1/2 -translate-x-1/2 w-full max-w-2xl px-4">
-        <%= render "shared/sidekiq_health_banner", health: current_sidekiq_health %>
-      </div>
+      <% if sidebar_aware %>
+        <% content_for :system_alerts do %>
+          <div class="mx-auto w-full max-w-2xl">
+            <%= render "shared/sidekiq_health_banner", health: current_sidekiq_health %>
+          </div>
+        <% end %>
+      <% else %>
+        <%# Stack below any sticky impersonation bars instead of hard-coding
+            80px (`top-20`). Each bar is ~60px tall (`py-4` + content), so
+            adjust the fixed offset based on how many are visible. %>
+        <% banner_top_class = if super_admin_bar_visible && approval_bar_visible
+                               "top-36"
+                             elsif super_admin_bar_visible || approval_bar_visible
+                               "top-20"
+                             else
+                               "top-4"
+                             end %>
+        <div class="fixed z-40 <%= banner_top_class %> left-1/2 -translate-x-1/2 w-full max-w-2xl px-4">
+          <%= render "shared/sidekiq_health_banner", health: current_sidekiq_health %>
+        </div>
+      <% end %>
     <% end %>
 
     <%= yield %>
diff --git a/app/views/shared/_sidekiq_health_banner.html.erb b/app/views/shared/_sidekiq_health_banner.html.erb
index 0c3756f12..9827659f0 100644
--- a/app/views/shared/_sidekiq_health_banner.html.erb
+++ b/app/views/shared/_sidekiq_health_banner.html.erb
@@ -11,6 +11,7 @@
 
 <div role="alert"
      aria-live="assertive"
+     data-testid="sidekiq-health-banner"
      class="bg-warning/10 border border-warning/20 rounded-lg p-4 mb-4 text-sm text-primary">
   <div class="flex items-start gap-3">
     <div class="shrink-0">
diff --git a/test/system/sidekiq_health_banner_test.rb b/test/system/sidekiq_health_banner_test.rb
new file mode 100644
index 000000000..c1cf7d514
--- /dev/null
+++ b/test/system/sidekiq_health_banner_test.rb
@@ -0,0 +1,26 @@
+require "application_system_test_case"
+
+class SidekiqHealthBannerTest < ApplicationSystemTestCase
+  setup do
+    @health = Object.new
+    @health.stubs(:healthy?).returns(false)
+    @health.stubs(:reason).returns(:queue_backed_up)
+
+    Rails.application.config.stubs(:app_mode).returns("self_hosted".inquiry)
+    Redis.any_instance.stubs(:ping).returns("PONG")
+    SidekiqHealth.stubs(:current).returns(@health)
+  end
+
+  test "dashboard data warning reserves space instead of overlapping the page header" do
+    sign_in users(:sure_support_staff)
+    visit root_path
+
+    assert_selector "[data-testid='sidekiq-health-banner']"
+
+    banner_rect = page.evaluate_script("document.querySelector('[data-testid=\"sidekiq-health-banner\"]').getBoundingClientRect()")
+    heading_rect = page.evaluate_script("document.querySelector('h1').getBoundingClientRect()")
+
+    assert_operator banner_rect["bottom"], :<=, heading_rect["top"],
+      "expected the stale-data warning to finish above the dashboard heading"
+  end
+end