From 994a121c624c6d6f3d9f873492065c695d1d5443 Mon Sep 17 00:00:00 2001
From: Ridhwana <Ridhwana.Khan16@gmail.com>
Date: Fri, 29 Apr 2022 15:59:10 +0200
Subject: [PATCH] feat: add search by email back (#17511)

---
 app/queries/admin/users_query.rb                            | 1 +
 app/views/admin/users/index/_controls.html.erb              | 4 ++--
 .../seededFlows/adminFlows/users/userIndexView.spec.js      | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/queries/admin/users_query.rb b/app/queries/admin/users_query.rb
index 1ffad612e..609187610 100644
--- a/app/queries/admin/users_query.rb
+++ b/app/queries/admin/users_query.rb
@@ -1,6 +1,7 @@
 module Admin
   class UsersQuery
     QUERY_CLAUSE = "users.name ILIKE :search OR " \
+                   "users.email ILIKE :search OR " \
                    "users.username ILIKE :search".freeze
 
     def self.call(relation: User.registered, options: {})
diff --git a/app/views/admin/users/index/_controls.html.erb b/app/views/admin/users/index/_controls.html.erb
index 29a94bc87..8a09ef232 100644
--- a/app/views/admin/users/index/_controls.html.erb
+++ b/app/views/admin/users/index/_controls.html.erb
@@ -17,7 +17,7 @@
     </div>
     <div>
       <div id="search-users" class="hidden">
-        <%= render "admin/users/controls/search_field", f: f, context: "small", placeholder: "Search member...", aria_label: "Search member by name, or username" %>
+        <%= render "admin/users/controls/search_field", f: f, context: "small", placeholder: "Search member...", aria_label: "Search member by name, username or email" %>
       </div>
       <div id="filter-users" class="hidden crayons-field flex-row items-center gap-2">
         <%= render "admin/users/controls/filter_role_field", f: f, context: "small" %>
@@ -29,7 +29,7 @@
   <div class="hidden m:flex justify-between align-items-center">
     <%= form_with url: admin_users_path, method: :get, local: true, class: "flex flex-col m:flex-row gap-3 m:items-center py-3" do |f| %>
       <div class="crayons-field flex-1 flex-row items-center gap-2">
-        <%= render "admin/users/controls/search_field", f: f, context: "medium", placeholder: "Search member...", aria_label: "Search member by name, or username" %>
+        <%= render "admin/users/controls/search_field", f: f, context: "medium", placeholder: "Search member...", aria_label: "Search member by name, username or email" %>
       </div>
       <div class="crayons-field flex-row items-center gap-2">
         <%= render "admin/users/controls/filter_role_field", f: f, context: "medium" %>
diff --git a/cypress/integration/seededFlows/adminFlows/users/userIndexView.spec.js b/cypress/integration/seededFlows/adminFlows/users/userIndexView.spec.js
index c70fa2fa1..bf33be71d 100644
--- a/cypress/integration/seededFlows/adminFlows/users/userIndexView.spec.js
+++ b/cypress/integration/seededFlows/adminFlows/users/userIndexView.spec.js
@@ -39,7 +39,7 @@ describe('User index view', () => {
           .should('have.attr', 'aria-expanded', 'true');
 
         cy.findByRole('textbox', {
-          name: 'Search member by name, or username',
+          name: 'Search member by name, username or email',
         }).type('Admin McAdmin');
 
         cy.findByRole('button', { name: 'Search' }).click();
@@ -119,7 +119,7 @@ describe('User index view', () => {
           .pipe(click)
           .should('have.attr', 'aria-expanded', 'true');
         cy.findByRole('textbox', {
-          name: 'Search member by name, or username',
+          name: 'Search member by name, username or email',
         })
           .clear()
           .type('something');
@@ -203,7 +203,7 @@ describe('User index view', () => {
     describe('Search and filter', () => {
       it('Searches for a user', () => {
         cy.findByRole('textbox', {
-          name: 'Search member by name, or username',
+          name: 'Search member by name, username or email',
         }).type('Admin McAdmin');
 
         cy.findByRole('button', { name: 'Search' }).click();