merging dev into branch

This commit is contained in:
Drew Taylor
2021-07-22 09:53:32 -07:00
26 changed files with 3619 additions and 240 deletions

View File

@@ -22,6 +22,7 @@ import TableHeaderSortable from "../../Table/HeaderSortable";
import SearchField from "../../Controls/SearchField";
import { logger } from "../../../services/monitoring";
import ConnectedIcon from "../../Controls/ConnectedIcon";
import ECUList from "../../Controls/ECUList";
const tableColumns = [
{
@@ -138,6 +139,12 @@ const MainForm = () => {
style={{ marginRight: 5 }}
/>
<Link to={`/vehicle-status/${row.vin}`}>{row.vin}</Link>
{row.ecu_list && (
<>
<br />
<ECUList list={row.ecu_list} search={search} />
</>
)}
</TableCell>
<TableCell align="center">{row.model}</TableCell>
<TableCell align="center">{row.year}</TableCell>