merging dev into branch

src/components/Cars/CarSelectionTable/index.jsx

@@ -17,6 +17,7 @@ import { LocalDateTimeString } from "../../../utils/dates";
 import TableHeaderSortable from "../../Table/HeaderSortable";
 import { logger } from "../../../services/monitoring";
 import ConnectedIcon from "../../Controls/ConnectedIcon";
+import ECUList from "../../Controls/ECUList";
 
 const tableColumns = [
   {
@@ -53,7 +54,7 @@ const CarSelectionTable = (props) => {
   const [order, setOrder] = useState("asc");
   const { getVehicles, vehicles, totalVehicles } = useVehicleContext();
   const { setMessage } = useStatusContext();
-
+  const { search: searchTerm } = search;
   const sortHandler = (event, property) => {
     if (property === orderBy) {
       if (order === "asc") {
@@ -143,6 +144,12 @@ const CarSelectionTable = (props) => {
                     style={{ marginRight: 5 }}
                   />
                   <Link to={`/vehicle-status/${row.vin}`}>{row.vin}</Link>
+                  {row.ecu_list && (
+                    <>
+                      <br />
+                      <ECUList list={row.ecu_list} search={searchTerm} />
+                    </>
+                  )}
                 </TableCell>
                 <TableCell align="center">{row.model}</TableCell>
                 <TableCell align="center">{row.year}</TableCell>

src/components/Cars/List/index.jsx

@@ -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>