CEC-4883: update api shape and display trex version on fleets (#418)

src/components/Contexts/FleetContext.jsx

@@ -113,18 +113,20 @@ export const FleetProvider = ({ children }) => {
         throw new Error(`Get fleet vehicles error. ${result.message}`);
       }
 
-      const connectionsResult = await vehiclesAPI.getConnections({ "VINs": result.data }, token)
+      const vins = result.data.map(vehicle => vehicle.vin);
+      const connectionsResult = await vehiclesAPI.getConnections({ "VINs": vins }, token)
       if (result.error) {
         setFleetVehicles([])
         throw new Error(`Get vehicles connections error. ${result.message}`);
       }
 
       var cars = []
-      result.data.forEach((vin) => {
+      result.data.forEach((vehicle) => {
         cars.push({
-          vin: vin,
-          connected: connectionsResult[vin] || false,
-          connectedHMI: connectionsResult[`2:${vin}`] || false
+          vin: vehicle.vin,
+          connected: connectionsResult[vehicle.vin] || false,
+          connectedHMI: connectionsResult[`2:${vehicle.vin}`] || false,
+          trex_version: vehicle.carstate?.trex_version || "",
         })
       })
 

src/components/Contexts/FleetContext.test.jsx

@@ -347,8 +347,7 @@ describe("FleetContext", () => {
   describe("getFleetVehicles", () => {
     beforeEach(() => {
       const TestComp = () => {
-        const { busy, error, fleetVehicles, getFleetVehicles } =
-          useFleetContext();
+        const { busy, error, fleetVehicles, getFleetVehicles } = useFleetContext();
 
         return (
           <>
@@ -805,16 +804,19 @@ const expectedFleetVehiclesData = [
     vin: "USWESTVIN12345678",
     connected: true,
     connectedHMI: false,
+    trex_version: "",
   },
   {
     vin: "USWESTVIN12345679",
     connected: true,
     connectedHMI: false,
+    trex_version: "",
   },
   {
     vin: "USWESTVIN12345670",
     connected: true,
     connectedHMI: false,
+    trex_version: "",
   },
 ];
 

src/components/Contexts/__mocks__/FleetContext.jsx

@@ -67,17 +67,20 @@ export const useFleetContext = () => ({
       {
         vin: "USWESTVIN12345678",
         connected: false,
-        connectedHMI: false
+        connectedHMI: false,
+        trex_version: "",
       },
       {
         vin: "USWESTVIN12345679",
         connected: true,
-        connectedHMI: true
+        connectedHMI: true,
+        trex_version: "",
       },
       {
         vin: "USWESTVIN12345670",
         connected: false,
-        connectedHMI: false
+        connectedHMI: false,
+        trex_version: "",
       },
     ];
     return Promise.resolve(result);