X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/912507a5c39c975554325f528e9b155ff42a03b1..0737f5067e29dea6a72a6612fddffe64d919e459:/src/views/process-panel/process-io-card.tsx?ds=sidebyside
diff --git a/src/views/process-panel/process-io-card.tsx b/src/views/process-panel/process-io-card.tsx
index 7a2f8094..607bdeb7 100644
--- a/src/views/process-panel/process-io-card.tsx
+++ b/src/views/process-panel/process-io-card.tsx
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import React, { ReactElement, useState } from 'react';
+import React, { ReactElement, memo, useState } from 'react';
import { Dispatch } from 'redux';
import {
StyleRulesCallback,
@@ -56,6 +56,7 @@ import {
isPrimitiveOfType,
StringArrayCommandInputParameter,
StringCommandInputParameter,
+ getEnumType
} from "models/workflow";
import { CommandOutputParameter } from 'cwlts/mappings/v1.0/CommandOutputParameter';
import { File } from 'models/workflow';
@@ -255,7 +256,7 @@ export const ProcessIOCard = withStyles(styles)(connect(null, mapDispatchToProps
const [showImagePreview, setShowImagePreview] = useState(false);
const PanelIcon = label === ProcessIOCardType.INPUT ? InputIcon : OutputIcon;
- const mainProcess = process && process!.containerRequest.requestingContainerUuid;
+ const mainProcess = !(process && process!.containerRequest.requestingContainerUuid);
const loading = raw === null || raw === undefined || params === null;
const hasRaw = !!(raw && Object.keys(raw).length > 0);
@@ -305,9 +306,9 @@ export const ProcessIOCard = withStyles(styles)(connect(null, mapDispatchToProps
}
{/* Once loaded, either raw or params may still be empty
- * Raw when all params are empty
- * Params when raw is provided by containerRequest properties but workflow mount is absent for preview
- */}
+ * Raw when all params are empty
+ * Params when raw is provided by containerRequest properties but workflow mount is absent for preview
+ */}
{(!loading && (hasRaw || hasParams)) &&
<>
@@ -384,7 +385,7 @@ interface ProcessIOPreviewDataProps {
type ProcessIOPreviewProps = ProcessIOPreviewDataProps & WithStyles;
-const ProcessIOPreview = withStyles(styles)(
+const ProcessIOPreview = memo(withStyles(styles)(
({ classes, data, showImagePreview, valueLabel }: ProcessIOPreviewProps) => {
const showLabel = data.some((param: ProcessIOParameter) => param.label);
return
@@ -404,7 +405,7 @@ const ProcessIOPreview = withStyles(styles)(
[classes.noBorderRow]: (rest.length > 0),
};
- return <>
+ return
{param.id}
@@ -424,7 +425,7 @@ const ProcessIOPreview = withStyles(styles)(
[classes.noBorderRow]: (i < rest.length - 1),
[classes.secondaryRow]: val.secondary,
};
- return
+ return
{showLabel && }
@@ -437,11 +438,11 @@ const ProcessIOPreview = withStyles(styles)(
})}
- >;
+ ;
})}
-
;
- });
+ ;
+ }));
interface ProcessValuePreviewProps {
value: ProcessIOValue;
@@ -556,9 +557,7 @@ export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParam
[directoryToProcessIOValue(directory, auth, pdh)] :
[{ display: }];
- case typeof input.type === 'object' &&
- !(input.type instanceof Array) &&
- input.type.type === 'enum':
+ case getEnumType(input) !== null:
const enumValue = (input as EnumCommandInputParameter).value;
return enumValue !== undefined && enumValue ?
[{ display: {enumValue}
}] :
@@ -588,16 +587,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 :