Merge branch 'main' into CEC-3796

This commit is contained in:
Paul Adamsen
2023-10-16 21:54:25 -04:00
committed by GitHub
4 changed files with 116 additions and 15 deletions

View File

@@ -155,8 +155,10 @@ export const FleetProvider = ({ children }) => {
const result = await updatesApi.getCarUpdateProgress(
carUpdateIdsRef.current.join(","),
token
);
let pivot = result.statuses.length - 1;
).catch(() => {
return Promise.reject();
});
let pivot = result.statuses?.length ? result.statuses.length - 1 : 0;
setFleetVehicles((fleetVehicles) => fleetVehicles.map((vehicle) => {
result.statuses.find((status, i) => {
if (vehicle.car_update_id !== status.car_update_id) {
@@ -313,7 +315,7 @@ export const FleetProvider = ({ children }) => {
useEffect(() => {
setCarUpdateIds(() => fleetVehicles
.filter((vehicle) => vehicle.car_update_status !== "installed")
.filter((vehicle) => vehicle.car_update_status && vehicle.car_update_status !== "installed")
.map((vehicle) => vehicle.car_update_id));
}, [fleetVehicles, setCarUpdateIds]);