From afa3c1e5292e3393dcac6e188e60ff5045611ec4 Mon Sep 17 00:00:00 2001 From: John Wu <76966357+jwu-fisker@users.noreply.github.com> Date: Mon, 11 Apr 2022 15:43:10 -0700 Subject: [PATCH] CEC-1320 Update for memory regions (#135) * CEC-1320 Update for memory regions * Clean up --- .../Contexts/__mocks__/ManifestsContext.jsx | 23 ++++++++++++++- .../Details/__snapshots__/index.test.jsx.snap | 28 +++++++++++++++++-- src/components/Manifest/Details/index.jsx | 11 ++++++-- 3 files changed, 56 insertions(+), 6 deletions(-) diff --git a/src/components/Contexts/__mocks__/ManifestsContext.jsx b/src/components/Contexts/__mocks__/ManifestsContext.jsx index 0d3dbfd..17a2638 100644 --- a/src/components/Contexts/__mocks__/ManifestsContext.jsx +++ b/src/components/Contexts/__mocks__/ManifestsContext.jsx @@ -20,8 +20,29 @@ let manifest = { file_id: "b0cda514c94080b4", filename: "LARGE.jpg", url: "https://upload-dev.fiskerdps.com/92bbc448-99c8-4851-91ad-f8042e4deb49/LARGE.jpg", + write_region: { + offset: 100, + length: 14488498, + }, + erase_region: { + offset: 0, + length: 120559274, + }, file_size: 14559274, - size: 14488498, + type: "ODX Data", + created: "2021-12-09T22:38:29.102813Z", + updated: "2021-12-09T22:38:29.102813Z", + }, + { + file_id: "4B897b1DcbeCds8e9", + filename: "SMALL.jpg", + url: "https://upload-dev.fiskerdps.com/92bbc448-99c8-4851-91ad-f8042e4deb49/SMALL.jpg", + write_region: { + offset: 120559274, + length: 559274, + }, + checksum: "0a06d87c", + file_size: 488498, type: "ODX Data", created: "2021-12-09T22:38:29.102813Z", updated: "2021-12-09T22:38:29.102813Z", diff --git a/src/components/Manifest/Details/__snapshots__/index.test.jsx.snap b/src/components/Manifest/Details/__snapshots__/index.test.jsx.snap index 8184647..84b1ed0 100644 --- a/src/components/Manifest/Details/__snapshots__/index.test.jsx.snap +++ b/src/components/Manifest/Details/__snapshots__/index.test.jsx.snap @@ -125,7 +125,19 @@ Object { > LARGE.jpg - , File ID: b0cda514c94080b4, Type: ODX Data, Download Size: 14559274, File Size: 14488498, Offset: 0, CRC32: 00000000 + , File ID: b0cda514c94080b4, Type: ODX Data, Download Size: 14559274, CRC32: 00000000 + , Write: [Offset: 100, Length: 14488498] + , Erase: [Offset: 0, Length: 120559274] + +
  • + + SMALL.jpg + + , File ID: 4B897b1DcbeCds8e9, Type: ODX Data, Download Size: 488498, CRC32: 0a06d87c + , Write: [Offset: 120559274, Length: 559274] +
  • @@ -168,7 +180,19 @@ Object { > LARGE.jpg - , File ID: b0cda514c94080b4, Type: ODX Data, Download Size: 14559274, File Size: 14488498, Offset: 0, CRC32: 00000000 + , File ID: b0cda514c94080b4, Type: ODX Data, Download Size: 14559274, CRC32: 00000000 + , Write: [Offset: 100, Length: 14488498] + , Erase: [Offset: 0, Length: 120559274] + +
  • + + SMALL.jpg + + , File ID: 4B897b1DcbeCds8e9, Type: ODX Data, Download Size: 488498, CRC32: 0a06d87c + , Write: [Offset: 120559274, Length: 559274] +
  • diff --git a/src/components/Manifest/Details/index.jsx b/src/components/Manifest/Details/index.jsx index 32ca3e9..addf6eb 100644 --- a/src/components/Manifest/Details/index.jsx +++ b/src/components/Manifest/Details/index.jsx @@ -6,6 +6,11 @@ import { useStatusContext } from "../../Contexts/StatusContext"; import { useUserContext } from "../../Contexts/UserContext"; import useStyles from "../../useStyles"; +const getMemoryRegion = (label, region) => { + if (!region) return ""; + return `, ${label}: [Offset: ${region.offset}, Length: ${region.length}]`; +}; + const ECUFileList = (files) => { if (!files || files.length === 0) return "No files"; return ( @@ -15,9 +20,9 @@ const ECUFileList = (files) => { {file.filename} {`, File ID: ${file.file_id}, Type: ${file.type}, Download Size: ${ file.file_size - }, File Size: ${file.size}, Offset: ${file.offset ?? 0}, CRC32: ${ - file.checksum ?? "00000000" - }`} + }, CRC32: ${file.checksum ?? "00000000"} + ${getMemoryRegion("Write", file.write_region)} + ${getMemoryRegion("Erase", file.erase_region)}`} ))}