From 3bd4092d250b2b043d242cd8431ecb256b2c3c07 Mon Sep 17 00:00:00 2001
From: baarkerlounger <db@slothlife.xyz>
Date: Mon, 23 May 2022 17:38:19 +0100
Subject: [PATCH] Only adjust query param if searched

---
 app/controllers/organisations_controller.rb | 1 +
 app/controllers/users_controller.rb         | 1 +
 app/views/users/index.html.erb              | 8 ++++++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/controllers/organisations_controller.rb b/app/controllers/organisations_controller.rb
index 02de8d145..75a483cad 100644
--- a/app/controllers/organisations_controller.rb
+++ b/app/controllers/organisations_controller.rb
@@ -19,6 +19,7 @@ class OrganisationsController < ApplicationController
 
   def users
     @pagy, @users = pagy(filtered_users(@organisation.users))
+    @searched = params["user-search-field"].present?
     render "users/index"
   end
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 0e02f2bf8..d0493a739 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -11,6 +11,7 @@ class UsersController < ApplicationController
     redirect_to users_organisation_path(current_user.organisation) unless current_user.support?
 
     @pagy, @users = pagy(filtered_users(User.all))
+    @searched = params["user-search-field"].present?
 
     respond_to do |format|
       format.html
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 640b5ecb7..ab160f49c 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -29,8 +29,12 @@
 <%= govuk_table do |table| %>
   <%= table.caption(size: "s", classes: %w[govuk-!-text-align-left govuk-!-margin-top-4 govuk-!-margin-bottom-4]) do |caption| %>
     <span class="govuk-!-margin-right-4">
-      <strong><span style="font-weight: normal"> Matches </span><%= @pagy.count %><span style="font-weight: normal"> of </span><%= User.count %> <span style="font-weight: normal"> total users</strong> </span>
-      </span>
+      <% if @searched %>
+        <strong><span style="font-weight: normal"> Matches </span><%= @pagy.count %><span style="font-weight: normal"> of </span><%= User.count %> <span style="font-weight: normal"> total users</strong></span>
+      <% else %>
+        <strong><%= @pagy.count %></strong><span style="font-weight: normal"> total users</span>
+      <% end %>
+    </span>
     <% if current_user.support? %>
       <%= govuk_link_to "Download (CSV)", "/users.csv", type: "text/csv" %>
     <% end %>