From 3e18e35172808479d02e02985563d658fec7bb0f Mon Sep 17 00:00:00 2001 From: Stephen Smith Date: Tue, 9 May 2023 10:42:04 -0400 Subject: [PATCH] 20424: Process io parameter parsing in single loop to optimize performance Arvados-DCO-1.1-Signed-off-by: Stephen Smith --- src/views/process-panel/process-io-card.tsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/process-panel/process-io-card.tsx b/src/views/process-panel/process-io-card.tsx index 7da91bc4..c0dcb7f0 100644 --- a/src/views/process-panel/process-io-card.tsx +++ b/src/views/process-panel/process-io-card.tsx @@ -588,16 +588,16 @@ export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParam const fileArrayMainFiles = ((input as FileArrayCommandInputParameter).value || []); 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 [ + // Convert each main and secondaryFiles into array of ProcessIOValue preserving ordering + let fileArrayValues: ProcessIOValue[] = []; + for(let i = 0; i < fileArrayMainFiles.length; i++) { + const secondaryFiles = ((fileArrayMainFiles[i] as unknown) as FileWithSecondaryFiles)?.secondaryFiles || []; + fileArrayValues.push( // Pass firstMainFilePdh to secondary files and every main file besides the first to hide pdh if equal - ...(mainFile ? [fileToProcessIOValue(mainFile, false, auth, pdh, i > 0 ? firstMainFilePdh : "")] : []), + ...(fileArrayMainFiles[i] ? [fileToProcessIOValue(fileArrayMainFiles[i], 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 - }).reduce((acc: ProcessIOValue[], mainFile: ProcessIOValue[]) => (acc.concat(mainFile)), []); + ); + } return fileArrayValues.length ? fileArrayValues : -- 2.30.2