From 9e9e48aaa5427a2079e8a5f45ab23e6f117e5bfe Mon Sep 17 00:00:00 2001 From: Justin Campbell Date: Fri, 12 Mar 2021 19:19:35 -0500 Subject: [PATCH] Reformat --- src/components/ItemTable/ItemTable.js | 221 +++++++++++++------------- 1 file changed, 110 insertions(+), 111 deletions(-) diff --git a/src/components/ItemTable/ItemTable.js b/src/components/ItemTable/ItemTable.js index 7e789e2..235e9c0 100644 --- a/src/components/ItemTable/ItemTable.js +++ b/src/components/ItemTable/ItemTable.js @@ -6,7 +6,6 @@ import { useHistory } from "react-router-dom"; import RelativeTime from "react-relative-time"; import ItemTableFilter from "../ItemTableFilter/"; import ItemtTableSortButtons from "../ItemTableSortButtons/"; -import { ArrowDownward, ArrowUpward } from "@material-ui/icons"; import ItemTableCell from "../ItemTableCell"; import LastUpdatedCell from "../LastUpdatedCell/"; import jester from "./loading-annimation.gif"; @@ -98,119 +97,119 @@ export default function ItemTable({ data, rowCanBeSelected, loading }) { return ( loading ? ( - - Items are loading. - - ) : ( - - - - {headerGroups.map(headerGroup => ( - - {headerGroup.headers.map(column => { - // Determine sort directions - const isSortedAsc = column.isSorted && !column.isSortedDesc; - const isSortedDesc = column.isSorted && column.isSortedDesc; + + Items are loading. + + ) : ( + +
+ + {headerGroups.map(headerGroup => ( + + {headerGroup.headers.map(column => { + // Determine sort directions + const isSortedAsc = column.isSorted && !column.isSortedDesc; + const isSortedDesc = column.isSorted && column.isSortedDesc; - return ( - - - - - {column.render("Filter")} - - - (isSortedAsc ? column.clearSortBy() : column.toggleSortBy(false)) - }} - sortDescArrowProps={{ - ...column.getSortByToggleProps(), - onClick: _ => (isSortedDesc ? column.clearSortBy() : column.toggleSortBy(true)) - }} - sortDirection={(_ => { - if (isSortedAsc) { - return 'asc'; - } - else if (isSortedDesc) { - return 'desc'; - } - else { - return undefined; - } - })()} - /> - + return ( + + + + + {column.render("Filter")} - - - ); - })} - - ))} - + + (isSortedAsc ? column.clearSortBy() : column.toggleSortBy(false)) + }} + sortDescArrowProps={{ + ...column.getSortByToggleProps(), + onClick: _ => (isSortedDesc ? column.clearSortBy() : column.toggleSortBy(true)) + }} + sortDirection={(_ => { + if (isSortedAsc) { + return 'asc'; + } + else if (isSortedDesc) { + return 'desc'; + } + else { + return undefined; + } + })()} + /> + + + + + ); + })} + + ))} + - - {rows.map((row) => { - prepareRow(row); - let isSelected = selectedRow.queue === row.original.queue && selectedRow.number === row.original.number - return ( - { - history.push(`/${row.original.queue}/${row.original.number}`); - setSelectedRow({ queue: row.original.queue, number: row.original.number }); - }} - // This functionality should be achieved by using the selected prop and - // overriding the selected class but this applied the secondary color at 0.08% opacity. - // Overridding the root class is a workaround. - classes={{ - root: (isSelected && rowCanBeSelected) ? classes.rowSelected : classes.bandedRows, - hover: classes.hoverBackgroundColor - }} - {...row.getRowProps()} - > - {row.cells.map(cell => ( - cell.render(_ => { - switch (cell.column.id) { - case "dateReceived": - return ( - - - - ); - case "lastUpdated": - return ( - - ); - default: - return ( - - {cell.value} - - ); - } - }) - ))} - - ); - })} - -
-
- ) + + {rows.map((row) => { + prepareRow(row); + let isSelected = selectedRow.queue === row.original.queue && selectedRow.number === row.original.number + return ( + { + history.push(`/${row.original.queue}/${row.original.number}`); + setSelectedRow({ queue: row.original.queue, number: row.original.number }); + }} + // This functionality should be achieved by using the selected prop and + // overriding the selected class but this applied the secondary color at 0.08% opacity. + // Overridding the root class is a workaround. + classes={{ + root: (isSelected && rowCanBeSelected) ? classes.rowSelected : classes.bandedRows, + hover: classes.hoverBackgroundColor + }} + {...row.getRowProps()} + > + {row.cells.map(cell => ( + cell.render(_ => { + switch (cell.column.id) { + case "dateReceived": + return ( + + + + ); + case "lastUpdated": + return ( + + ); + default: + return ( + + {cell.value} + + ); + } + }) + ))} + + ); + })} + + + + ) ); }