CEC-371 Update car ECUs display (#78)

* Clean up className styles
Update car status page to show update and ECUs

* Add update ecu version button
Show all ECUs on car status page
Only show car ecus for search

src/components/Cars/CarECUs/index.jsx

@@ -0,0 +1,175 @@
+import React, { useEffect, useState } from "react";
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableFooter,
+  TablePagination,
+  TableRow,
+} from "@material-ui/core";
+import clsx from "clsx";
+
+import { LocalDateTimeString } from "../../../utils/dates";
+import TableHeaderSortable from "../../Table/HeaderSortable";
+import { useVehicleContext } from "../../Contexts/VehicleContext";
+import { useStatusContext } from "../../Contexts/StatusContext";
+import useStyles from "../../useStyles";
+import { logger } from "../../../services/monitoring";
+
+const tableColumns = [
+  {
+    id: "ecu",
+    label: "ECU",
+  },
+  {
+    id: "sw_version",
+    label: "SW Version",
+  },
+  {
+    id: "boot_loader_version",
+    label: "BL Version",
+  },
+  {
+    id: "hw_version",
+    label: "HW Version",
+  },
+  {
+    id: "vendor",
+    label: "Vendor",
+  },
+  {
+    id: "config",
+    label: "Config",
+  },
+  {
+    id: "fingerprint",
+    label: "Fingerprint",
+  },
+  {
+    id: "serial_number",
+    label: "Serial",
+  },
+  {
+    id: "created_at",
+    label: "Created",
+  },
+  {
+    id: "updated_at",
+    label: "Updated",
+  },
+];
+
+const CarECUs = ({ vin, token }) => {
+  const [ecus, setECUs] = useState([]);
+  const [total, setTotal] = useState(0);
+  const classes = useStyles();
+  const [pageSize, setPageSize] = useState(10);
+  const [pageIndex, setPageIndex] = useState(0);
+  const [orderBy, setOrderBy] = useState("ecu");
+  const [order, setOrder] = useState("desc");
+  const { getECUs } = useVehicleContext();
+  const { setMessage } = useStatusContext();
+
+  useEffect(() => {
+    (async () => {
+      try {
+        if (!vin || !token) return;
+        const result = await getECUs(
+          {
+            vin,
+            limit: pageSize,
+            offset: pageSize * pageIndex,
+            order: `${orderBy} ${order}`,
+          },
+          token
+        );
+        setECUs(result.data);
+        if (result.total > -1) setTotal(result.total);
+      } catch (e) {
+        console.log(e);
+        setMessage(e.message);
+        logger.warn(e.stack);
+      }
+    })();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [vin, token, pageIndex, pageSize, orderBy, order]);
+
+  const handleChangePageIndex = (event, newIndex) => {
+    setPageIndex(newIndex);
+  };
+
+  const handleChangePageSize = (event) => {
+    setPageSize(parseInt(event.target.value, 10));
+    setPageIndex(0);
+  };
+
+  const handleSort = (event, property) => {
+    try {
+      if (property === orderBy) {
+        if (order === "asc") {
+          setOrder("desc");
+        } else {
+          setOrder("asc");
+        }
+      } else {
+        setOrderBy(property);
+        setOrder("asc");
+      }
+    } catch (e) {
+      logger.warn(e.stack);
+    }
+  };
+
+  return (
+    <div className={clsx(classes.paper, classes.tableSize)}>
+      <Table>
+        <TableHeaderSortable
+          classes={classes}
+          orderBy={orderBy}
+          order={order}
+          columnData={tableColumns}
+          onSortRequest={handleSort}
+        />
+        <TableBody>
+          {ecus.map((row) => (
+            <TableRow key={row.ecu}>
+              <TableCell align="center">{row.ecu}</TableCell>
+              <TableCell align="center">{row.sw_version}</TableCell>
+              <TableCell align="center">{row.boot_loader_version}</TableCell>
+              <TableCell align="center">{row.hw_version}</TableCell>
+              <TableCell align="center">{row.vendor}</TableCell>
+              <TableCell align="center">{row.config}</TableCell>
+              <TableCell align="center">{row.fingerprint}</TableCell>
+              <TableCell align="center">{row.serial_number}</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={10}
+              count={total}
+              rowsPerPage={pageSize}
+              page={pageIndex}
+              SelectProps={{
+                inputProps: { "aria-label": "rows per page" },
+                native: true,
+              }}
+              onPageChange={handleChangePageIndex}
+              onRowsPerPageChange={handleChangePageSize}
+            />
+          </TableRow>
+        </TableFooter>
+      </Table>
+    </div>
+  );
+};
+
+export default CarECUs;

src/components/Cars/CarSelectionTable/index.jsx

@@ -10,6 +10,7 @@ import {
   TablePagination,
   TableRow,
 } from "@material-ui/core";
+import clsx from "clsx";
 
 import { useVehicleContext } from "../../Contexts/VehicleContext";
 import { useStatusContext } from "../../Contexts/StatusContext";
@@ -114,7 +115,7 @@ const CarSelectionTable = (props) => {
   }, [pageIndex, pageSize, orderBy, order, search, token]);
 
   return (
-    <div className={`${classes.paper} ${classes.tableSize}`}>
+    <div className={clsx(classes.paper, classes.tableSize)}>
       <Table>
         <TableHeaderSortable
           classes={classes}
@@ -147,7 +148,11 @@ const CarSelectionTable = (props) => {
                   {row.ecu_list && (
                     <>
                       <br />
-                      <ECUList list={row.ecu_list} search={searchTerm} />
+                      <ECUList
+                        list={row.ecu_list}
+                        search={searchTerm}
+                        searchedOnly={true}
+                      />
                     </>
                   )}
                 </TableCell>

src/components/Cars/CarUpdates/index.jsx

@@ -0,0 +1,159 @@
+import React, { useEffect, useState } from "react";
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableFooter,
+  TablePagination,
+  TableRow,
+} from "@material-ui/core";
+
+import { LocalDateTimeString } from "../../../utils/dates";
+import TableHeaderSortable from "../../Table/HeaderSortable";
+import {
+  UpdatesProvider,
+  useUpdatesContext,
+} from "../../Contexts/UpdatesContext";
+import { useStatusContext } from "../../Contexts/StatusContext";
+import useStyles from "../../useStyles";
+import { logger } from "../../../services/monitoring";
+
+const tableColumns = [
+  {
+    id: "id",
+    label: "ID",
+  },
+  {
+    id: "update_package_id",
+    label: "Name",
+  },
+  {
+    id: "status",
+    label: "Status",
+  },
+  {
+    id: "created_at",
+    label: "Created",
+  },
+  {
+    id: "updated_at",
+    label: "Updated",
+  },
+];
+
+const MainForm = ({ vin, token }) => {
+  const classes = useStyles();
+  const [pageSize, setPageSize] = useState(10);
+  const [pageIndex, setPageIndex] = useState(0);
+  const [orderBy, setOrderBy] = useState("id");
+  const [order, setOrder] = useState("desc");
+  const { getCarUpdates, carUpdates, totalCarUpdates } = useUpdatesContext();
+  const { setMessage } = useStatusContext();
+
+  useEffect(() => {
+    (async () => {
+      try {
+        if (!vin || !token) return;
+        await getCarUpdates(
+          {
+            vin,
+            limit: pageSize,
+            offset: pageSize * pageIndex,
+            order: `${orderBy} ${order}`,
+          },
+          token
+        );
+      } catch (e) {
+        setMessage(e.message);
+        logger.warn(e.stack);
+      }
+    })();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [vin, token, pageIndex, pageSize, orderBy, order]);
+
+  const handleChangePageIndex = (event, newIndex) => {
+    setPageIndex(newIndex);
+  };
+
+  const handleChangePageSize = (event) => {
+    setPageSize(parseInt(event.target.value, 10));
+    setPageIndex(0);
+  };
+
+  const handleSort = (event, property) => {
+    try {
+      if (property === orderBy) {
+        if (order === "asc") {
+          setOrder("desc");
+        } else {
+          setOrder("asc");
+        }
+      } else {
+        setOrderBy(property);
+        setOrder("asc");
+      }
+    } catch (e) {
+      logger.warn(e.stack);
+    }
+  };
+
+  const updateName = (row) => {
+    if (row.updatepackage)
+      return `${row.updatepackage.package_name} ${row.updatepackage.version}`;
+    if (row.updatemanifest)
+      return `${row.updatemanifest.name} ${row.updatemanifest.version}`;
+    return "None";
+  };
+
+  return (
+    <Table>
+      <TableHeaderSortable
+        classes={classes}
+        orderBy={orderBy}
+        order={order}
+        columnData={tableColumns}
+        onSortRequest={handleSort}
+      />
+      <TableBody>
+        {carUpdates.map((row) => (
+          <TableRow key={row.id}>
+            <TableCell align="center">{row.id}</TableCell>
+            <TableCell align="center">{updateName(row)}</TableCell>
+            <TableCell align="center">{row.status}</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={5}
+            count={totalCarUpdates}
+            rowsPerPage={pageSize}
+            page={pageIndex}
+            SelectProps={{
+              inputProps: { "aria-label": "rows per page" },
+              native: true,
+            }}
+            onPageChange={handleChangePageIndex}
+            onRowsPerPageChange={handleChangePageSize}
+          />
+        </TableRow>
+      </TableFooter>
+    </Table>
+  );
+};
+
+const CarUpdates = (props) => (
+  <UpdatesProvider>
+    <MainForm {...props} />
+  </UpdatesProvider>
+);
+
+export default CarUpdates;

src/components/Cars/SendCommand/index.jsx

@@ -75,7 +75,7 @@ const SendCommand = ({ vins }) => {
   }, []);
 
   return (
-    <div className={`${classes.form}`} style={{ marginTop: 20 }}>
+    <div className={classes.form} style={{ marginTop: 20 }}>
       <FormControl
         className={classes.formControlInline}
         variant="outlined"

src/components/Cars/SendCommandBulk/index.jsx

@@ -2,6 +2,7 @@ import React, { useEffect, useState } from "react";
 import { Grid } from "@material-ui/core";
 import AddCircleIcon from "@material-ui/icons/AddCircle";
 import { Link } from "react-router-dom";
+import clsx from "clsx";
 
 import { VehicleProvider } from "../../Contexts/VehicleContext";
 import { useUserContext } from "../../Contexts/UserContext";
@@ -54,7 +55,7 @@ const MainForm = () => {
   }, []);
 
   return (
-    <div className={`${classes.paper} ${classes.tableSize}`}>
+    <div className={clsx(classes.paper, classes.tableSize)}>
       <Grid container className={classes.root} spacing={2}>
         <Grid item md={4} className={classes.textJustifyAlign}>
           <Link to="/vehicle-add">

src/components/Cars/Status/index.jsx

@@ -1,63 +1,38 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect } from "react";
 import { useParams } from "react-router";
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableFooter,
-  TablePagination,
-  TableRow,
-} from "@material-ui/core";
+import clsx from "clsx";
+import { Button, Grid, Typography } from "@material-ui/core";
 
+import CarECUs from "../CarECUs";
+import CarUpdates from "../CarUpdates";
 import {
-  UpdatesProvider,
-  useUpdatesContext,
-} from "../../Contexts/UpdatesContext";
-import { VehicleProvider } from "../../Contexts/VehicleContext";
+  VehicleProvider,
+  useVehicleContext,
+} 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 { logger } from "../../../services/monitoring";
 
-const tableColumns = [
-  {
-    id: "id",
-    label: "ID",
-  },
-  {
-    id: "update_package_id",
-    label: "Name",
-  },
-  {
-    id: "status",
-    label: "Status",
-  },
-  {
-    id: "created_at",
-    label: "Created",
-  },
-  {
-    id: "updated_at",
-    label: "Updated",
-  },
-];
-
 const MainForm = () => {
   const { vin } = useParams();
   const classes = useStyles();
-  const [pageSize, setPageSize] = useState(10);
-  const [pageIndex, setPageIndex] = useState(0);
-  const [orderBy, setOrderBy] = useState("id");
-  const [order, setOrder] = useState("desc");
-  const { getCarUpdates, carUpdates, totalCarUpdates } = useUpdatesContext();
-  const { setMessage, setTitle, setSitePath } = useStatusContext();
+  const { setTitle, setSitePath, setMessage } = useStatusContext();
+  const { busy, sendCommand } = useVehicleContext();
   const {
     token: {
       idToken: { jwtToken: token },
     },
   } = useUserContext();
+  const updateHandler = async (e) => {
+    try {
+      await sendCommand([vin], "ecu", "", token);
+      setMessage(`Sent command to ${vin}`);
+    } catch (e) {
+      setMessage(e.message);
+      logger.error(e.stack);
+    }
+  };
 
   useEffect(() => {
     const title = `Vehicle ${vin} Details`;
@@ -74,113 +49,39 @@ const MainForm = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [vin]);
 
-  useEffect(() => {
-    (async () => {
-      try {
-        await getCarUpdates(
-          {
-            vin,
-            limit: pageSize,
-            offset: pageSize * pageIndex,
-            order: `${orderBy} ${order}`,
-          },
-          token
-        );
-      } catch (e) {
-        setMessage(e.message);
-        logger.warn(e.stack);
-      }
-    })();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [pageIndex, pageSize, token, orderBy, order]);
-
-  const handleChangePageIndex = (event, newIndex) => {
-    setPageIndex(newIndex);
-  };
-
-  const handleChangePageSize = (event) => {
-    setPageSize(parseInt(event.target.value, 10));
-    setPageIndex(0);
-  };
-
-  const handleSort = (event, property) => {
-    try {
-      if (property === orderBy) {
-        if (order === "asc") {
-          setOrder("desc");
-        } else {
-          setOrder("asc");
-        }
-      } else {
-        setOrderBy(property);
-        setOrder("asc");
-      }
-    } catch (e) {
-      logger.warn(e.stack);
-    }
-  };
-
-  const updateName = (row) => {
-    if (row.updatepackage)
-      return `${row.updatepackage.package_name} ${row.updatepackage.version}`;
-    if (row.updatemanifest)
-      return `${row.updatemanifest.name} ${row.updatemanifest.version}`;
-    return "None";
-  };
-
   return (
-    <div className={classes.paper} style={{ height: 700, width: "100%" }}>
-      <Table>
-        <TableHeaderSortable
-          classes={classes}
-          orderBy={orderBy}
-          order={order}
-          columnData={tableColumns}
-          onSortRequest={handleSort}
-        />
-        <TableBody>
-          {carUpdates.map((row) => (
-            <TableRow key={row.id}>
-              <TableCell align="center">{row.id}</TableCell>
-              <TableCell align="center">{updateName(row)}</TableCell>
-              <TableCell align="center">{row.status}</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={5}
-              count={totalCarUpdates}
-              rowsPerPage={pageSize}
-              page={pageIndex}
-              SelectProps={{
-                inputProps: { "aria-label": "rows per page" },
-                native: true,
-              }}
-              onPageChange={handleChangePageIndex}
-              onRowsPerPageChange={handleChangePageSize}
-            />
-          </TableRow>
-        </TableFooter>
-      </Table>
+    <div className={clsx(classes.paper, classes.tableSize)}>
+      <Typography variant="h6">Car Updates</Typography>
+      <CarUpdates vin={vin} token={token} />
+      <Grid container className={classes.root} spacing={2}>
+        <Grid item md={4} className={classes.textJustifyAlign}></Grid>
+        <Grid item md={4} className={classes.textCenterAlign}>
+          <Typography variant="h6" className={classes.labelInline}>
+            Car ECUs
+          </Typography>
+        </Grid>
+        <Grid item md={4} className={classes.textRightAlign}>
+          <Button
+            type="submit"
+            disabled={busy}
+            variant="contained"
+            color="primary"
+            className={clsx(classes.formControl, classes.textField)}
+            onClick={updateHandler}
+          >
+            {busy ? "Sending..." : "Update"}
+          </Button>
+        </Grid>
+      </Grid>
+      <CarECUs vin={vin} token={token} />
     </div>
   );
 };
 
-const CarUpdates = () => (
+const CarStatus = () => (
   <VehicleProvider>
-    <UpdatesProvider>
-      <MainForm />
-    </UpdatesProvider>
+    <MainForm />
   </VehicleProvider>
 );
 
-export default CarUpdates;
+export default CarStatus;