From d1f1f0e64d68f22b77606d8f47e763d70e53aba9 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Wed, 6 Nov 2024 13:29:53 +0000
Subject: [PATCH] Ensure the app-filter-toggle class is always present
 regardless of the user's permissions, you can move it outside of the
 conditional logic

---
 app/components/create_log_actions_component.html.erb |  4 ++--
 app/views/organisations/schemes.html.erb             | 11 ++++++-----
 app/views/schemes/index.html.erb                     | 10 +++++-----
 app/views/users/index.html.erb                       |  6 +++---
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/components/create_log_actions_component.html.erb b/app/components/create_log_actions_component.html.erb
index 2e88034d7..824acedd9 100644
--- a/app/components/create_log_actions_component.html.erb
+++ b/app/components/create_log_actions_component.html.erb
@@ -1,5 +1,5 @@
+<div class="govuk-button-group app-filter-toggle <%= 'govuk-!-margin-bottom-6' if display_actions? %>">
 <% if display_actions? %>
-  <div class="govuk-button-group app-filter-toggle govuk-!-margin-bottom-6">
     <%= govuk_button_to create_button_copy, create_button_href, class: "govuk-!-margin-right-3" %>
     <% unless user.support? %>
     <%= govuk_button_link_to upload_button_copy, upload_button_href, secondary: true %>
@@ -7,5 +7,5 @@
     <% if user.support? %>
       <%= govuk_button_link_to view_uploads_button_copy, view_uploads_button_href, secondary: true %>
     <% end %>
-  </div>
 <% end %>
+</div>
diff --git a/app/views/organisations/schemes.html.erb b/app/views/organisations/schemes.html.erb
index 0fda1d359..2b382e780 100644
--- a/app/views/organisations/schemes.html.erb
+++ b/app/views/organisations/schemes.html.erb
@@ -22,11 +22,12 @@
 <% end %>
 
 <div class="app-filter-layout" data-controller="filter-layout">
-  <% if SchemePolicy.new(current_user, nil).create? %>
-    <div class="govuk-button-group app-filter-toggle govuk-!-margin-bottom-6">
-      <%= govuk_button_link_to "Create a new supported housing scheme", new_scheme_path, html: { method: :post } %>
-    </div>
-  <% end %>
+  <div class="govuk-button-group app-filter-toggle govuk-!-margin-bottom-6">
+    <% if SchemePolicy.new(current_user, nil).create? %>
+        <%= govuk_button_link_to "Create a new supported housing scheme", new_scheme_path, html: { method: :post } %>
+    <% end %>
+  </div>
+
 
   <%= govuk_details(
     classes: "govuk-!-width-two-thirds",
diff --git a/app/views/schemes/index.html.erb b/app/views/schemes/index.html.erb
index 9cbc95fdb..a443a2dae 100644
--- a/app/views/schemes/index.html.erb
+++ b/app/views/schemes/index.html.erb
@@ -6,11 +6,11 @@
 <%= render partial: "organisations/headings", locals: current_user.support? ? { main: "Supported housing schemes", sub: nil } : { main: "Supported housing schemes", sub: current_user.organisation.name } %>
 
 <div class="app-filter-layout" data-controller="filter-layout">
-  <% if SchemePolicy.new(current_user, nil).create? %>
-    <div class="govuk-button-group app-filter-toggle govuk-!-margin-bottom-6">
-      <%= govuk_button_link_to "Create a new supported housing scheme", new_scheme_path, html: { method: :post } %>
-    </div>
-  <% end %>
+  <div class="govuk-button-group app-filter-toggle govuk-!-margin-bottom-6">
+    <% if SchemePolicy.new(current_user, nil).create? %>
+        <%= govuk_button_link_to "Create a new supported housing scheme", new_scheme_path, html: { method: :post } %>
+    <% end %>
+  </div>
   <%= render partial: "schemes/scheme_filters" %>
   <div class="app-filter-layout__content">
     <%= render SearchComponent.new(current_user:, search_label: "Search by postcode, scheme name, scheme code or location name", value: @searched) %>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index dd454464d..c644d200a 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -6,11 +6,11 @@
 <%= render partial: "organisations/headings", locals: current_user.support? ? { main: "Users", sub: nil } : { main: "Users", sub: current_user.organisation.name } %>
 
 <div class="app-filter-layout" data-controller="filter-layout">
-<% if current_user.data_coordinator? || current_user.support? %>
   <div class="govuk-button-group app-filter-toggle govuk-!-margin-bottom-6">
-    <%= govuk_button_link_to "Invite user", new_user_path, html: { method: :get } %>
+    <% if current_user.data_coordinator? || current_user.support? %>
+      <%= govuk_button_link_to "Invite user", new_user_path, html: { method: :get } %>
+    <% end %>
   </div>
-<% end %>
   <%= render partial: "users/user_filters" %>
   <div class="app-filter-layout__content">
     <%= render SearchComponent.new(current_user:, search_label: "Search by name or email address", value: @searched) %>