Fix BookingList.tsx and User.tsx

aelassas · Apr 23, 2024 · f3ae2ab · f3ae2ab
1 parent 1da2348
commit f3ae2ab
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/backend/src/components/BookingList.tsx b/backend/src/components/BookingList.tsx
@@ -186,7 +186,7 @@ const BookingList = ({
     if (suppliers && statuses && loggedUser) {
       fetchData(page, user)
     }
-  }, [page, loggedUser]) // eslint-disable-line react-hooks/exhaustive-deps
+  }, [page]) // eslint-disable-line react-hooks/exhaustive-deps
 
   useEffect(() => {
     if (suppliers && statuses && loggedUser) {

diff --git a/backend/src/pages/Bookings.tsx b/backend/src/pages/Bookings.tsx
@@ -54,7 +54,7 @@ const Bookings = () => {
       setLeftPanel(!_admin)
       setLoadingSuppliers(_admin)
 
-      const _allSuppliers = _admin ? await SupplierService.getAllSuppliers() : []
+      const _allSuppliers = await SupplierService.getAllSuppliers()
       const _suppliers = _admin ? bookcarsHelper.flattenSuppliers(_allSuppliers) : [_user._id ?? '']
       setAllSuppliers(_allSuppliers)
       setSuppliers(_suppliers)
@@ -75,12 +75,12 @@ const Bookings = () => {
                 </Button>
                 {admin
                   && (
-                  <SupplierFilter
-                    suppliers={allSuppliers}
-                    onChange={handleSupplierFilterChange}
-                    className="cl-supplier-filter"
-                  />
-)}
+                    <SupplierFilter
+                      suppliers={allSuppliers}
+                      onChange={handleSupplierFilterChange}
+                      className="cl-supplier-filter"
+                    />
+                  )}
                 <StatusFilter
                   onChange={handleStatusFilterChange}
                   className="cl-status-filter"

diff --git a/backend/src/pages/User.tsx b/backend/src/pages/User.tsx
@@ -137,6 +137,19 @@ const User = () => {
   const edit = loggedUser && user && (loggedUser.type === bookcarsTypes.RecordType.Admin || loggedUser._id === user._id || (loggedUser.type === bookcarsTypes.RecordType.Supplier && loggedUser._id === user.supplier))
   const supplier = user && user.type === bookcarsTypes.RecordType.Supplier
 
+  const _suppliers: string[] = []
+  if (loggedUser && user) {
+    if ((supplier && loggedUser._id === user._id)
+      || (loggedUser.type === bookcarsTypes.RecordType.Admin && user.type === bookcarsTypes.RecordType.Supplier)
+    ) {
+      _suppliers.push(user._id as string)
+    } else if (loggedUser.type === bookcarsTypes.RecordType.Supplier && user.type === bookcarsTypes.RecordType.User) {
+      _suppliers.push(loggedUser._id as string)
+    } else if (loggedUser.type === bookcarsTypes.RecordType.Admin) {
+      _suppliers.push(...suppliers)
+    }
+  }
+
   return (
     <Master onLoad={onLoad} strict>
       {loggedUser && user && visible && (
@@ -193,13 +206,13 @@ const User = () => {
             </div>
           </div>
           <div className="col-2">
-            {(edit || supplier) && (
+            {_suppliers.length > 0 && (
               <BookingList
                 containerClassName="user"
                 offset={offset}
                 loggedUser={loggedUser}
                 user={supplier ? undefined : user}
-                suppliers={supplier ? [user._id as string] : suppliers}
+                suppliers={_suppliers}
                 statuses={statuses}
                 hideDates={env.isMobile()}
                 checkboxSelection={!env.isMobile()}

diff --git a/frontend/src/components/BookingList.tsx b/frontend/src/components/BookingList.tsx
@@ -186,7 +186,7 @@ const BookingList = ({
     if (suppliers && statuses && user) {
       fetchData(page, user)
     }
-  }, [page, user]) // eslint-disable-line react-hooks/exhaustive-deps
+  }, [page]) // eslint-disable-line react-hooks/exhaustive-deps
 
   useEffect(() => {
     if (suppliers && statuses && user) {