Merge development (#86)

This commit is contained in:
John Wu
2021-09-13 09:15:20 -07:00
committed by GitHub
parent 74eb2707a3
commit 680280dbf2
32 changed files with 465 additions and 466 deletions

View File

@@ -24,9 +24,9 @@ const MainForm = () => {
},
} = useUserContext();
const handleSearch = (search) => {
const handleSearch = (query) => {
setSelected([]);
setSearch(search);
setSearch(query);
};
const handleSelectAll = (cars) => {

View File

@@ -5,6 +5,7 @@ import { Button, Grid, Typography } from "@material-ui/core";
import CarECUsTable from "../../Controls/CarECUsTable";
import CarUpdatesTable from "../../Controls/CarUpdatesTable";
import { logger } from "../../../services/monitoring";
import {
VehicleProvider,
useVehicleContext,
@@ -12,7 +13,6 @@ import {
import { useUserContext } from "../../Contexts/UserContext";
import { useStatusContext } from "../../Contexts/StatusContext";
import useStyles from "../../useStyles";
import { logger } from "../../../services/monitoring";
const MainForm = () => {
const { vin } = useParams();
@@ -28,9 +28,9 @@ const MainForm = () => {
try {
await sendCommand([vin], "ecu", "", token);
setMessage(`Sent command to ${vin}`);
} catch (e) {
setMessage(e.message);
logger.error(e.stack);
} catch (error) {
setMessage(error.message);
logger.error(error.stack);
}
};
@@ -52,7 +52,7 @@ const MainForm = () => {
return (
<div className={clsx(classes.paper, classes.tableSize)}>
<Typography variant="h6">Car Updates</Typography>
<CarUpdatesTable vin={vin} token={token} />
<CarUpdatesTable vin={vin} token={token} classes={classes} />
<Grid container className={classes.root} spacing={2}>
<Grid item md={4} className={classes.textJustifyAlign}></Grid>
<Grid item md={4} className={classes.textCenterAlign}>
@@ -73,7 +73,7 @@ const MainForm = () => {
</Button>
</Grid>
</Grid>
<CarECUsTable vin={vin} token={token} />
<CarECUsTable vin={vin} token={token} classes={classes} />
</div>
);
};

View File

@@ -1,5 +1,4 @@
import React, { useEffect } from "react";
import { useState } from "react";
import React, { useEffect, useState } from "react";
import { useParams } from "react-router-dom";
import { Grid, TextField } from "@material-ui/core";
@@ -126,7 +125,7 @@ const MainForm = () => {
</>
)}
<Grid item md={12}>
<CarUpdateStatusProgress status={status} />
<CarUpdateStatusProgress status={status} classes={classes} />
</Grid>
<Grid item md={12}>
<CarUpdateStatusTable carupdateid={carupdateid} token={token} />