Merge Development (#44)

* CEC-244 Remote car commands, search, sortable tables (#42)

* Add sortable table header

* Send bulk commands page
Update table page sizes
All tables are sortable

* Update site layout
Add search to update packages

* Reenable Datadog

* remove dev stuff

* CEC-244 Add search (#43)

* Add search to car send command page
Add snapshot check

src/components/Cars/List/index.jsx

@@ -6,10 +6,9 @@ import {
   TableCell,
   TableContainer,
   TableFooter,
-  TableHead,
   TablePagination,
   TableRow,
-  Typography,
+  Toolbar,
 } from "@material-ui/core";
 
 import {
@@ -20,25 +19,77 @@ import { useUserContext } from "../../Contexts/UserContext";
 import { useStatusContext } from "../../Contexts/StatusContext";
 import useStyles from "../../useStyles";
 import { LocalDateTimeString } from "../../../utils/dates";
+import TableHeaderSortable from "../../Table/HeaderSortable";
+import SearchField from "../../Controls/SearchField";
+
+const tableColumns = [
+  {
+    id: "vin",
+    label: "VIN",
+  },
+  {
+    id: "model",
+    label: "Model",
+  },
+  {
+    id: "year",
+    label: "Year",
+  },
+  {
+    id: "trim",
+    label: "Trim",
+  },
+  {
+    id: "created_at",
+    label: "Created",
+  },
+  {
+    id: "updated_at",
+    label: "Updated",
+  },
+];
 
 const MainForm = () => {
   const classes = useStyles();
-  const [pageSize, setPageSize] = useState(25);
+  const [pageSize, setPageSize] = useState(10);
   const [pageIndex, setPageIndex] = useState(0);
+  const [orderBy, setOrderBy] = useState("vin");
+  const [order, setOrder] = useState("asc");
+  const [search, setSearch] = useState("");
   const { getVehicles, vehicles, totalVehicles } = useVehicleContext();
-  const { setMessage } = useStatusContext();
+  const { setMessage, setTitle } = useStatusContext();
   const {
     token: {
       idToken: { jwtToken: token },
     },
   } = useUserContext();
 
+  const sortHandler = (event, property) => {
+    if (property === orderBy) {
+      if (order === "asc") {
+        setOrder("desc");
+      } else {
+        setOrder("asc");
+      }
+    } else {
+      setOrderBy(property);
+      setOrder("asc");
+    }
+  };
+
+  useEffect(() => {
+    setTitle("Vehicles");
+    // eslint-disable-next-line
+  }, []);
+
   useEffect(() => {
     try {
       getVehicles(
         {
           limit: pageSize,
           offset: pageSize * pageIndex,
+          order: `${orderBy} ${order}`,
+          search,
         },
         token
       );
@@ -46,7 +97,7 @@ const MainForm = () => {
       setMessage(e.message);
     }
     // eslint-disable-next-line
-  }, [pageIndex, pageSize, token]);
+  }, [pageIndex, pageSize, token, orderBy, order, search]);
 
   const handleChangePageIndex = (event, newIndex) => {
     setPageIndex(newIndex);
@@ -57,30 +108,33 @@ const MainForm = () => {
     setPageIndex(0);
   };
 
+  const handleSearch = (search) => {
+    setSearch(search);
+  };
+
   return (
     <div className={classes.paper} style={{ height: 700, width: "100%" }}>
-      <Typography component="h1" variant="h5">
-        Vehicles
-      </Typography>
+      <Toolbar className={classes.tableToolbar}>
+        <SearchField classes={classes} onSearch={handleSearch} />
+      </Toolbar>
       <TableContainer>
         <Table>
-          <TableHead>
-            <TableRow>
-              <TableCell align="center">VIN</TableCell>
-              <TableCell align="center">Model</TableCell>
-              <TableCell align="center">Year</TableCell>
-              <TableCell align="center">Created</TableCell>
-              <TableCell align="center">Updated</TableCell>
-            </TableRow>
-          </TableHead>
+          <TableHeaderSortable
+            classes={classes}
+            orderBy={orderBy}
+            order={order}
+            columnData={tableColumns}
+            onSortRequest={sortHandler}
+          />
           <TableBody>
             {vehicles.map((row) => (
               <TableRow key={row.vin}>
-                <TableCell align="center">
+                <TableCell align="center" sortDirection={true}>
                   <Link to={`/vehicle-status/${row.vin}`}>{row.vin}</Link>
                 </TableCell>
                 <TableCell align="center">{row.model}</TableCell>
                 <TableCell align="center">{row.year}</TableCell>
+                <TableCell align="center">{row.trim || ""}</TableCell>
                 <TableCell align="center">
                   {LocalDateTimeString(row.created)}
                 </TableCell>
@@ -93,7 +147,7 @@ const MainForm = () => {
           <TableFooter>
             <TableRow>
               <TablePagination
-                rowsPerPageOptions={[5, 10, 25]}
+                rowsPerPageOptions={[5, 10, 25, 100]}
                 colSpan={6}
                 count={totalVehicles}
                 rowsPerPage={pageSize}