X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/7db41995e4c8d77094f8dad71902de30b1650b37..c3bc34209f7dbbc80c62d8896af043c88cb6b9cf:/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 0e93c9a6..baa51496 100644 --- a/src/views/process-panel/process-io-card.tsx +++ b/src/views/process-panel/process-io-card.tsx @@ -27,26 +27,35 @@ import { CircularProgress, } from '@material-ui/core'; import { ArvadosTheme } from 'common/custom-theme'; -import { CloseIcon, ImageIcon, InputIcon, ImageOffIcon, OutputIcon, MaximizeIcon } from 'components/icon/icon'; +import { + CloseIcon, + ImageIcon, + InputIcon, + ImageOffIcon, + OutputIcon, + MaximizeIcon, + UnMaximizeIcon, + InfoIcon +} 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'; @@ -63,27 +72,32 @@ import { RootState } from 'store/store'; import { ProcessOutputCollectionFiles } from './process-output-collection-files'; 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" - | "emptyValue" - | "halfRow" - | "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: { @@ -91,11 +105,11 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ }, header: { paddingTop: theme.spacing.unit, - paddingBottom: theme.spacing.unit, + paddingBottom: 0, }, iconHeader: { fontSize: '1.875rem', - color: theme.customs.colors.green700, + color: theme.customs.colors.greyL, }, avatar: { alignSelf: 'flex-start', @@ -104,17 +118,20 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ content: { height: `calc(100% - ${theme.spacing.unit * 7}px - ${theme.spacing.unit * 1.5}px)`, padding: theme.spacing.unit * 1.0, - paddingTop: theme.spacing.unit * 0.5, + paddingTop: 0, '&:last-child': { paddingBottom: theme.spacing.unit * 1, } }, 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: { @@ -160,10 +177,19 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ display: 'inline', } }, + secondaryVal: { + paddingLeft: '20px', + }, + secondaryRow: { + height: '29px', + verticalAlign: 'top', + position: 'relative', + top: '-9px', + }, emptyValue: { - color: theme.customs.colors.grey500, + color: theme.customs.colors.grey700, }, - halfRow: { + noBorderRow: { '& td': { borderBottom: 'none', } @@ -195,12 +221,13 @@ export enum ProcessIOCardType { OUTPUT = 'Outputs', } export interface ProcessIOCardDataProps { - process: Process; + process?: Process; label: ProcessIOCardType; - params?: ProcessIOParameter[]; - raw?: any; + params: ProcessIOParameter[] | null; + raw: any; mounts?: InputCollectionMount[]; outputUuid?: string; + showParams?: boolean; } export interface ProcessIOCardActionProps { @@ -214,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, 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 === undefined || params === undefined; + 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 ? : } - } - { 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) &&
- -
} + + } } - {raw && Object.keys(raw).length === 0 && + {!loading && !hasRaw && !hasParams && } ) : // 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)) &&
+ +
}
: - + } ) @@ -320,6 +367,7 @@ export type ProcessIOValue = { display: ReactElement; imageUrl?: string; collection?: ReactElement; + secondary?: boolean; } export type ProcessIOParameter = { @@ -331,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) => { + ({ classes, data, showImagePreview, valueLabel }: ProcessIOPreviewProps) => { const showLabel = data.some((param: ProcessIOParameter) => param.label); return Name {showLabel && Label} - Value + {valueLabel} Collection @@ -351,10 +400,12 @@ const ProcessIOPreview = withStyles(styles)( {data.map((param: ProcessIOParameter) => { const firstVal = param.value.length > 0 ? param.value[0] : undefined; const rest = param.value.slice(1); - const rowClass = rest.length > 0 ? classes.halfRow : undefined; + const mainRowClasses = { + [classes.noBorderRow]: (rest.length > 0), + }; return <> - + {param.id} @@ -368,8 +419,12 @@ const ProcessIOPreview = withStyles(styles)( - {rest.map((val, i) => ( - + {rest.map((val, i) => { + const rowClasses = { + [classes.noBorderRow]: (i < rest.length - 1), + [classes.secondaryRow]: val.secondary, + }; + return {showLabel && } @@ -381,12 +436,12 @@ const ProcessIOPreview = withStyles(styles)( - ))} + })} ; })}
; -}); + }); interface ProcessValuePreviewProps { value: ProcessIOValue; @@ -394,11 +449,11 @@ interface ProcessValuePreviewProps { } const ProcessValuePreview = withStyles(styles)( - ({value, showImagePreview, classes}: ProcessValuePreviewProps & WithStyles) => + ({ value, showImagePreview, classes }: ProcessValuePreviewProps & WithStyles) => {value.imageUrl && showImagePreview ? Inline Preview : ""} {value.imageUrl && !showImagePreview ? : ""} - + {value.display} @@ -411,9 +466,7 @@ interface ProcessIORawDataProps { const ProcessIORaw = withStyles(styles)( ({ data }: ProcessIORawDataProps) => - 
-                {JSON.stringify(data, null, 2)}
-
+ ); @@ -454,38 +507,34 @@ export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParam switch (true) { case isPrimitiveOfType(input, CWLType.BOOLEAN): const boolValue = (input as BooleanCommandInputParameter).value; - return boolValue !== undefined && - !(Array.isArray(boolValue) && boolValue.length === 0) ? - [{display: 
{String(boolValue)}
}] : - [{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: 
{String(intValue)}
}] - : [{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: 
{String(floatValue)}
}]: - [{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: 
{stringValue}
}] : - [{display: }]; + !(Array.isArray(stringValue) && stringValue.length === 0) ? + [{ display: renderPrimitiveValue(stringValue, false) }] : + [{ display: }]; case isPrimitiveOfType(input, CWLType.FILE): const mainFile = (input as FileCommandInputParameter).value; @@ -495,74 +544,82 @@ export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParam ...(mainFile && !(Array.isArray(mainFile) && mainFile.length === 0) ? [mainFile] : []), ...secondaryFiles ]; - + const mainFilePdhUrl = mainFile ? getResourcePdhUrl(mainFile, pdh) : ""; return files.length ? - files.map(file => fileToProcessIOValue(file, auth, pdh)) : - [{display: }]; + files.map((file, i) => fileToProcessIOValue(file, (i > 0), auth, pdh, (i > 0 ? mainFilePdhUrl : ""))) : + [{ 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) && input.type.type === 'enum': const enumValue = (input as EnumCommandInputParameter).value; - - return enumValue !== undefined ? - [{ display: 
{(input as EnumCommandInputParameter).value || ''}
}] : - [{display: }]; + return enumValue !== undefined && enumValue ? + [{ display: 
{enumValue}
}] : + [{ display: }]; case isArrayOfType(input, CWLType.STRING): const strArray = (input as StringArrayCommandInputParameter).value || []; return strArray.length ? - [{ display: <>{((input as StringArrayCommandInputParameter).value || []).map((val) => )} }] : - [{display: }]; + [{ display: <>{strArray.map((val) => renderPrimitiveValue(val, true))} }] : + [{ display: }]; case isArrayOfType(input, CWLType.INT): case isArrayOfType(input, CWLType.LONG): const intArray = (input as IntArrayCommandInputParameter).value || []; - return intArray.length ? - [{ display: <>{((input as IntArrayCommandInputParameter).value || []).map((val) => )} }] : - [{display: }]; + [{ display: <>{intArray.map((val) => renderPrimitiveValue(val, true))} }] : + [{ display: }]; case isArrayOfType(input, CWLType.FLOAT): case isArrayOfType(input, CWLType.DOUBLE): const floatArray = (input as FloatArrayCommandInputParameter).value || []; - return floatArray.length ? - [{ display: <>{floatArray.map((val) => )} }] : - [{display: }]; + [{ display: <>{floatArray.map((val) => renderPrimitiveValue(val, true))} }] : + [{ display: }]; case isArrayOfType(input, CWLType.FILE): - const fileArrayMainFile = ((input as FileArrayCommandInputParameter).value || []); - const fileArraySecondaryFiles = fileArrayMainFile.map((file) => ( - ((file as unknown) as FileWithSecondaryFiles)?.secondaryFiles || [] - )).reduce((acc: File[], params: File[]) => (acc.concat(params)), []); - - const fileArrayFiles = [ - ...fileArrayMainFile, - ...fileArraySecondaryFiles - ]; - - return fileArrayFiles.length ? - fileArrayFiles.map(file => fileToProcessIOValue(file, auth, pdh)) : - [{display: }]; + 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 [ + // 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 : "")] : []), + ...(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 : + [{ 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 []; + return [{ display: }]; + } +}; + +const renderPrimitiveValue = (value: any, asChip: boolean) => { + const isObject = typeof value === 'object'; + if (!isObject) { + return asChip ? : 
{String(value)}
; + } else { + return asChip ? : ; } }; @@ -572,8 +629,8 @@ export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParam 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 || ''; }; @@ -583,9 +640,13 @@ interface KeepUrlProps { pdh?: string; } -const KeepUrlBase = withStyles(styles)(({auth, res, pdh, classes}: KeepUrlProps & WithStyles) => { +const getResourcePdhUrl = (res: File | Directory, pdh?: string): string => { const keepUrl = getKeepUrl(res, pdh); - const pdhUrl = keepUrl ? keepUrl.split('/').slice(0, 1)[0] : ''; + return keepUrl ? keepUrl.split('/').slice(0, 1)[0] : ''; +}; + +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); return pdhUrl && pdhWbPath ? @@ -593,15 +654,14 @@ 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('/') : ''; const keepUrlPathNav = getKeepNavUrl(auth, res, pdh); - return keepUrlPath && keepUrlPathNav ? - {keepUrlPath} : - // Show No value for root collection io that lacks path part + return keepUrlPathNav ? + {keepUrlPath || '/'} : ; }); @@ -619,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; @@ -630,25 +695,50 @@ const normalizeDirectoryLocation = (directory: Directory): Directory => { }; const directoryToProcessIOValue = (directory: Directory, auth: AuthState, pdh?: string): ProcessIOValue => { + if (isExternalValue(directory)) { return { display: } } + const normalizedDirectory = normalizeDirectoryLocation(directory); return { - display: , - collection: , + display: , + collection: , }; }; -const fileToProcessIOValue = (file: File, auth: AuthState, pdh?: string): ProcessIOValue => { +const fileToProcessIOValue = (file: File, secondary: boolean, auth: AuthState, pdh: string | undefined, mainFilePdh: string): ProcessIOValue => { + 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: , + collection: (resourcePdh !== mainFilePdh) ? : <>, } }; -const EmptyValue = withStyles(styles)( - ({classes}: WithStyles) => No value +const isExternalValue = (val: any) => + Object.keys(val).includes('$import') || + Object.keys(val).includes('$include') + +export const EmptyValue = withStyles(styles)( + ({ classes }: WithStyles) => No value +); + +const UnsupportedValue = withStyles(styles)( + ({ classes }: WithStyles) => Cannot display value +); + +const UnsupportedValueChip = withStyles(styles)( + ({ classes }: WithStyles) => } label={"Cannot display value"} /> ); const ImagePlaceholder = withStyles(styles)( - ({classes}: WithStyles) => + ({ classes }: WithStyles) => );