From 91fe98c0649f3b766644893f34169d479bb4e365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Sodi=C4=87?= <filip.sodic@fer.hr>
Date: Sun, 23 Feb 2025 19:29:23 +0100
Subject: [PATCH] Address review comments

---
 .../app/src/admin/dashboards/users/UsersTable.tsx     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/template/app/src/admin/dashboards/users/UsersTable.tsx b/template/app/src/admin/dashboards/users/UsersTable.tsx
index 7812443..4661446 100644
--- a/template/app/src/admin/dashboards/users/UsersTable.tsx
+++ b/template/app/src/admin/dashboards/users/UsersTable.tsx
@@ -15,7 +15,7 @@ function AdminSwitch({ id, isAdmin }: Pick<User, 'id' | 'isAdmin'>) {
 
 const UsersTable = () => {
   const [currentPage, setCurrentPage] = useState(1);
-  const [emailFilter, setEmailFilter] = useState<string>('');
+  const [emailFilter, setEmailFilter] = useState<string | undefined>('');
   const [isAdminFilter, setIsAdminFilter] = useState<boolean | undefined>(undefined);
   const [subscriptionStatusFilter, setSubcriptionStatusFilter] = useState<SubscriptionStatus[]>([]);
 
@@ -26,7 +26,7 @@ const UsersTable = () => {
     filter: {
       ...(emailFilter && { emailContains: emailFilter }),
       ...(isAdminFilter !== undefined && { isAdmin: isAdminFilter }),
-      ...(subscriptionStatusFilter?.length > 0 && { subscriptionStatusIn: subscriptionStatusFilter }),
+      ...(subscriptionStatusFilter.length > 0 && { subscriptionStatusIn: subscriptionStatusFilter }),
     },
   });
 
@@ -52,7 +52,8 @@ const UsersTable = () => {
                 id='email-filter'
                 placeholder='dude@example.com'
                 onChange={(e) => {
-                  setEmailFilter(e.currentTarget.value);
+                  const value = e.currentTarget.value;
+                  setEmailFilter(value === '' ? undefined : value);
                 }}
                 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'
               />
@@ -61,7 +62,7 @@ const UsersTable = () => {
               </label>
               <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'>
                 <div className='flex items-center'>
-                  {!!subscriptionStatusFilter && subscriptionStatusFilter.length > 0 ? (
+                  {subscriptionStatusFilter.length > 0 ? (
                     subscriptionStatusFilter.map((opt) => (
                       <span
                         key={opt}
@@ -216,7 +217,7 @@ const UsersTable = () => {
       </div>
     </div>
   );
-}
+};
 
 function ChevronDownIcon() {
   return (