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';
import { ProcessCmdCard } from './process-cmd-card';
+import { ContainerRequestResource } from 'models/container-request';
type CssRules = 'root';
onLogFilterChange: (filter: FilterOption) => void;
navigateToLog: (uuid: string) => void;
onCopyToClipboard: (uuid: string) => void;
- fetchOutputs: (uuid: string, fetchOutputs) => void;
+ fetchOutputs: (containerRequest: ContainerRequestResource, fetchOutputs) => void;
}
export type ProcessPanelRootProps = ProcessPanelRootDataProps & ProcessPanelRootActionProps & WithStyles<CssRules>;
export const ProcessPanelRoot = withStyles(styles)(
({ process, auth, processLogsPanel, fetchOutputs, ...props }: ProcessPanelRootProps) => {
- const [outputDetails, setOutputs] = useState<OutputDetails>({});
- const [rawInputs, setInputs] = useState<CommandInputParameter[]>([]);
+ const [outputDetails, setOutputs] = useState<OutputDetails | undefined>(undefined);
+ const [outputDefinitions, setOutputDefinitions] = useState<CommandOutputParameter[]>([]);
+ const [rawInputs, setInputs] = useState<CommandInputParameter[] | undefined>(undefined);
-
- const [processedOutputs, setProcessedOutputs] = useState<ProcessIOParameter[]>([]);
- const [processedInputs, setProcessedInputs] = useState<ProcessIOParameter[]>([]);
+ const [processedOutputs, setProcessedOutputs] = useState<ProcessIOParameter[] | undefined>(undefined);
+ const [processedInputs, setProcessedInputs] = useState<ProcessIOParameter[] | undefined>(undefined);
const outputUuid = process?.containerRequest.outputUuid;
const requestUuid = process?.containerRequest.uuid;
+ const containerRequest = process?.containerRequest;
+
const inputMounts = getInputCollectionMounts(process?.containerRequest);
+ // Resets state when changing processes
+ React.useEffect(() => {
+ setOutputs(undefined);
+ setOutputDefinitions([]);
+ setInputs(undefined);
+ setProcessedOutputs(undefined);
+ setProcessedInputs(undefined);
+ }, [requestUuid]);
+
+ // Fetch raw output (async for fetching from keep)
+ React.useEffect(() => {
+ if (containerRequest) {
+ fetchOutputs(containerRequest, setOutputs);
+ }
+ }, [containerRequest, fetchOutputs]);
+
+ // Fetch outputDefinitons from mounts whenever containerRequest is updated
React.useEffect(() => {
- if (outputUuid) {
- fetchOutputs(outputUuid, setOutputs);
+ if (containerRequest && containerRequest.mounts) {
+ const newOutputDefinitions = getOutputParameters(containerRequest);
+ // Avoid setting output definitions to [] when mounts briefly go missing
+ if (newOutputDefinitions.length) {
+ setOutputDefinitions(newOutputDefinitions);
+ }
}
- }, [outputUuid, fetchOutputs]);
+ }, [containerRequest]);
+ // Format raw output into ProcessIOParameter[] when it changes
React.useEffect(() => {
- if (outputDetails.rawOutputs && process) {
- const outputDefinitions = getOutputParameters(process.containerRequest);
+ if (outputDetails !== undefined && outputDetails.rawOutputs) {
+ // Update processed outputs as long as outputDetails is loaded (or failed to load with {} rawOutputs)
setProcessedOutputs(formatOutputData(outputDefinitions, outputDetails.rawOutputs, outputDetails.pdh, auth));
- } else {
- setProcessedOutputs([]);
}
- }, [outputDetails, auth, process]);
+ }, [outputDetails, auth, outputDefinitions]);
+ // Fetch raw inputs and format into ProcessIOParameter[]
+ // Can be sync because inputs are either already in containerRequest mounts or props
React.useEffect(() => {
- if (process) {
- const rawInputs = getInputs(process.containerRequest);
- setInputs(rawInputs);
- setProcessedInputs(formatInputData(rawInputs, auth));
+ if (containerRequest) {
+ // Since mounts can disappear and reappear, only set inputs if raw / processed inputs is undefined or new inputs has content
+ const newRawInputs = getRawInputs(containerRequest);
+ if (rawInputs === undefined || (newRawInputs && newRawInputs.length)) {
+ setInputs(newRawInputs);
+ }
+ const newInputs = getInputs(containerRequest);
+ if (processedInputs === undefined || (newInputs && newInputs.length)) {
+ setProcessedInputs(formatInputData(newInputs, auth));
+ }
}
- }, [requestUuid, auth, process]);
+ }, [requestUuid, auth, containerRequest, processedInputs, rawInputs]);
return process
? <MPVContainer className={props.classes.root} spacing={8} panelStates={panelsData} justify-content="flex-start" direction="column" wrap="nowrap">
navigateToLog={props.navigateToLog}
/>
</MPVPanelContent>
- <MPVPanelContent forwardProps xs="auto" data-cy="process-inputs">
+ <MPVPanelContent forwardProps xs maxHeight='50%' data-cy="process-inputs">
<ProcessIOCard
label={ProcessIOCardType.INPUT}
+ process={process}
params={processedInputs}
raw={rawInputs}
mounts={inputMounts}
/>
</MPVPanelContent>
- <MPVPanelContent forwardProps xs="auto" data-cy="process-outputs">
+ <MPVPanelContent forwardProps xs maxHeight='50%' data-cy="process-outputs">
<ProcessIOCard
label={ProcessIOCardType.OUTPUT}
+ process={process}
params={processedOutputs}
- raw={outputDetails.rawOutputs}
+ raw={outputDetails?.rawOutputs}
outputUuid={outputUuid || ""}
/>
</MPVPanelContent>
const formatInputData = (inputs: CommandInputParameter[], auth: AuthState): ProcessIOParameter[] => {
return inputs.map(input => {
- const doc = Array.isArray(input.doc) ? input.doc.join(', ') : input.doc;
return {
id: getIOParamId(input),
- doc: input.label || doc || "",
+ label: input.label || "",
value: getIOParamDisplayValue(auth, input)
};
});
const formatOutputData = (definitions: CommandOutputParameter[], values: any, pdh: string | undefined, auth: AuthState): ProcessIOParameter[] => {
return definitions.map(output => {
- const doc = Array.isArray(output.doc) ? output.doc.join(', ') : output.doc;
return {
id: getIOParamId(output),
- doc: output.label || doc || "",
+ label: output.label || "",
value: getIOParamDisplayValue(auth, Object.assign(output, { value: values[getIOParamId(output)] || [] }), pdh)
};
});
projects / arvados-workbench2.git / blobdiff