maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: add search by email back (#17511)

Browse source
This commit is contained in:
Ridhwana 2022-04-29 15:59:10 +02:00 • committed by GitHub
parent b808843564
commit 994a121c62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/queries/admin/users_query.rb
View file

@ -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: {})

4
app/views/admin/users/index/_controls.html.erb
View file

@ -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" %>

6
cypress/integration/seededFlows/adminFlows/users/userIndexView.spec.js
View file

@ -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();