X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/88b93fd119eecca0247a9bb5a6fe14015d582826..4dd738fa98e3726fcd99a37e334b5ea8db4e5ee0:/src/views/process-panel/process-io-card.tsx diff --git a/src/views/process-panel/process-io-card.tsx b/src/views/process-panel/process-io-card.tsx index 4f93f48c..7da91bc4 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, @@ -39,23 +39,23 @@ import { } from 'components/icon/icon'; import { MPVPanelProps } from 'components/multi-panel-view/multi-panel-view'; import { - BooleanCommandInputParameter, - CommandInputParameter, - CWLType, - Directory, - DirectoryArrayCommandInputParameter, - DirectoryCommandInputParameter, - EnumCommandInputParameter, - FileArrayCommandInputParameter, - FileCommandInputParameter, - FloatArrayCommandInputParameter, - FloatCommandInputParameter, - IntArrayCommandInputParameter, - IntCommandInputParameter, - isArrayOfType, - isPrimitiveOfType, - StringArrayCommandInputParameter, - StringCommandInputParameter, + BooleanCommandInputParameter, + CommandInputParameter, + CWLType, + Directory, + DirectoryArrayCommandInputParameter, + DirectoryCommandInputParameter, + EnumCommandInputParameter, + FileArrayCommandInputParameter, + FileCommandInputParameter, + FloatArrayCommandInputParameter, + FloatCommandInputParameter, + IntArrayCommandInputParameter, + IntCommandInputParameter, + isArrayOfType, + isPrimitiveOfType, + StringArrayCommandInputParameter, + StringCommandInputParameter, } from "models/workflow"; import { CommandOutputParameter } from 'cwlts/mappings/v1.0/CommandOutputParameter'; import { File } from 'models/workflow'; @@ -74,29 +74,30 @@ import { Process } from 'store/processes/process'; import { navigateTo } from 'store/navigation/navigation-action'; import classNames from 'classnames'; import { DefaultCodeSnippet } from 'components/default-code-snippet/default-code-snippet'; +import { KEEP_URL_REGEX } from 'models/resource'; type CssRules = - | "card" - | "content" - | "title" - | "header" - | "avatar" - | "iconHeader" - | "tableWrapper" - | "tableRoot" - | "paramValue" - | "keepLink" - | "collectionLink" - | "imagePreview" - | "valArray" - | "secondaryVal" - | "secondaryRow" - | "emptyValue" - | "noBorderRow" - | "symmetricTabs" - | "imagePlaceholder" - | "rowWithPreview" - | "labelColumn"; + | "card" + | "content" + | "title" + | "header" + | "avatar" + | "iconHeader" + | "tableWrapper" + | "tableRoot" + | "paramValue" + | "keepLink" + | "collectionLink" + | "imagePreview" + | "valArray" + | "secondaryVal" + | "secondaryRow" + | "emptyValue" + | "noBorderRow" + | "symmetricTabs" + | "imagePlaceholder" + | "rowWithPreview" + | "labelColumn"; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ card: { @@ -108,7 +109,7 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ }, iconHeader: { fontSize: '1.875rem', - color: theme.customs.colors.green700, + color: theme.customs.colors.greyL, }, avatar: { alignSelf: 'flex-start', @@ -124,10 +125,13 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ }, title: { overflow: 'hidden', - paddingTop: theme.spacing.unit * 0.5 + paddingTop: theme.spacing.unit * 0.5, + color: theme.customs.colors.greyD, + fontSize: '1.875rem' }, tableWrapper: { - height: `calc(100% - ${theme.spacing.unit * 6}px)`, + height: 'auto', + maxHeight: `calc(100% - ${theme.spacing.unit * 4.5}px)`, overflow: 'auto', }, tableRoot: { @@ -183,7 +187,7 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ top: '-9px', }, emptyValue: { - color: theme.customs.colors.grey500, + color: theme.customs.colors.grey700, }, noBorderRow: { '& td': { @@ -217,12 +221,13 @@ export enum ProcessIOCardType { OUTPUT = 'Outputs', } export interface ProcessIOCardDataProps { - process: Process; + process?: Process; label: ProcessIOCardType; params: ProcessIOParameter[] | null; raw: any; mounts?: InputCollectionMount[]; outputUuid?: string; + showParams?: boolean; } export interface ProcessIOCardActionProps { @@ -236,21 +241,30 @@ const mapDispatchToProps = (dispatch: Dispatch): ProcessIOCardActionProps => ({ type ProcessIOCardProps = ProcessIOCardDataProps & ProcessIOCardActionProps & WithStyles & MPVPanelProps; export const ProcessIOCard = withStyles(styles)(connect(null, mapDispatchToProps)( - ({ classes, label, params, raw, mounts, outputUuid, doHidePanel, doMaximizePanel, doUnMaximizePanel, panelMaximized, panelName, process, navigateTo }: ProcessIOCardProps) => { + ({ classes, label, params, raw, mounts, outputUuid, doHidePanel, doMaximizePanel, + doUnMaximizePanel, panelMaximized, panelName, process, navigateTo, showParams }: ProcessIOCardProps) => { const [mainProcTabState, setMainProcTabState] = useState(0); + const [subProcTabState, setSubProcTabState] = useState(0); const handleMainProcTabChange = (event: React.MouseEvent, value: number) => { setMainProcTabState(value); } + const handleSubProcTabChange = (event: React.MouseEvent, value: number) => { + setSubProcTabState(value); + } const [showImagePreview, setShowImagePreview] = useState(false); const PanelIcon = label === ProcessIOCardType.INPUT ? InputIcon : OutputIcon; - const mainProcess = !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); const hasParams = !!(params && params.length > 0); + // Subprocess + const hasInputMounts = !!(label === ProcessIOCardType.INPUT && mounts && mounts.length); + const hasOutputCollecton = !!(label === ProcessIOCardType.OUTPUT && outputUuid); + return - { mainProcess && - {setShowImagePreview(!showImagePreview)}}>{showImagePreview ? : } - } - { doUnMaximizePanel && panelMaximized && - - - } - { doMaximizePanel && !panelMaximized && - - - } - { doHidePanel && - - - } + {mainProcess && + { setShowImagePreview(!showImagePreview) }}>{showImagePreview ? : } + } + {doUnMaximizePanel && panelMaximized && + + + } + {doMaximizePanel && !panelMaximized && + + + } + {doHidePanel && + + + } } /> - {mainProcess ? + {(mainProcess || showParams) ? (<> {/* raw is undefined until params are loaded */} {loading && } {/* 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)) && <> {/* params will be empty on processes without workflow definitions in mounts, so we only show raw */} {hasParams && } - + {!showParams && } {(mainProcTabState === 0 && params && hasParams) &&
- -
} + + } {(mainProcTabState === 1 || !hasParams) &&
- -
} + + } } {!loading && !hasRaw && !hasParams && @@ -314,25 +328,32 @@ export const ProcessIOCard = withStyles(styles)(connect(null, mapDispatchToProps ) : // Subprocess (<> - {((mounts && mounts.length) || outputUuid) ? + {loading && + + } + {!loading && (hasInputMounts || hasOutputCollecton || hasRaw) ? <> - - {label === ProcessIOCardType.INPUT && } - {label === ProcessIOCardType.OUTPUT && } + + {hasInputMounts && } + {hasOutputCollecton && } +
- {label === ProcessIOCardType.INPUT && } - {label === ProcessIOCardType.OUTPUT && <> + {subProcTabState === 0 && hasInputMounts && } + {subProcTabState === 0 && hasOutputCollecton && <> {outputUuid && - Output Collection: {navigateTo(outputUuid || "")}}> - {outputUuid} - } + Output Collection: { navigateTo(outputUuid || "") }}> + {outputUuid} + } } + {(subProcTabState === 1 || (!hasInputMounts && !hasOutputCollecton)) &&
+ +
}
: - + } ) @@ -358,19 +379,20 @@ export type ProcessIOParameter = { interface ProcessIOPreviewDataProps { data: ProcessIOParameter[]; showImagePreview: boolean; + valueLabel: string; } type ProcessIOPreviewProps = ProcessIOPreviewDataProps & WithStyles; -const ProcessIOPreview = withStyles(styles)( - ({ classes, data, showImagePreview }: ProcessIOPreviewProps) => { +const ProcessIOPreview = memo(withStyles(styles)( + ({ classes, data, showImagePreview, valueLabel }: ProcessIOPreviewProps) => { const showLabel = data.some((param: ProcessIOParameter) => param.label); return Name {showLabel && Label} - Value + {valueLabel} Collection @@ -382,7 +404,7 @@ const ProcessIOPreview = withStyles(styles)( [classes.noBorderRow]: (rest.length > 0), }; - return <> + return {param.id} @@ -399,10 +421,10 @@ const ProcessIOPreview = withStyles(styles)( {rest.map((val, i) => { const rowClasses = { - [classes.noBorderRow]: (i < rest.length-1), + [classes.noBorderRow]: (i < rest.length - 1), [classes.secondaryRow]: val.secondary, }; - return + return {showLabel && } @@ -415,11 +437,11 @@ const ProcessIOPreview = withStyles(styles)( })} - ; + ; })} -
; -}); + ; + })); interface ProcessValuePreviewProps { value: ProcessIOValue; @@ -427,7 +449,7 @@ interface ProcessValuePreviewProps { } const ProcessValuePreview = withStyles(styles)( - ({value, showImagePreview, classes}: ProcessValuePreviewProps & WithStyles) => + ({ value, showImagePreview, classes }: ProcessValuePreviewProps & WithStyles) => {value.imageUrl && showImagePreview ? Inline Preview : ""} {value.imageUrl && !showImagePreview ? : ""} @@ -486,33 +508,33 @@ export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParam case isPrimitiveOfType(input, CWLType.BOOLEAN): const boolValue = (input as BooleanCommandInputParameter).value; return boolValue !== undefined && - !(Array.isArray(boolValue) && boolValue.length === 0) ? - [{display: renderPrimitiveValue(boolValue, false) }] : - [{display: }]; + !(Array.isArray(boolValue) && boolValue.length === 0) ? + [{ display: renderPrimitiveValue(boolValue, false) }] : + [{ display: }]; case isPrimitiveOfType(input, CWLType.INT): case isPrimitiveOfType(input, CWLType.LONG): const intValue = (input as IntCommandInputParameter).value; return intValue !== undefined && - // Missing values are empty array - !(Array.isArray(intValue) && intValue.length === 0) ? - [{display: renderPrimitiveValue(intValue, false) }] - : [{display: }]; + // Missing values are empty array + !(Array.isArray(intValue) && intValue.length === 0) ? + [{ display: renderPrimitiveValue(intValue, false) }] + : [{ display: }]; case isPrimitiveOfType(input, CWLType.FLOAT): case isPrimitiveOfType(input, CWLType.DOUBLE): const floatValue = (input as FloatCommandInputParameter).value; return floatValue !== undefined && - !(Array.isArray(floatValue) && floatValue.length === 0) ? - [{display: renderPrimitiveValue(floatValue, false) }]: - [{display: }]; + !(Array.isArray(floatValue) && floatValue.length === 0) ? + [{ display: renderPrimitiveValue(floatValue, false) }] : + [{ display: }]; case isPrimitiveOfType(input, CWLType.STRING): const stringValue = (input as StringCommandInputParameter).value || undefined; return stringValue !== undefined && - !(Array.isArray(stringValue) && stringValue.length === 0) ? - [{display: renderPrimitiveValue(stringValue, false) }] : - [{display: }]; + !(Array.isArray(stringValue) && stringValue.length === 0) ? + [{ display: renderPrimitiveValue(stringValue, false) }] : + [{ display: }]; case isPrimitiveOfType(input, CWLType.FILE): const mainFile = (input as FileCommandInputParameter).value; @@ -525,14 +547,14 @@ export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParam const mainFilePdhUrl = mainFile ? getResourcePdhUrl(mainFile, pdh) : ""; return files.length ? files.map((file, i) => fileToProcessIOValue(file, (i > 0), auth, pdh, (i > 0 ? mainFilePdhUrl : ""))) : - [{display: }]; + [{ display: }]; case isPrimitiveOfType(input, CWLType.DIRECTORY): const directory = (input as DirectoryCommandInputParameter).value; return directory !== undefined && - !(Array.isArray(directory) && directory.length === 0) ? + !(Array.isArray(directory) && directory.length === 0) ? [directoryToProcessIOValue(directory, auth, pdh)] : - [{display: }]; + [{ display: }]; case typeof input.type === 'object' && !(input.type instanceof Array) && @@ -540,27 +562,27 @@ export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParam const enumValue = (input as EnumCommandInputParameter).value; return enumValue !== undefined && enumValue ? [{ display: 
{enumValue}
}] : - [{display: }]; + [{ display: }]; case isArrayOfType(input, CWLType.STRING): const strArray = (input as StringArrayCommandInputParameter).value || []; return strArray.length ? [{ display: <>{strArray.map((val) => renderPrimitiveValue(val, true))} }] : - [{display: }]; + [{ display: }]; case isArrayOfType(input, CWLType.INT): case isArrayOfType(input, CWLType.LONG): const intArray = (input as IntArrayCommandInputParameter).value || []; return intArray.length ? [{ display: <>{intArray.map((val) => renderPrimitiveValue(val, true))} }] : - [{display: }]; + [{ display: }]; case isArrayOfType(input, CWLType.FLOAT): case isArrayOfType(input, CWLType.DOUBLE): const floatArray = (input as FloatArrayCommandInputParameter).value || []; return floatArray.length ? [{ display: <>{floatArray.map((val) => renderPrimitiveValue(val, true))} }] : - [{display: }]; + [{ display: }]; case isArrayOfType(input, CWLType.FILE): const fileArrayMainFiles = ((input as FileArrayCommandInputParameter).value || []); @@ -574,21 +596,21 @@ export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParam ...(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 + // Reduce each mainFile/secondaryFile group into single array preserving ordering }).reduce((acc: ProcessIOValue[], mainFile: ProcessIOValue[]) => (acc.concat(mainFile)), []); return fileArrayValues.length ? fileArrayValues : - [{display: }]; + [{ display: }]; case isArrayOfType(input, CWLType.DIRECTORY): const directories = (input as DirectoryArrayCommandInputParameter).value || []; return directories.length ? directories.map(directory => directoryToProcessIOValue(directory, auth, pdh)) : - [{display: }]; + [{ display: }]; default: - return [{display: }]; + return [{ display: }]; } }; @@ -607,8 +629,8 @@ const renderPrimitiveValue = (value: any, asChip: boolean) => { const getKeepUrl = (file: File | Directory, pdh?: string): string => { const isKeepUrl = file.location?.startsWith('keep:') || false; const keepUrl = isKeepUrl ? - file.location?.replace('keep:', '') : - pdh ? `${pdh}/${file.location}` : file.location; + file.location?.replace('keep:', '') : + pdh ? `${pdh}/${file.location}` : file.location; return keepUrl || ''; }; @@ -623,7 +645,7 @@ const getResourcePdhUrl = (res: File | Directory, pdh?: string): string => { return keepUrl ? keepUrl.split('/').slice(0, 1)[0] : ''; }; -const KeepUrlBase = withStyles(styles)(({auth, res, pdh, classes}: KeepUrlProps & WithStyles) => { +const KeepUrlBase = withStyles(styles)(({ auth, res, pdh, classes }: KeepUrlProps & WithStyles) => { const pdhUrl = getResourcePdhUrl(res, pdh); // Passing a pdh always returns a relative wb2 collection url const pdhWbPath = getNavUrl(pdhUrl, auth); @@ -632,7 +654,7 @@ const KeepUrlBase = withStyles(styles)(({auth, res, pdh, classes}: KeepUrlProps <>; }); -const KeepUrlPath = withStyles(styles)(({auth, res, pdh, classes}: KeepUrlProps & WithStyles) => { +const KeepUrlPath = withStyles(styles)(({ auth, res, pdh, classes }: KeepUrlProps & WithStyles) => { const keepUrl = getKeepUrl(res, pdh); const keepUrlParts = keepUrl ? keepUrl.split('/') : []; const keepUrlPath = keepUrlParts.length > 1 ? keepUrlParts.slice(1).join('/') : ''; @@ -657,6 +679,11 @@ const isFileImage = (basename?: string): boolean => { return basename ? (mime.getType(basename) || "").startsWith('image/') : false; }; +const isFileUrl = (location?: string): boolean => ( + !!location && !KEEP_URL_REGEX.exec(location) && + (location.startsWith("http://") || location.startsWith("https://")) +); + const normalizeDirectoryLocation = (directory: Directory): Directory => { if (!directory.location) { return directory; @@ -668,24 +695,31 @@ const normalizeDirectoryLocation = (directory: Directory): Directory => { }; const directoryToProcessIOValue = (directory: Directory, auth: AuthState, pdh?: string): ProcessIOValue => { - if (isExternalValue(directory)) {return {display: }} + if (isExternalValue(directory)) { return { display: } } const normalizedDirectory = normalizeDirectoryLocation(directory); return { - display: , - collection: , + display: , + collection: , }; }; const fileToProcessIOValue = (file: File, secondary: boolean, auth: AuthState, pdh: string | undefined, mainFilePdh: string): ProcessIOValue => { - if (isExternalValue(file)) {return {display: }} + if (isExternalValue(file)) { return { display: } } + + if (isFileUrl(file.location)) { + return { + display: {file.location}, + secondary, + }; + } const resourcePdh = getResourcePdhUrl(file, pdh); return { - display: , + display: , secondary, imageUrl: isFileImage(file.basename) ? getImageUrl(auth, file, pdh) : undefined, - collection: (resourcePdh !== mainFilePdh) ? : <>, + collection: (resourcePdh !== mainFilePdh) ? : <>, } }; @@ -693,18 +727,18 @@ const isExternalValue = (val: any) => Object.keys(val).includes('$import') || Object.keys(val).includes('$include') -const EmptyValue = withStyles(styles)( - ({classes}: WithStyles) => No value +export const EmptyValue = withStyles(styles)( + ({ classes }: WithStyles) => No value ); const UnsupportedValue = withStyles(styles)( - ({classes}: WithStyles) => Cannot display value + ({ classes }: WithStyles) => Cannot display value ); const UnsupportedValueChip = withStyles(styles)( - ({classes}: WithStyles) => } label={"Cannot display value"} /> + ({ classes }: WithStyles) => } label={"Cannot display value"} /> ); const ImagePlaceholder = withStyles(styles)( - ({classes}: WithStyles) => + ({ classes }: WithStyles) => );