CEC-252, CEC-253 Remove modal status popup, new car selection control (#45)

* Create multiselect car table control Remove table overflow containers * Include trim to add car form * CEC-252 Replace modal status with link to car details page * Remove send command from car status page Fix menu key warning
2021-06-01 13:16:13 -07:00
parent 5943b42a91
commit c36f6976f7
15 changed files with 3096 additions and 2876 deletions
--- a/src/components/App/snapshots/App.test.js.snap
+++ b/src/components/App/snapshots/App.test.js.snap
--- a/src/components/CarUpdates/Deploy/index.jsx
+++ b/src/components/CarUpdates/Deploy/index.jsx
@@ -1,15 +1,17 @@
 import React, { useEffect, useState } from "react";
 import { useParams, Redirect } from "react-router";
-import { Button, Typography } from "@material-ui/core";
+import { Button, Grid, Typography } from "@material-ui/core";
 import {
  UpdatesProvider,
  useUpdatesContext,
 } from "../../Contexts/UpdatesContext";
+import { VehicleProvider } from "../../Contexts/VehicleContext";
 import { useUserContext } from "../../Contexts/UserContext";
 import { useStatusContext } from "../../Contexts/StatusContext";
-import CarSelection from "../../Cars/CarSelection";
 import useStyles from "../../useStyles";
 import { tsLocalDateTimeString } from "../../../utils/dates";
+import SearchField from "../../Controls/SearchField";
+import CarSelectionTable from "../../Cars/CarSelectionTable";

 const MainForm = () => {
  const { packageid } = useParams();
@@ -24,20 +26,41 @@ const MainForm = () => {
  const [version, setVersion] = useState("");
  const [description, setDescription] = useState("");
  const [createDate, setCreateDate] = useState("");
-  const [selectedVehicles, setSelectedVehicles] = useState([]);
+  const [selected, setSelected] = useState([]);
+  const [search, setSearch] = useState("");
  const [redirect, setRedirect] = useState("");
  const classes = useStyles();

+  const handleSearch = (search) => {
+    setSelected([]);
+    setSearch(search);
+  };
+
+  const handleSelectAll = (cars) => {
+    setSelected(cars);
+  };
+
+  const handleSelect = (event, key) => {
+    let newSelected;
+    if (event.target.checked) {
+      newSelected = [...selected];
+      newSelected.push(key);
+    } else {
+      newSelected = selected.filter((vin) => vin !== key);
+    }
+    setSelected(newSelected);
+  };
+
  const onSubmit = async (event) => {
    try {
      event.preventDefault();
      const data = {
        package_id: parseInt(packageid),
-        vins: selectedVehicles,
+        vins: selected,
      };
      await createCarUpdates(data, token);
      setMessage(
-        `Deployed ${packageName} ${version} to ${selectedVehicles.length} cars`
+        `Deployed ${packageName} ${version} to ${selected.length} cars`
      );
      setRedirect(`/carupdate-status/${packageid}`);
    } catch (e) {
@@ -80,30 +103,48 @@ const MainForm = () => {
    <div className={classes.paper}>
      <form className={classes.form} noValidate action="{onSubmit}">
        <Typography variant="body2">
-          Created {createDate}. {description}
+          Created {createDate}. {description || "No description"}
        </Typography>
-        <hr style={{ marginBottom: 30, marginTop: 30 }} />
-        <CarSelection onSelection={setSelectedVehicles} />
+        <Grid container className={classes.root} spacing={2}>
+          <Grid item md={10}>
+            <SearchField classes={classes} onSearch={handleSearch} />
+            <div
+              className={classes.labelInline}
+            >{`${selected.length} Selected`}</div>
+          </Grid>
+          <Grid item md={2} style={{ textAlign: "right" }}>
            <Button
              type="submit"
-          disabled={busy}
+              disabled={busy || selected.length === 0}
              fullWidth
              variant="contained"
              color="primary"
-          className={classes.submit}
+              className={classes.formControl}
              onClick={onSubmit}
            >
              {busy ? "Deploying..." : "Deploy"}
            </Button>
+          </Grid>
+        </Grid>
+        <CarSelectionTable
+          classes={classes}
+          token={token}
+          search={{ search }}
+          selected={selected}
+          onSelect={handleSelect}
+          onSelectAll={handleSelectAll}
+        />
      </form>
    </div>
  );
 };

 const UpdatePackageDeployForm = () => (
+  <VehicleProvider>
    <UpdatesProvider>
      <MainForm />
    </UpdatesProvider>
+  </VehicleProvider>
 );

 export default UpdatePackageDeployForm;
--- a/src/components/CarUpdates/Status/index.jsx
+++ b/src/components/CarUpdates/Status/index.jsx
@@ -1,11 +1,11 @@
 import React, { useEffect, useState } from "react";
 import { useParams } from "react-router";
+import { Link } from "react-router-dom";
 import {
  LinearProgress,
  Table,
  TableBody,
  TableCell,
-  TableContainer,
  TableFooter,
  TableHead,
  TablePagination,
@@ -20,14 +20,12 @@ import { useUserContext } from "../../Contexts/UserContext";
 import { useStatusContext } from "../../Contexts/StatusContext";
 import useStyles from "../../useStyles";
 import { LocalDateTimeString } from "../../../utils/dates";
-import VehicleStatus from "../../Cars/StatusModal";

 const MainForm = () => {
  const { packageid } = useParams();
  const classes = useStyles();
  const [pageSize, setPageSize] = useState(10);
  const [pageIndex, setPageIndex] = useState(0);
-  const [viewVIN, setViewVIN] = useState(null);
  const {
    getCarUpdates,
    carUpdates,
@@ -99,18 +97,8 @@ const MainForm = () => {
    setPageIndex(0);
  };

-  const handleViewVIN = (event) => {
-    event.preventDefault();
-    setViewVIN(event.target.innerHTML);
-  };
-
-  const handleCloseViewVIN = (event) => {
-    setViewVIN(null);
-  };
-
  return (
    <div className={classes.paper} style={{ height: 700, width: "100%" }}>
-      <TableContainer>
      <Table>
        <TableHead>
          <TableRow>
@@ -126,17 +114,12 @@ const MainForm = () => {
            <TableRow key={row.id}>
              <TableCell align="center">{row.id}</TableCell>
              <TableCell align="center">
-                  <span className={classes.link} onClick={handleViewVIN}>
-                    {row.vin}
-                  </span>
+                <Link to={`/vehicle-status/${row.vin}`}>{row.vin}</Link>
              </TableCell>
              <TableCell align="center">
                {row.status}
                {row.progress > 0 && (
-                    <LinearProgress
-                      variant="determinate"
-                      value={row.progress}
-                    />
+                  <LinearProgress variant="determinate" value={row.progress} />
                )}
              </TableCell>
              <TableCell align="center">
@@ -166,8 +149,6 @@ const MainForm = () => {
          </TableRow>
        </TableFooter>
      </Table>
-      </TableContainer>
-      <VehicleStatus vin={viewVIN} handleClose={handleCloseViewVIN} />
    </div>
  );
 };
--- a/src/components/Cars/Add/index.jsx
+++ b/src/components/Cars/Add/index.jsx
@@ -21,6 +21,7 @@ const MainForm = () => {
  const vinEl = useRef(null);
  const modelEl = useRef(null);
  const yearEl = useRef(null);
+  const trimEl = useRef(null);

  useEffect(() => {
    setTitle("Add Vehicle");
@@ -34,6 +35,7 @@ const MainForm = () => {
        vin: vinEl.current.value,
        model: modelEl.current.value,
        year: parseInt(yearEl.current.value),
+        trim: trimEl.current.value,
      };

      const result = await addVehicle(formData, token);
@@ -91,6 +93,21 @@ const MainForm = () => {
          fullWidth
          inputRef={yearEl}
        />
+        <TextField
+          id="trim"
+          name="trim"
+          label="Trim"
+          defaultValue="Base"
+          variant="outlined"
+          margin="normal"
+          inputProps={{
+            maxLength: "4",
+            minLength: "4",
+          }}
+          required
+          fullWidth
+          inputRef={trimEl}
+        />
        <Button
          type="submit"
          disabled={busy}
--- a/src/components/Cars/CarSelection/index.jsx
+++ b/src/components/Cars/CarSelection/index.jsx
@@ -11,14 +11,8 @@ import useStyles from "../../useStyles";

 const Control = (props) => {
  const classes = useStyles();
-  const {
-    models,
-    years,
-    vehicles,
-    getModels,
-    getYears,
-    getVehicles,
-  } = useVehicleContext();
+  const { models, years, vehicles, getModels, getYears, getVehicles } =
+    useVehicleContext();
  const {
    token: {
      idToken: { jwtToken: token },
@@ -26,6 +20,7 @@ const Control = (props) => {
  } = useUserContext();
  const [model, setModel] = useState("");
  const [year, setYear] = useState(-1);
+  const [trim, setTrim] = useState("");

  const handleChangeModel = (event) => {
    setModel(event.target.value);
@@ -33,6 +28,9 @@ const Control = (props) => {
  const handleChangeYear = (event) => {
    setYear(event.target.value);
  };
+  const handleChangeTrim = (event) => {
+    setTrim(event.target.value);
+  };

  useEffect(() => {
    if (!token) return;
@@ -57,9 +55,9 @@ const Control = (props) => {

  useEffect(() => {
    if (model === null || year === -1) return;
-    getVehicles({ model, year }, token);
+    getVehicles({ model, year, trim }, token);
    // eslint-disable-next-line
-  }, [model, year]);
+  }, [model, year, trim]);

  useEffect(() => {
    if (!props.onSelection) return;
@@ -69,6 +67,7 @@ const Control = (props) => {
  }, [vehicles]);

  return (
+    <div className={classes.paper}>
      <div className={classes.form}>
        <FormControl className={classes.formControlInline} variant="outlined">
          <InputLabel htmlFor="car-model" style={{ backgroundColor: "White" }}>
@@ -112,6 +111,27 @@ const Control = (props) => {
            ))}
          </Select>
        </FormControl>
+        <FormControl className={classes.formControlInline} variant="outlined">
+          <InputLabel htmlFor="car-trim" style={{ backgroundColor: "White" }}>
+            Trim
+          </InputLabel>
+          <Select
+            native
+            value={year}
+            onChange={handleChangeTrim}
+            variant="outlined"
+            inputProps={{
+              name: "car-trim",
+              id: "car-trim",
+            }}
+          >
+            {years.map((item) => (
+              <option key={item} value={item}>
+                {item}
+              </option>
+            ))}
+          </Select>
+        </FormControl>
        <div className={classes.labelInline}>
          {vehicles.length === 0
            ? "No Cars Selected"
@@ -120,6 +140,8 @@ const Control = (props) => {
            : `${vehicles.length} Cars Selected`}
        </div>
      </div>
+      <div className={classes.form}></div>
+    </div>
  );
 };

--- a/src/components/Cars/CarSelectionTable/index.jsx
+++ b/src/components/Cars/CarSelectionTable/index.jsx
@@ -0,0 +1,182 @@
+import React, { useEffect, useState } from "react";
+import { Link } from "react-router-dom";
+import PropTypes from "prop-types";
+import {
+  Checkbox,
+  Table,
+  TableBody,
+  TableCell,
+  TableFooter,
+  TablePagination,
+  TableRow,
+} from "@material-ui/core";
+
+import { useVehicleContext } from "../../Contexts/VehicleContext";
+import { useStatusContext } from "../../Contexts/StatusContext";
+import { LocalDateTimeString } from "../../../utils/dates";
+import TableHeaderSortable from "../../Table/HeaderSortable";
+
+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 CarSelectionTable = (props) => {
+  const { token, classes, search, selected, onSelect, onSelectAll } = props;
+  const [pageSize, setPageSize] = useState(10);
+  const [pageIndex, setPageIndex] = useState(0);
+  const [orderBy, setOrderBy] = useState("vin");
+  const [order, setOrder] = useState("asc");
+  const { getVehicles, vehicles, totalVehicles } = useVehicleContext();
+  const { setMessage } = useStatusContext();
+
+  const sortHandler = (event, property) => {
+    if (property === orderBy) {
+      if (order === "asc") {
+        setOrder("desc");
+      } else {
+        setOrder("asc");
+      }
+    } else {
+      setOrderBy(property);
+      setOrder("asc");
+    }
+  };
+
+  const handleChangePageIndex = (event, newIndex) => {
+    setPageIndex(newIndex);
+  };
+
+  const handleChangePageSize = (event) => {
+    setPageSize(parseInt(event.target.value, 10));
+    setPageIndex(0);
+  };
+
+  const handleSelectAll = (event) => {
+    if (!onSelectAll) return;
+
+    const newSelected = [];
+    if (event.target.checked) {
+      vehicles.forEach((car) => {
+        newSelected.push(car.vin);
+      });
+    }
+
+    onSelectAll(newSelected);
+  };
+
+  const handleSelect = (event, key) => {
+    if (!onSelect) return;
+
+    onSelect(event, key);
+  };
+
+  useEffect(() => {
+    const options = {
+      limit: pageSize,
+      offset: pageSize * pageIndex,
+      order: `${orderBy} ${order}`,
+    };
+    try {
+      getVehicles(Object.assign(options, search), token);
+    } catch (e) {
+      setMessage(e.message);
+    }
+    // eslint-disable-next-line
+  }, [pageIndex, pageSize, orderBy, order, search, token]);
+
+  return (
+    <div className={classes.paper} style={{ height: 700, width: "100%" }}>
+      <Table>
+        <TableHeaderSortable
+          classes={classes}
+          orderBy={orderBy}
+          order={order}
+          columnData={tableColumns}
+          onSortRequest={sortHandler}
+          multiSelect={true}
+          onSelectAll={handleSelectAll}
+          selectCount={selected.length}
+          rowCount={vehicles.length}
+        />
+        <TableBody>
+          {vehicles.map((row) => {
+            const isSelected = selected.indexOf(row.vin) !== -1;
+            return (
+              <TableRow key={row.vin}>
+                <TableCell padding="checkbox">
+                  <Checkbox
+                    checked={isSelected}
+                    onChange={(event) => handleSelect(event, row.vin)}
+                  />
+                </TableCell>
+                <TableCell align="center">
+                  <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>
+                <TableCell align="center">
+                  {LocalDateTimeString(row.updated)}
+                </TableCell>
+              </TableRow>
+            );
+          })}
+        </TableBody>
+        <TableFooter>
+          <TableRow>
+            <TablePagination
+              rowsPerPageOptions={[5, 10, 25, 100]}
+              colSpan={7}
+              count={totalVehicles}
+              rowsPerPage={pageSize}
+              page={pageIndex}
+              SelectProps={{
+                inputProps: { "aria-label": "rows per page" },
+                native: true,
+              }}
+              onChangePage={handleChangePageIndex}
+              onChangeRowsPerPage={handleChangePageSize}
+            />
+          </TableRow>
+        </TableFooter>
+      </Table>
+    </div>
+  );
+};
+
+CarSelectionTable.propTypes = {
+  token: PropTypes.string.isRequired,
+  classes: PropTypes.object.isRequired,
+  search: PropTypes.object.isRequired,
+  selected: PropTypes.array.isRequired,
+  onSelect: PropTypes.func.isRequired,
+  onSelectAll: PropTypes.func.isRequired,
+};
+
+export default CarSelectionTable;
--- a/src/components/Cars/List/index.jsx
+++ b/src/components/Cars/List/index.jsx
@@ -4,7 +4,6 @@ import {
  Table,
  TableBody,
  TableCell,
-  TableContainer,
  TableFooter,
  TablePagination,
  TableRow,
@@ -117,7 +116,6 @@ const MainForm = () => {
      <Toolbar className={classes.tableToolbar}>
        <SearchField classes={classes} onSearch={handleSearch} />
      </Toolbar>
-      <TableContainer>
      <Table>
        <TableHeaderSortable
          classes={classes}
@@ -162,7 +160,6 @@ const MainForm = () => {
          </TableRow>
        </TableFooter>
      </Table>
-      </TableContainer>
    </div>
  );
 };
--- a/src/components/Cars/SendCommandBulk/index.jsx
+++ b/src/components/Cars/SendCommandBulk/index.jsx
@@ -1,124 +1,32 @@
 import React, { useEffect, useState } from "react";
-import { Link } from "react-router-dom";
-import {
-  Checkbox,
-  Table,
-  TableBody,
-  TableCell,
-  TableContainer,
-  TableFooter,
-  TablePagination,
-  TableRow,
-  Toolbar,
-} from "@material-ui/core";
+import { Grid } from "@material-ui/core";

-import {
-  useVehicleContext,
-  VehicleProvider,
-} from "../../Contexts/VehicleContext";
+import { VehicleProvider } from "../../Contexts/VehicleContext";
 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 SendCommand from "../SendCommand";
 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",
-  },
-];
+import CarSelectionTable from "../CarSelectionTable";

 const MainForm = () => {
  const classes = useStyles();
-  const [pageSize, setPageSize] = useState(10);
-  const [pageIndex, setPageIndex] = useState(0);
-  const [orderBy, setOrderBy] = useState("vin");
-  const [order, setOrder] = useState("asc");
  const [selected, setSelected] = useState([]);
  const [search, setSearch] = useState("");
-  const { getVehicles, vehicles, totalVehicles } = useVehicleContext();
-  const { setMessage, setTitle } = useStatusContext();
+  const { 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");
-    }
+  const handleSearch = (search) => {
+    setSelected([]);
+    setSearch(search);
  };

-  useEffect(() => {
-    setTitle("Send Command");
-    // eslint-disable-next-line
-  }, []);
-
-  useEffect(() => {
-    try {
-      getVehicles(
-        {
-          limit: pageSize,
-          offset: pageSize * pageIndex,
-          order: `${orderBy} ${order}`,
-          search,
-        },
-        token
-      );
-    } catch (e) {
-      setMessage(e.message);
-    }
-    // eslint-disable-next-line
-  }, [pageIndex, pageSize, token, orderBy, order, search]);
-
-  const handleChangePageIndex = (event, newIndex) => {
-    setPageIndex(newIndex);
-  };
-
-  const handleChangePageSize = (event) => {
-    setPageSize(parseInt(event.target.value, 10));
-    setPageIndex(0);
-  };
-
-  const handleSelectAll = (event) => {
-    const newSelected = [];
-    if (event.target.checked) {
-      vehicles.forEach((car) => {
-        newSelected.push(car.vin);
-      });
-    }
-    setSelected(newSelected);
+  const handleSelectAll = (cars) => {
+    setSelected(cars);
  };

  const handleSelect = (event, key) => {
@@ -132,76 +40,32 @@ const MainForm = () => {
    setSelected(newSelected);
  };

-  const handleSearch = (search) => {
-    setSelected([]);
-    setSearch(search);
-  };
+  useEffect(() => {
+    setTitle("Send Command");
+    // eslint-disable-next-line
+  }, []);

  return (
    <div className={classes.paper} style={{ height: 700, width: "100%" }}>
-      <Toolbar className={classes.tableToolbar}>
+      <Grid container className={classes.root} spacing={2}>
+        <Grid item md={6}>
          <SearchField classes={classes} onSearch={handleSearch} />
-      </Toolbar>
-      <TableContainer>
-        <Table>
-          <TableHeaderSortable
+          <div
+            className={classes.labelInline}
+          >{`${selected.length} Selected`}</div>
+        </Grid>
+        <Grid item md={6} style={{ textAlign: "right" }}>
+          <SendCommand vins={selected} style={{ display: "flex" }} />
+        </Grid>
+      </Grid>
+      <CarSelectionTable
        classes={classes}
-            orderBy={orderBy}
-            order={order}
-            columnData={tableColumns}
-            onSortRequest={sortHandler}
-            multiSelect={true}
+        token={token}
+        search={{ search }}
+        selected={selected}
+        onSelect={handleSelect}
        onSelectAll={handleSelectAll}
-            selectCount={selected.length}
-            rowCount={totalVehicles}
      />
-          <TableBody>
-            {vehicles.map((row) => {
-              const isSelected = selected.indexOf(row.vin) !== -1;
-              return (
-                <TableRow key={row.vin}>
-                  <TableCell padding="checkbox">
-                    <Checkbox
-                      checked={isSelected}
-                      onChange={(event) => handleSelect(event, row.vin)}
-                    />
-                  </TableCell>
-                  <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>
-                  <TableCell align="center">
-                    {LocalDateTimeString(row.updated)}
-                  </TableCell>
-                </TableRow>
-              );
-            })}
-          </TableBody>
-          <TableFooter>
-            <TableRow>
-              <TablePagination
-                rowsPerPageOptions={[5, 10, 25, 100]}
-                colSpan={7}
-                count={totalVehicles}
-                rowsPerPage={pageSize}
-                page={pageIndex}
-                SelectProps={{
-                  inputProps: { "aria-label": "rows per page" },
-                  native: true,
-                }}
-                onChangePage={handleChangePageIndex}
-                onChangeRowsPerPage={handleChangePageSize}
-              />
-            </TableRow>
-          </TableFooter>
-        </Table>
-      </TableContainer>
-      <SendCommand vins={selected} />
    </div>
  );
 };
--- a/src/components/Cars/Status/index.jsx
+++ b/src/components/Cars/Status/index.jsx
@@ -1,11 +1,9 @@
 import React, { useEffect, useState } from "react";
 import { useParams } from "react-router";
 import {
-  Grid,
  Table,
  TableBody,
  TableCell,
-  TableContainer,
  TableFooter,
  TablePagination,
  TableRow,
@@ -16,13 +14,11 @@ import {
  useUpdatesContext,
 } from "../../Contexts/UpdatesContext";
 import { VehicleProvider } from "../../Contexts/VehicleContext";
-
 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 SendCommand from "../SendCommand";

 const tableColumns = [
  {
@@ -107,7 +103,6 @@ const MainForm = () => {

  return (
    <div className={classes.paper} style={{ height: 700, width: "100%" }}>
-      <TableContainer>
      <Table>
        <TableHeaderSortable
          classes={classes}
@@ -149,12 +144,6 @@ const MainForm = () => {
          </TableRow>
        </TableFooter>
      </Table>
-      </TableContainer>
-      <Grid container className={classes.root} spacing={2}>
-        <Grid item lg={6} md={12}>
-          <SendCommand vins={[vin]} />
-        </Grid>
-      </Grid>
    </div>
  );
 };
--- a/src/components/Controls/SearchField/index.jsx
+++ b/src/components/Controls/SearchField/index.jsx
@@ -20,9 +20,13 @@ const SearchField = (props) => {
    onSearch(searchTerm);
  };
  const handleEnterPress = (e) => {
-    if (e.keyCode !== 13) return;
+    if (e.keyCode === 13) {
      e.preventDefault();
      handleSearch(e);
+    } else if (e.keyCode === 27) {
+      e.preventDefault();
+      setSearchTerm("");
+    }
  };

  return (
--- a/src/components/Layouts/SideMenu.jsx
+++ b/src/components/Layouts/SideMenu.jsx
@@ -50,7 +50,9 @@ export default function SideMenu() {
  return (
    <List>
      {menu.map((item, index) => (
-        <ListItemLink key={index} primary={item.label} to={item.to} />
+        <li key={index}>
+          <ListItemLink primary={item.label} to={item.to} />
+        </li>
      ))}
    </List>
  );
--- a/src/components/ListItemLink.jsx
+++ b/src/components/ListItemLink.jsx
@@ -17,12 +17,10 @@ function ListItemLink(props) {
  );

  return (
-    <li>
    <ListItem button component={renderLink}>
      {icon ? <ListItemIcon>{icon}</ListItemIcon> : null}
      <ListItemText primary={primary} />
    </ListItem>
-    </li>
  );
 }

--- a/src/components/UpdatePackages/Create/snapshots/Create.test.js.snap
+++ b/src/components/UpdatePackages/Create/snapshots/Create.test.js.snap
@@ -46,10 +46,10 @@ exports[`File Upload Form Should render 1`] = `
            />
            <fieldset
              aria-hidden="true"
-              class="PrivateNotchedOutline-root-31 MuiOutlinedInput-notchedOutline"
+              class="PrivateNotchedOutline-root-32 MuiOutlinedInput-notchedOutline"
            >
              <legend
-                class="PrivateNotchedOutline-legendLabelled-33"
+                class="PrivateNotchedOutline-legendLabelled-34"
              >
                <span>
                  Package name
@@ -92,10 +92,10 @@ exports[`File Upload Form Should render 1`] = `
            />
            <fieldset
              aria-hidden="true"
-              class="PrivateNotchedOutline-root-31 MuiOutlinedInput-notchedOutline"
+              class="PrivateNotchedOutline-root-32 MuiOutlinedInput-notchedOutline"
            >
              <legend
-                class="PrivateNotchedOutline-legendLabelled-33"
+                class="PrivateNotchedOutline-legendLabelled-34"
              >
                <span>
                  Version
@@ -138,10 +138,10 @@ exports[`File Upload Form Should render 1`] = `
            />
            <fieldset
              aria-hidden="true"
-              class="PrivateNotchedOutline-root-31 MuiOutlinedInput-notchedOutline"
+              class="PrivateNotchedOutline-root-32 MuiOutlinedInput-notchedOutline"
            >
              <legend
-                class="PrivateNotchedOutline-legendLabelled-33"
+                class="PrivateNotchedOutline-legendLabelled-34"
              >
                <span>
                  Description
@@ -185,10 +185,10 @@ exports[`File Upload Form Should render 1`] = `
            />
            <fieldset
              aria-hidden="true"
-              class="PrivateNotchedOutline-root-31 MuiOutlinedInput-notchedOutline"
+              class="PrivateNotchedOutline-root-32 MuiOutlinedInput-notchedOutline"
            >
              <legend
-                class="PrivateNotchedOutline-legendLabelled-33"
+                class="PrivateNotchedOutline-legendLabelled-34"
              >
                <span>
                  Release Notes URL
--- a/src/components/UpdatePackages/List/index.jsx
+++ b/src/components/UpdatePackages/List/index.jsx
@@ -4,7 +4,6 @@ import {
  Table,
  TableBody,
  TableCell,
-  TableContainer,
  TableFooter,
  TablePagination,
  TableRow,
@@ -151,7 +150,6 @@ const UpdatePackagesList = () => {
      <Toolbar className={classes.tableToolbar}>
        <SearchField classes={classes} onSearch={handleSearch} />
      </Toolbar>
-      <TableContainer>
      <Table>
        <TableHeaderSortable
          classes={classes}
@@ -191,7 +189,6 @@ const UpdatePackagesList = () => {
          </TableRow>
        </TableFooter>
      </Table>
-      </TableContainer>
    </div>
  );
 };
--- a/src/components/useStyles.jsx
+++ b/src/components/useStyles.jsx
@@ -45,10 +45,10 @@ const useStyles = makeStyles((theme) => ({
  },
  labelInline: {
    fontSize: "1.25em",
-    margin: theme.spacing(2, 0, 1),
+    margin: theme.spacing(2, 1, 1),
    display: "inline-flex",
    boxSizing: "border-box",
-    position: "relative",
+    verticalAlign: "bottom",
  },
  chips: {
    display: "flex",
@@ -152,6 +152,7 @@ const useStyles = makeStyles((theme) => ({
    width: "25ch",
  },
  tableToolbar: {
+    display: "flex",
    textAlign: "left",
    paddingLeft: theme.spacing(2),
    paddingRight: theme.spacing(1),
@@ -162,6 +163,9 @@ const useStyles = makeStyles((theme) => ({
    width: 60,
    margin: "auto",
  },
+  grow: {
+    flexGrow: 1,
+  },
 }));

 export default useStyles;