B 22559 add filtering to rejected tab int

pkg/handlers/adminapi/rejected_office_users.go

@@ -69,7 +69,49 @@ var rejectedOfficeUserFilterConverters = map[string]func(string) func(*pop.Query
 	"search": 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' OR transportation_offices.name ILIKE ? AND office_users.status = 'REJECTED' OR office_users.email ILIKE ? AND office_users.status = 'REJECTED' OR office_users.first_name ILIKE ? AND office_users.status = 'REJECTED' OR office_users.last_name ILIKE ? AND office_users.status = 'REJECTED'", nameSearch, nameSearch, nameSearch, nameSearch, nameSearch)
+			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)
 		}
 	},
 }

pkg/services/rejected_office_users/rejected_office_users_list_fetcher_test.go

@@ -57,7 +57,7 @@ func (suite *RejectedOfficeUsersServiceSuite) TestFetchRejectedOfficeUserList()
 		factory.BuildOfficeUserWithRoles(suite.DB(), []factory.Customization{
 			{
 				Model: models.OfficeUser{
-					Status:     &rejectedStatus,
+					Status: &rejectedStatus,
 				},
 			},
 		}, []roles.RoleType{roles.RoleTypeTOO})

src/pages/Admin/RejectedOfficeUsers/RejectedOfficeUserList.jsx

@@ -2,15 +2,19 @@ import React from 'react';
 import {
   Datagrid,
   DateField,
-  Filter,
   List,
   ReferenceField,
   TextField,
   TextInput,
   TopToolbar,
   useRecordContext,
+  SearchInput,
+  FilterForm,
+  FilterButton,
 } from 'react-admin';
 
+import styles from './RejectedOfficeUserList.module.scss';
+
 import AdminPagination from 'scenes/SystemAdmin/shared/AdminPagination';
 
 const RejectedOfficeUserShowRoles = () => {
@@ -33,20 +37,36 @@ const ListActions = () => {
   return <TopToolbar />;
 };
 
-const RejectedOfficeUserListFilter = () => (
-  <Filter>
-    <TextInput source="search" alwaysOn />
-  </Filter>
+const filterList = [
+  <SearchInput source="search" alwaysOn />,
+  <TextInput label="Email" source="emails" />,
+  <TextInput label="First Name" source="firstName" />,
+  <TextInput label="Last Name" source="lastName" />,
+  <TextInput label="Office" source="offices" />,
+  <TextInput label="Rejection Reason" source="rejectionReason" />,
+  <TextInput label="Rejected On" source="rejectedOn" />,
+  <TextInput label="Roles" source="roles" />,
+];
+
+const SearchFilters = () => (
+  <div className={styles.searchContainer}>
+    <div className={styles.searchBar}>
+      <FilterForm filters={filterList} />
+    </div>
+    <div className={styles.filters}>
+      <FilterButton filters={filterList} />
+    </div>
+  </div>
 );
 
 const defaultSort = { field: 'createdAt', order: 'DESC' };
 
 const RejectedOfficeUserList = () => (
   <List
+    filters={<SearchFilters />}
     pagination={<AdminPagination />}
     perPage={25}
     sort={defaultSort}
-    filters={<RejectedOfficeUserListFilter />}
     actions={<ListActions />}
   >
     <Datagrid bulkActionButtons={false} rowClick="show" data-testid="rejected-office-user-fields">

src/pages/Admin/RejectedOfficeUsers/RejectedOfficeUserList.module.scss

@@ -0,0 +1,14 @@
+@import 'shared/styles/colors.scss';
+
+.searchContainer {
+  display: flex;
+  align-items: flex-end;
+
+  .searchBar {
+    float: left;
+  }
+
+  .filters {
+    padding-bottom: 5px;
+  }
+}

src/shared/Inputs/YesNoBoolen.test.jsx

@@ -0,0 +1,33 @@
+import YesNoBoolean from './YesNoBoolean';
+import { fireEvent, getByLabelText, render } from '@testing-library/react';
+import { Provider } from 'react-redux';
+import { configureStore } from 'shared/store';
+
+const testProps = {
+  input: {
+    value: true,
+    onChange: jest.fn(),
+  },
+};
+
+describe('YesNoBoolean', () => {
+  describe('with default props', () => {
+    it('renders without errors', () => {
+      const mockStore = configureStore({});
+      render(
+        <Provider store={mockStore.store}>
+          <YesNoBoolean {...testProps} />
+        </Provider>,
+      );
+    });
+
+    it('renders without input', () => {
+      const mockStore = configureStore({});
+      render(
+        <Provider store={mockStore.store}>
+          <YesNoBoolean />
+        </Provider>,
+      );
+    });
+  });
+});