From 8a5cbfb69be9405bd2e798ec830a8d1c679adeb7 Mon Sep 17 00:00:00 2001 From: Stephen Smith Date: Thu, 29 Sep 2022 17:22:34 -0400 Subject: [PATCH] 16073: Correctly fetch raw inputs wihtout processing Arvados-DCO-1.1-Signed-off-by: Stephen Smith --- src/store/processes/processes-actions.ts | 5 +++++ src/views/process-panel/process-panel-root.tsx | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/store/processes/processes-actions.ts b/src/store/processes/processes-actions.ts index dbca03ab..eb04ed67 100644 --- a/src/store/processes/processes-actions.ts +++ b/src/store/processes/processes-actions.ts @@ -133,6 +133,11 @@ export const reRunProcess = (processUuid: string, workflowUuid: string) => } }; +export const getRawInputs = (data: any): CommandInputParameter[] | undefined => { + if (!data || !data.mounts || !data.mounts[MOUNT_PATH_CWL_INPUT]) { return undefined; } + return (data.mounts[MOUNT_PATH_CWL_INPUT].content); +} + export const getInputs = (data: any): CommandInputParameter[] => { if (!data || !data.mounts || !data.mounts[MOUNT_PATH_CWL_WORKFLOW]) { return []; } const inputs = getWorkflowInputs(data.mounts[MOUNT_PATH_CWL_WORKFLOW].content); diff --git a/src/views/process-panel/process-panel-root.tsx b/src/views/process-panel/process-panel-root.tsx index 1651b63a..9fc043d9 100644 --- a/src/views/process-panel/process-panel-root.tsx +++ b/src/views/process-panel/process-panel-root.tsx @@ -17,7 +17,7 @@ import { getIOParamDisplayValue, ProcessIOCard, ProcessIOCardType, ProcessIOPara import { getProcessPanelLogs, ProcessLogsPanel } from 'store/process-logs-panel/process-logs-panel'; import { ProcessLogsCard } from './process-log-card'; import { FilterOption } from 'views/process-panel/process-log-form'; -import { getInputs, getInputCollectionMounts, getOutputParameters } from 'store/processes/processes-actions'; +import { getInputs, getInputCollectionMounts, getOutputParameters, getRawInputs } from 'store/processes/processes-actions'; import { CommandInputParameter, getIOParamId } from 'models/workflow'; import { CommandOutputParameter } from 'cwlts/mappings/v1.0/CommandOutputParameter'; import { AuthState } from 'store/auth/auth-reducer'; @@ -97,9 +97,11 @@ export const ProcessPanelRoot = withStyles(styles)( React.useEffect(() => { if (process) { - const rawInputs = getInputs(process.containerRequest); + const rawInputs = getRawInputs(process.containerRequest); setInputs(rawInputs); - setProcessedInputs(formatInputData(rawInputs, auth)); + + const inputs = getInputs(process.containerRequest); + setProcessedInputs(formatInputData(inputs, auth)); } }, [requestUuid, auth, process]); -- 2.30.2