@@ -15,7 +15,7 @@ function AdminSwitch({ id, isAdmin }: Pick<User, 'id' | 'isAdmin'>) {
1515
1616const UsersTable = ( ) => {
1717 const [ currentPage , setCurrentPage ] = useState ( 1 ) ;
18- const [ emailFilter , setEmailFilter ] = useState < string > ( '' ) ;
18+ const [ emailFilter , setEmailFilter ] = useState < string | undefined > ( '' ) ;
1919 const [ isAdminFilter , setIsAdminFilter ] = useState < boolean | undefined > ( undefined ) ;
2020 const [ subscriptionStatusFilter , setSubcriptionStatusFilter ] = useState < SubscriptionStatus [ ] > ( [ ] ) ;
2121
@@ -26,7 +26,7 @@ const UsersTable = () => {
2626 filter : {
2727 ...( emailFilter && { emailContains : emailFilter } ) ,
2828 ...( isAdminFilter !== undefined && { isAdmin : isAdminFilter } ) ,
29- ...( subscriptionStatusFilter ? .length > 0 && { subscriptionStatusIn : subscriptionStatusFilter } ) ,
29+ ...( subscriptionStatusFilter . length > 0 && { subscriptionStatusIn : subscriptionStatusFilter } ) ,
3030 } ,
3131 } ) ;
3232
@@ -52,7 +52,8 @@ const UsersTable = () => {
5252 id = 'email-filter'
53535454 onChange = { ( e ) => {
55- setEmailFilter ( e . currentTarget . value ) ;
55+ const value = e . currentTarget . value ;
56+ setEmailFilter ( value === '' ? undefined : value ) ;
5657 } }
5758 className = 'rounded border border-stroke py-2 px-5 bg-white outline-none transition focus:border-primary active:border-primary disabled:cursor-default disabled:bg-whiter dark:border-form-strokedark dark:bg-form-input dark:focus:border-primary'
5859 />
@@ -61,7 +62,7 @@ const UsersTable = () => {
6162 </ label >
6263 < div className = 'flex-grow relative z-20 rounded border border-stroke pr-8 outline-none bg-white transition focus:border-primary active:border-primary dark:border-form-strokedark dark:bg-form-input' >
6364 < div className = 'flex items-center' >
64- { ! ! subscriptionStatusFilter && subscriptionStatusFilter . length > 0 ? (
65+ { subscriptionStatusFilter . length > 0 ? (
6566 subscriptionStatusFilter . map ( ( opt ) => (
6667 < span
6768 key = { opt }
@@ -216,7 +217,7 @@ const UsersTable = () => {
216217 </ div >
217218 </ div >
218219 ) ;
219- }
220+ } ;
220221
221222function ChevronDownIcon ( ) {
222223 return (
0 commit comments