From: Stephen Smith Date: Mon, 17 Oct 2022 21:03:54 +0000 (-0400) Subject: 16073: Add guards against null file parameters X-Git-Tag: 2.5.0~31^2~12 X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/542c909d574067382de91721b42d5f05da4035da 16073: Add guards against null file parameters Arvados-DCO-1.1-Signed-off-by: Stephen Smith --- diff --git a/src/views/process-panel/process-io-card.tsx b/src/views/process-panel/process-io-card.tsx index 0d148d72..b5bc08bc 100644 --- a/src/views/process-panel/process-io-card.tsx +++ b/src/views/process-panel/process-io-card.tsx @@ -548,14 +548,14 @@ export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParam case isArrayOfType(input, CWLType.FILE): const fileArrayMainFiles = ((input as FileArrayCommandInputParameter).value || []); - const firstMainFilePdh = fileArrayMainFiles.length > 0 ? getResourcePdhUrl(fileArrayMainFiles[0], pdh) : ""; + const firstMainFilePdh = (fileArrayMainFiles.length > 0 && fileArrayMainFiles[0]) ? getResourcePdhUrl(fileArrayMainFiles[0], pdh) : ""; // Convert each main file into separate arrays of ProcessIOValue to preserve secondaryFile grouping const fileArrayValues = fileArrayMainFiles.map((mainFile: File, i): ProcessIOValue[] => { const secondaryFiles = ((mainFile as unknown) as FileWithSecondaryFiles)?.secondaryFiles || []; return [ // Pass firstMainFilePdh to secondary files and every main file besides the first to hide pdh if equal - fileToProcessIOValue(mainFile, false, auth, pdh, i > 0 ? firstMainFilePdh : ""), + ...(mainFile ? [fileToProcessIOValue(mainFile, false, auth, pdh, i > 0 ? firstMainFilePdh : "")] : []), ...(secondaryFiles.map(file => fileToProcessIOValue(file, true, auth, pdh, firstMainFilePdh))) ]; // Reduce each mainFile/secondaryFile group into single array preserving ordering