From c9a3f54a658c8be749dcb92619434052c8f2d73b Mon Sep 17 00:00:00 2001
From: M M <cosmicray23@hotmail.com>
Date: Thu, 11 Jul 2024 13:20:15 -0700
Subject: [PATCH] Table now renders an arbitrary number of columns.

---
 Client/src/Components/StatusTable/index.jsx | 46 +++++++++++++--------
 Client/src/Pages/Incidents/index.jsx        |  8 +++-
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/Client/src/Components/StatusTable/index.jsx b/Client/src/Components/StatusTable/index.jsx
index 71d2b7641..ffe0b6e8a 100644
--- a/Client/src/Components/StatusTable/index.jsx
+++ b/Client/src/Components/StatusTable/index.jsx
@@ -44,10 +44,11 @@ const StyledTableRow = styled(TableRow)(({ theme }) => ({
 /**
  * Customized table component displaying incident history.
  * @param {object} props - The props object.
- * @param {array} props.data - The array of data objects containing name, date, and message.
+ * @param {array} props.data - The array of data objects containing JSX elements for name, and strings for date and message.
+ * @param {array} props.columns - The array of column headers and alignments.
  * @returns {JSX.Element} The JSX element representing the customized table.
  */
-export default function StatusTable({ data }) {
+export default function StatusTable({ data, columns }) {
   const theme = useTheme();
 
   return (
@@ -66,19 +67,27 @@ export default function StatusTable({ data }) {
         <Table sx={{ minWidth: 700 }} aria-label="customized table">
           <TableHead>
             <TableRow>
-              <StyledTableCell>Status</StyledTableCell>
-              <StyledTableCell align="right">Date & Time</StyledTableCell>
-              <StyledTableCell align="right">Message</StyledTableCell>
+              {columns.map((column, index) => (
+                <StyledTableCell key={index} align={column.align || 'left'}>
+                  {column.header}
+                </StyledTableCell>
+              ))}
             </TableRow>
           </TableHead>
           <TableBody>
-            {data.map((row, index) => (
-              <StyledTableRow key={index}>
-                <StyledTableCell component="th" scope="row">
-                  {row.name}
-                </StyledTableCell>
-                <StyledTableCell align="right">{row.date}</StyledTableCell>
-                <StyledTableCell align="right">{row.message}</StyledTableCell>
+            {data.map((row, rowIndex) => (
+              <StyledTableRow key={rowIndex}>
+                {columns.map((column, colIndex) => (
+                  <StyledTableCell key={colIndex} align={column.align || 'left'}>
+                    {column.id === 'name' ? (
+                      <div style={row.name.props.customStyles}>
+                        {row.name}
+                      </div>
+                    ) : (
+                      row[column.id]
+                    )}
+                  </StyledTableCell>
+                ))}
               </StyledTableRow>
             ))}
           </TableBody>
@@ -89,9 +98,12 @@ export default function StatusTable({ data }) {
 }
 
 StatusTable.propTypes = {
-  data: PropTypes.arrayOf(PropTypes.shape({
-    name: PropTypes.node.isRequired,
-    date: PropTypes.string.isRequired,
-    message: PropTypes.string.isRequired,
-  })).isRequired,
+  data: PropTypes.arrayOf(PropTypes.object).isRequired,
+  columns: PropTypes.arrayOf(
+    PropTypes.shape({
+      id: PropTypes.string.isRequired,
+      header: PropTypes.node.isRequired,
+      align: PropTypes.oneOf(['left', 'right', 'center']),
+    })
+  ).isRequired,
 };
diff --git a/Client/src/Pages/Incidents/index.jsx b/Client/src/Pages/Incidents/index.jsx
index 599950eea..4bb75a53d 100644
--- a/Client/src/Pages/Incidents/index.jsx
+++ b/Client/src/Pages/Incidents/index.jsx
@@ -65,6 +65,12 @@ const sampleData = [
   { name: <StatusLabel status="Down" customStyles={{ backgroundColor: '#fff9f9', borderColor: '#ffcac6', color: '#344054' }} />, date: '2024-03-14 21:41:09', message: 'HTTP 350 - NOK' },
 ];
 
+const columns = [
+  { id: 'name', header: 'Status' },
+  { id: 'date', header: 'Date & Time' },
+  { id: 'message', header: 'Message' },
+];
+
 /**
  * Customized table component displaying incident history with a filter.
  * @returns {JSX.Element} The JSX element representing the customized table with a filter.
@@ -90,7 +96,7 @@ export default function CustomizedTables() {
         </Typography>
         <Filter />
       </Box>
-      <StatusTable data={sampleData} />
+      <StatusTable data={sampleData} columns={columns} /> 
     </Box>
   );
 }