Merge branch 'main' into CEC-5672

src/components/Manifest/Details/__snapshots__/index.test.jsx.snap

@@ -116,7 +116,7 @@ Object {
               ECUs: 
               <ul>
                 <li>
-                  ICC, SW Version: 1000, HW Version: none, Mode: D
+                  ICC, SW Version: 1000, HW Version: None, Mode: D
                   <br />
                   <ul>
                     <li>
@@ -171,7 +171,7 @@ Object {
             ECUs: 
             <ul>
               <li>
-                ICC, SW Version: 1000, HW Version: none, Mode: D
+                ICC, SW Version: 1000, HW Version: None, Mode: D
                 <br />
                 <ul>
                   <li>

src/components/Manifest/Details/index.jsx

@@ -23,8 +23,7 @@ const ECUFileList = (files) => {
       {files.map((file) => (
         <li key={file.file_id}>
           <a href={file.url}>{getFilename(file.url)}</a>
-          {`, File ID: ${file.file_id}, Type: ${file.type}, Download Size: ${
+          {`, File ID: ${file.file_id}, Type: ${file.type}, Download Size: ${file.file_size
-            file.file_size
             }, CRC32: ${file.checksum ?? "00000000"}
           ${getMemoryRegion("Write", file.write_region)}
           ${getMemoryRegion("Erase", file.erase_region)}`}
@@ -35,20 +34,28 @@ const ECUFileList = (files) => {
 };
 
 const ECUList = (ecus) => {
-  if (!ecus || ecus.length === 0) return "None";
+  const none = "None";
+  if (!ecus || ecus.length === 0) return none;
+
   return (
     <ul>
-      {ecus.map((ecu) => (
+      {ecus.map((ecu) => {
+        const name = ecu.name;
+        const version = ecu.version ?? none;
+        const hardwareVersions = ecu.hw_versions?.join(", ") ?? ecu.hw_version ?? none;
+        let mode = ecu.mode ?? "D";
+        if (ecu.self_download) {
+          mode += ", Self Download"
+        }
+
+        return (
           <li key={ecu.name}>
-          {`${ecu.name}, SW Version: ${ecu.version ?? "None"}, HW Version: ${
+            {`${name}, SW Version: ${version}, HW Version: ${hardwareVersions}, Mode: ${mode}`}
-            ecu.hw_version ?? "none"
-          }, Mode: ${ecu.mode ?? "D"}${
-            ecu.self_download ? ", Self Download" : ""
-          }`}
             <br />
             {ECUFileList(ecu.files)}
           </li>
-      ))}
+        )
+      })}
     </ul>
   );
 };
@@ -104,8 +111,7 @@ const ManifestDetails = ({ opened }) => {
         Hide Details
       </div>
       <ul>
-        <li>{`${manifest.name} ${manifest.version} [${
+        <li>{`${manifest.name} ${manifest.version} [${manifest.type || "standard"
-          manifest.type || "standard"
           }]`}</li>
         <li>{`${manifest.description} ${manifest.release_notes}`}</li>
         <li>ECUs: {ECUList(manifest.ecu_updates)}</li>