diff --git a/src/components/ItemTable/ItemTable.js b/src/components/ItemTable/ItemTable.js index d591454..044a310 100644 --- a/src/components/ItemTable/ItemTable.js +++ b/src/components/ItemTable/ItemTable.js @@ -10,7 +10,6 @@ import { ArrowDownward, ArrowUpward } from "@material-ui/icons"; export default function ItemTable({ data }) { const [selectedRow, setSelecetedRow] = useState({ queue: null, number: null }); - const LastUpdatedCell = ({ time, reactTableCellProps, classes }) => { const lastUpdated = new Date(time).getTime(); const now = new Date().getTime(); @@ -33,8 +32,10 @@ export default function ItemTable({ data }) { return ( @@ -66,7 +67,6 @@ export default function ItemTable({ data }) { borderLeftStyle: "solid", borderColor: theme.palette.type === "light" ? theme.palette.grey[300] : theme.palette.grey[500] }, - }); const classes = useStyles(); @@ -80,10 +80,10 @@ export default function ItemTable({ data }) { { Header: 'Subject', accessor: 'subject' }, { Header: 'Status', accessor: 'status', }, { Header: 'Priority', accessor: 'priority' }, - { Header: 'Last Updated', accessor: 'lastUpdated', Cell: ({ value }) => }, + { Header: 'Last Updated', accessor: 'lastUpdated', }, { Header: 'Department', accessor: 'department' }, { Header: 'Building', accessor: 'building' }, - { Header: 'Date Received', accessor: 'dateReceived', Cell: ({ value }) => }, + { Header: 'Date Received', accessor: 'dateReceived', }, ], []); const tableInstance = useTable( @@ -107,7 +107,8 @@ export default function ItemTable({ data }) { return ( - @@ -168,26 +169,33 @@ export default function ItemTable({ data }) { }} classes={{ root: isSelected ? classes.rowSelected : classes.bandedRows }} selected={isSelected} - {...row.getRowProps()} > + {...row.getRowProps()} + > {row.cells.map(cell => ( cell.render( - //conditonally renders custom cell component based on cell.column.id prop value + // Conditonally renders custom cell component based on cell.column.id prop value. cell.column.id === "lastUpdated" - ? - : - - {cell.value} - + />) : + cell.column.id === "dateReceived" + ? ( + + ) + : + + {cell.value} + ) - ))} );