From e0d3dd0331dc48045225eaa15d772d99ab55f1f1 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 16 Jul 2024 13:27:58 -0700
Subject: [PATCH] Further simplified

---
 Client/src/Components/BasicTable/index.jsx | 51 +++++++---------------
 1 file changed, 16 insertions(+), 35 deletions(-)

diff --git a/Client/src/Components/BasicTable/index.jsx b/Client/src/Components/BasicTable/index.jsx
index 705872033..f006a3a48 100644
--- a/Client/src/Components/BasicTable/index.jsx
+++ b/Client/src/Components/BasicTable/index.jsx
@@ -77,13 +77,9 @@ const BasicTable = ({ data, paginated }) => {
     setPage(0); // Reset to first page after changing rows per page
   };
 
-  let paginatedData = [];
-  if (paginated) {
-    paginatedData = data.rows.slice(
-      page * rowsPerPage,
-      page * rowsPerPage + rowsPerPage
-    );
-  }
+  let displayData = paginated
+    ? data.rows.slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage)
+    : data.rows;
 
   return (
     <>
@@ -97,34 +93,19 @@ const BasicTable = ({ data, paginated }) => {
             </TableRow>
           </TableHead>
           <TableBody>
-            {paginated === false &&
-              data.rows.map((row) => {
-                return (
-                  <TableRow
-                    sx={{ cursor: row.handleClick ? "pointer" : "default" }}
-                    key={row.id}
-                    onClick={row.handleClick ? row.handleClick : null}
-                  >
-                    {row.data.map((cell) => {
-                      return <TableCell key={cell.id}>{cell.data}</TableCell>;
-                    })}
-                  </TableRow>
-                );
-              })}
-            {paginated === true &&
-              paginatedData.map((row) => {
-                return (
-                  <TableRow
-                    sx={{ cursor: row.handleClick ? "pointer" : "default" }}
-                    key={row.id}
-                    onClick={row.handleClick ? row.handleClick : null}
-                  >
-                    {row.data.map((cell) => {
-                      return <TableCell key={cell.id}>{cell.data}</TableCell>;
-                    })}
-                  </TableRow>
-                );
-              })}
+            {displayData.map((row) => {
+              return (
+                <TableRow
+                  sx={{ cursor: row.handleClick ? "pointer" : "default" }}
+                  key={row.id}
+                  onClick={row.handleClick ? row.handleClick : null}
+                >
+                  {row.data.map((cell) => {
+                    return <TableCell key={cell.id}>{cell.data}</TableCell>;
+                  })}
+                </TableRow>
+              );
+            })}
           </TableBody>
         </Table>
       </TableContainer>