diff --git a/BACKEND/app/ultils/templates/show_version.ts b/BACKEND/app/ultils/templates/show_version.ts index ce19b82..5eab9c5 100644 --- a/BACKEND/app/ultils/templates/show_version.ts +++ b/BACKEND/app/ultils/templates/show_version.ts @@ -25,7 +25,7 @@ const parseLog = (data: string) => { // 4. MEMORY & HARDWARE XRegExp('^(?\\d+[KMG])\\s+bytes\\s+of\\s+physical\\s+memory', 'i'), XRegExp( - '[Cc]isco\\s+(?\\S+)\\s+\\(.+?\\)\\s+processor\\s+with\\s+(?\\d+[KMG]\\/\\d+[KMG])\\s+bytes\\s+of\\s+memory', + '[Cc]isco\\s+(?\\S+).+?with\\s+(?\\d+[KMG]\\/\\d+[KMG])\\s+bytes\\s+of\\s+memory', 'i' ), // 5. Flash / Storage diff --git a/FRONTEND/src/components/Modal/ModalTerminal.tsx b/FRONTEND/src/components/Modal/ModalTerminal.tsx index e2c3543..08ff704 100644 --- a/FRONTEND/src/components/Modal/ModalTerminal.tsx +++ b/FRONTEND/src/components/Modal/ModalTerminal.tsx @@ -832,18 +832,27 @@ const ModalTerminal = ({ : ""} - - - Mem/Flash: - - - {findDataShowVersion() - ? (findDataShowVersion()?.MEMORY || "") + - (findDataShowVersion()?.USB_FLASH - ? " - " + (findDataShowVersion()?.USB_FLASH || "") - : "") - : ""} - + + + + Mem: + + + {findDataShowVersion() + ? findDataShowVersion()?.MEMORY || "" + : ""} + + + + + Flash: + + + {findDataShowVersion() + ? findDataShowVersion()?.USB_FLASH + : ""} + +