CEC-6016: remove singleton usage (#525)
* CEC-6016: add trim to fleet * update snapshot * CEC-6016: remove singleton in vehicle fetch
This commit is contained in:
@@ -214,53 +214,51 @@ const MainForm = ({ name }) => {
|
||||
selectCount={selected.length}
|
||||
rowCount={fleetVehicles.length}
|
||||
/>
|
||||
<VehicleProvider>
|
||||
<TableBody>
|
||||
{fleetVehicles && fleetVehicles.map((car) => {
|
||||
const isSelected = selected.includes(car.vin);
|
||||
return (car.vin && <TableRow key={"row" + car.vin}>
|
||||
<TableCell padding="checkbox">
|
||||
<Checkbox
|
||||
checked={isSelected}
|
||||
onChange={() => handleSelect(car.vin, !isSelected)}
|
||||
/>
|
||||
</TableCell>
|
||||
<TableCell key={"cell" + car.vin} align="center">
|
||||
<VehicleTeaser
|
||||
vin={car.vin}
|
||||
icc={car.connectedHMI}
|
||||
trex={car.connected}
|
||||
token={token}
|
||||
/>
|
||||
</TableCell>
|
||||
<TableCell key={"cell2" + car.vin} align="center">{car.trex_version}</TableCell>
|
||||
<TableCell key={"cell3" + car.car_update_name}>
|
||||
<Tooltip key={"cell3tooltip"} title={`${car.car_update_id} / ${car.car_update_type}`}>
|
||||
<Link to={`/vehicle-status/${car.vin}/${car.car_update_id}`} className={classes.truncateCell}>
|
||||
{car.car_update_name}
|
||||
</Link>
|
||||
</Tooltip>
|
||||
</TableCell>
|
||||
<TableCell key={"cell4" + car.vin}>
|
||||
{car.car_update_status}
|
||||
{car.car_update_progress > -1 && (
|
||||
<LinearProgress variant="determinate" value={car.car_update_progress} />
|
||||
)}
|
||||
</TableCell>
|
||||
<TableCell key={"cell5" + car.vin} align="left">
|
||||
<Battery percent={car.charge} charge={car.charge_type} />
|
||||
</TableCell>
|
||||
<TableCell key={"cell6" + car.vin}>
|
||||
{car.voltage > 0 && `${car.voltage}V`}
|
||||
</TableCell>
|
||||
<TableCell key={"cell7" + car.vin}>
|
||||
{car.park ? "Yes" : "No"}
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
)
|
||||
})}
|
||||
</TableBody>
|
||||
</VehicleProvider>
|
||||
<TableBody>
|
||||
{fleetVehicles && fleetVehicles.map((car) => {
|
||||
const isSelected = selected.includes(car.vin);
|
||||
return (car.vin && <TableRow key={"row" + car.vin}>
|
||||
<TableCell padding="checkbox">
|
||||
<Checkbox
|
||||
checked={isSelected}
|
||||
onChange={() => handleSelect(car.vin, !isSelected)}
|
||||
/>
|
||||
</TableCell>
|
||||
<TableCell key={"cell" + car.vin} align="center">
|
||||
<VehicleTeaser
|
||||
vin={car.vin}
|
||||
icc={car.connectedHMI}
|
||||
trex={car.connected}
|
||||
token={token}
|
||||
/>
|
||||
</TableCell>
|
||||
<TableCell key={"cell2" + car.vin} align="center">{car.trex_version}</TableCell>
|
||||
<TableCell key={"cell3" + car.car_update_name}>
|
||||
<Tooltip key={"cell3tooltip"} title={`${car.car_update_id} / ${car.car_update_type}`}>
|
||||
<Link to={`/vehicle-status/${car.vin}/${car.car_update_id}`} className={classes.truncateCell}>
|
||||
{car.car_update_name}
|
||||
</Link>
|
||||
</Tooltip>
|
||||
</TableCell>
|
||||
<TableCell key={"cell4" + car.vin}>
|
||||
{car.car_update_status}
|
||||
{car.car_update_progress > -1 && (
|
||||
<LinearProgress variant="determinate" value={car.car_update_progress} />
|
||||
)}
|
||||
</TableCell>
|
||||
<TableCell key={"cell5" + car.vin} align="left">
|
||||
<Battery percent={car.charge} charge={car.charge_type} />
|
||||
</TableCell>
|
||||
<TableCell key={"cell6" + car.vin}>
|
||||
{car.voltage > 0 && `${car.voltage}V`}
|
||||
</TableCell>
|
||||
<TableCell key={"cell7" + car.vin}>
|
||||
{car.park ? "Yes" : "No"}
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
)
|
||||
})}
|
||||
</TableBody>
|
||||
<TableFooter>
|
||||
<TableRow>
|
||||
<TablePagination
|
||||
|
||||
Reference in New Issue
Block a user