B 22559 add filtering to rejected tab int #14938
Open
+117
−8
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ring-To-Rejected-Tab
Main b 22039 remove lat lon
KonstanceH
added
ByteSize M&Ms
cameroncaci
requested changes
Mar 4, 2025
Comment on lines
+72
to
+114
| query.Where("office_users.first_name ILIKE ? AND office_users.status = 'REJECTED' OR office_users.last_name ILIKE ? AND office_users.status = 'REJECTED' OR office_users.email ILIKE ? AND office_users.status = 'REJECTED'", nameSearch, nameSearch, nameSearch) | ||
| } | ||
| }, | ||
| "emails": func(content string) func(*pop.Query) { | ||
| return func(query *pop.Query) { | ||
| nameSearch := fmt.Sprintf("%%%s%%", content) | ||
| query.Where("office_users.email ILIKE ? AND office_users.status = 'REJECTED'", nameSearch) | ||
| } | ||
| }, | ||
| "firstName": func(content string) func(*pop.Query) { | ||
| return func(query *pop.Query) { | ||
| nameSearch := fmt.Sprintf("%%%s%%", content) | ||
| query.Where("office_users.first_name ILIKE ? AND office_users.status = 'REJECTED'", nameSearch) | ||
| } | ||
| }, | ||
| "lastName": func(content string) func(*pop.Query) { | ||
| return func(query *pop.Query) { | ||
| nameSearch := fmt.Sprintf("%%%s%%", content) | ||
| query.Where("office_users.last_name ILIKE ? AND office_users.status = 'REJECTED'", nameSearch) | ||
| } | ||
| }, | ||
| "offices": func(content string) func(*pop.Query) { | ||
| return func(query *pop.Query) { | ||
| nameSearch := fmt.Sprintf("%%%s%%", content) | ||
| query.Where("transportation_offices.name ILIKE ? AND office_users.status = 'REJECTED'", nameSearch) | ||
| } | ||
| }, | ||
| "rejectionReason": func(content string) func(*pop.Query) { | ||
| return func(query *pop.Query) { | ||
| nameSearch := fmt.Sprintf("%%%s%%", content) | ||
| query.Where("office_users.rejection_reason ILIKE ? AND office_users.status = 'REJECTED'", nameSearch) | ||
| } | ||
| }, | ||
| "rejectedOn": func(content string) func(*pop.Query) { | ||
| return func(query *pop.Query) { | ||
| nameSearch := fmt.Sprintf("%%%s%%", content) | ||
| query.Where("office_users.rejected_on ILIKE ? AND office_users.status = 'REJECTED'", nameSearch) | ||
| } | ||
| }, | ||
| "roles": func(content string) func(*pop.Query) { | ||
| return func(query *pop.Query) { | ||
| nameSearch := fmt.Sprintf("%%%s%%", content) | ||
| query.Where("roles.role_name ILIKE ? AND office_users.status = 'REJECTED'", nameSearch) |
There was a problem hiding this comment.
Could you add backend test coverage for explicit checks on these cases?
|
Testing: |
|
Testing: |
JamesHawks224
requested changes
Mar 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
B-22559
Summary
This PR adds a filter button/functionality to the rejected users tab on the admin page.
Verification Steps for Reviewers
These are to be checked by a reviewer.
How to test
How to reject office user requests
Frontend
officeAppclass or custommin-widthstyling is used to hide any states the would not be visible to the user.Backend
Screenshots
Original Search
With filter
