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

@@ -25,6 +25,7 @@ import { Roles, hasRole } from "../../../utils/roles";
import TableHeaderSortable from "../../Table/HeaderSortable";
import SearchField from "../../Controls/SearchField";
import { logger } from "../../../services/monitoring";
import ECUList from "../../Controls/ECUList";
const tableColumns = [
{
@@ -195,7 +196,15 @@ const UpdatePackagesList = () => {
{packages.map((row) => (
<TableRow key={row.id}>
<TableCell align="center">{row.id}</TableCell>
<TableCell align="center">{row.package_name}</TableCell>
<TableCell align="center">
{row.package_name}
{row.ecu_list && (
<>
<br />
<ECUList list={row.ecu_list} search={search} />
</>
)}
</TableCell>
<TableCell align="center">{row.version}</TableCell>
<TableCell align="center">
{LocalDateTimeString(row.created)}