X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/ee347878e1ad3b6f82787ac27b6d3b6510401ecd..299c20e6816fef465dd1a29ec4787ba7763a9285:/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 4b2413ce..40790e58 100644 --- a/src/views/process-panel/process-io-card.tsx +++ b/src/views/process-panel/process-io-card.tsx @@ -3,6 +3,7 @@ // SPDX-License-Identifier: AGPL-3.0 import React, { ReactElement, useState } from 'react'; +import { Dispatch } from 'redux'; import { StyleRulesCallback, WithStyles, @@ -23,9 +24,10 @@ import { Paper, Grid, Chip, + CircularProgress, } from '@material-ui/core'; import { ArvadosTheme } from 'common/custom-theme'; -import { CloseIcon, InfoIcon, ProcessIcon } from 'components/icon/icon'; +import { CloseIcon, ImageIcon, InputIcon, ImageOffIcon, OutputIcon, MaximizeIcon } from 'components/icon/icon'; import { MPVPanelProps } from 'components/multi-panel-view/multi-panel-view'; import { BooleanCommandInputParameter, @@ -59,8 +61,33 @@ import { InputCollectionMount } from 'store/processes/processes-actions'; import { connect } from 'react-redux'; import { RootState } from 'store/store'; import { ProcessOutputCollectionFiles } from './process-output-collection-files'; - -type CssRules = 'card' | 'content' | 'title' | 'header' | 'avatar' | 'iconHeader' | 'tableWrapper' | 'tableRoot' | 'paramValue' | 'keepLink' | 'imagePreview' | 'valArray' | 'emptyValue'; +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'; + +type CssRules = + | "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: { @@ -79,6 +106,7 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ paddingTop: theme.spacing.unit * 0.5 }, 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, '&:last-child': { @@ -90,10 +118,18 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ paddingTop: theme.spacing.unit * 0.5 }, tableWrapper: { + height: `calc(100% - ${theme.spacing.unit * 6}px)`, overflow: 'auto', }, tableRoot: { width: '100%', + '& thead th': { + verticalAlign: 'bottom', + paddingBottom: '10px', + }, + '& td, & th': { + paddingRight: '25px', + } }, paramValue: { display: 'flex', @@ -106,6 +142,15 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ overflowWrap: 'break-word', cursor: 'pointer', }, + collectionLink: { + margin: '10px', + '& a': { + color: theme.palette.primary.main, + textDecoration: 'none', + overflowWrap: 'break-word', + cursor: 'pointer', + } + }, imagePreview: { maxHeight: '15em', maxWidth: '15em', @@ -119,9 +164,43 @@ 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, }, + noBorderRow: { + '& td': { + borderBottom: 'none', + } + }, + symmetricTabs: { + '& button': { + flexBasis: '0', + } + }, + imagePlaceholder: { + width: '60px', + height: '60px', + display: 'flex', + alignItems: 'center', + justifyContent: 'center', + backgroundColor: '#cecece', + borderRadius: '10px', + }, + rowWithPreview: { + verticalAlign: 'bottom', + }, + labelColumn: { + minWidth: '120px', + }, }); export enum ProcessIOCardType { @@ -129,22 +208,40 @@ export enum ProcessIOCardType { OUTPUT = 'Outputs', } export interface ProcessIOCardDataProps { + process: Process; label: ProcessIOCardType; - params: ProcessIOParameter[]; + params?: ProcessIOParameter[]; raw?: any; mounts?: InputCollectionMount[]; outputUuid?: string; } -type ProcessIOCardProps = ProcessIOCardDataProps & WithStyles & MPVPanelProps; +export interface ProcessIOCardActionProps { + navigateTo: (uuid: string) => void; +} + +const mapDispatchToProps = (dispatch: Dispatch): ProcessIOCardActionProps => ({ + navigateTo: (uuid) => dispatch(navigateTo(uuid)), +}); + +type ProcessIOCardProps = ProcessIOCardDataProps & ProcessIOCardActionProps & WithStyles & MPVPanelProps; -export const ProcessIOCard = withStyles(styles)( - ({ classes, label, params, raw, mounts, outputUuid, doHidePanel, panelName }: ProcessIOCardProps) => { - const [tabState, setTabState] = useState(0); - const handleChange = (event: React.MouseEvent, value: number) => { - setTabState(value); +export const ProcessIOCard = withStyles(styles)(connect(null, mapDispatchToProps)( + ({ classes, label, params, raw, mounts, outputUuid, doHidePanel, doMaximizePanel, panelMaximized, panelName, process, navigateTo }: ProcessIOCardProps) => { + const [mainProcTabState, setMainProcTabState] = useState(0); + const handleMainProcTabChange = (event: React.MouseEvent, value: number) => { + setMainProcTabState(value); } + const [showImagePreview, setShowImagePreview] = useState(false); + + const PanelIcon = label === ProcessIOCardType.INPUT ? InputIcon : OutputIcon; + const mainProcess = !process.containerRequest.requestingContainerUuid; + + const loading = raw === undefined || params === undefined; + const hasRaw = !!(raw && Object.keys(raw).length > 0); + const hasParams = !!(params && params.length > 0); + return } + avatar={} title={ {label} @@ -160,6 +257,13 @@ export const ProcessIOCard = withStyles(styles)( } action={
+ { mainProcess && + {setShowImagePreview(!showImagePreview)}}>{showImagePreview ? : } + } + { doMaximizePanel && !panelMaximized && + + + } { doHidePanel && @@ -167,95 +271,167 @@ export const ProcessIOCard = withStyles(styles)(
} /> -
- - - - {label === ProcessIOCardType.INPUT && } - {label === ProcessIOCardType.OUTPUT && } - - {tabState === 0 &&
- {params.length ? - : + {mainProcess ? + (<> + {/* 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 + */} + {(!loading && (hasRaw || hasParams)) && + <> + + {/* params will be empty on processes without workflow definitions in mounts, so we only show raw */} + {hasParams && } + + + {(mainProcTabState === 0 && params && hasParams) &&
+ +
} + {(mainProcTabState === 1 || !hasParams) &&
+ +
} + } + {!loading && !hasRaw && !hasParams && + + } + ) : + // Subprocess + (<> + {((mounts && mounts.length) || outputUuid) ? + <> + + {label === ProcessIOCardType.INPUT && } + {label === ProcessIOCardType.OUTPUT && } + +
+ {label === ProcessIOCardType.INPUT && } + {label === ProcessIOCardType.OUTPUT && <> + {outputUuid && + Output Collection: {navigateTo(outputUuid || "")}}> + {outputUuid} + } + + } +
+ : - - } -
} - {tabState === 1 &&
- {params.length ? - : - - - } -
} - {tabState === 2 &&
- {label === ProcessIOCardType.INPUT && } - {label === ProcessIOCardType.OUTPUT && } -
} -
+ + + } + ) + } ; } -); +)); export type ProcessIOValue = { display: ReactElement; imageUrl?: string; + collection?: ReactElement; + secondary?: boolean; } export type ProcessIOParameter = { id: string; - doc: string; + label: string; value: ProcessIOValue[]; } interface ProcessIOPreviewDataProps { data: ProcessIOParameter[]; + showImagePreview: boolean; } type ProcessIOPreviewProps = ProcessIOPreviewDataProps & WithStyles; const ProcessIOPreview = withStyles(styles)( - ({ classes, data }: ProcessIOPreviewProps) => - + ({ classes, data, showImagePreview }: ProcessIOPreviewProps) => { + const showLabel = data.some((param: ProcessIOParameter) => param.label); + return
- Label - Description + Name + {showLabel && Label} Value + Collection {data.map((param: ProcessIOParameter) => { - return - - {param.id} - - {param.doc} - {param.value.map(val => ( - - {val.imageUrl ? Inline Preview : ""} - - {val.display} - - - ))} - ; + const firstVal = param.value.length > 0 ? param.value[0] : undefined; + const rest = param.value.slice(1); + const mainRowClasses = { + [classes.noBorderRow]: (rest.length > 0), + }; + + return <> + + + {param.id} + + {showLabel && {param.label}} + + {firstVal && } + + + + {firstVal?.collection} + + + + {rest.map((val, i) => { + const rowClasses = { + [classes.noBorderRow]: (i < rest.length-1), + [classes.secondaryRow]: val.secondary, + }; + return + + {showLabel && } + + + + + + {val.collection} + + + + })} + ; })} -
-); + ; +}); + +interface ProcessValuePreviewProps { + value: ProcessIOValue; + showImagePreview: boolean; +} -const handleClick = (url) => { - window.open(url, '_blank'); +const ProcessValuePreview = withStyles(styles)( + ({value, showImagePreview, classes}: ProcessValuePreviewProps & WithStyles) => + + {value.imageUrl && showImagePreview ? Inline Preview : ""} + {value.imageUrl && !showImagePreview ? : ""} + + {value.display} + + +) + +interface ProcessIORawDataProps { + data: ProcessIOParameter[]; } const ProcessIORaw = withStyles(styles)( - ({ data }: ProcessIOPreviewProps) => + ({ data }: ProcessIORawDataProps) => - 
-                {JSON.stringify(data, null, 2)}
-
+ ); @@ -337,9 +513,10 @@ 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)) : + files.map((file, i) => fileToProcessIOValue(file, (i > 0), auth, pdh, (i > 0 ? mainFilePdhUrl : ""))) : [{display: }]; case isPrimitiveOfType(input, CWLType.DIRECTORY): @@ -382,18 +559,22 @@ export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParam [{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)) : + 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): @@ -408,9 +589,14 @@ export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParam } }; +/* + * @returns keep url without keep: prefix + */ const getKeepUrl = (file: File | Directory, pdh?: string): string => { const isKeepUrl = file.location?.startsWith('keep:') || false; - const keepUrl = isKeepUrl ? file.location : pdh ? `keep:${pdh}/${file.location}` : file.location; + const keepUrl = isKeepUrl ? + file.location?.replace('keep:', '') : + pdh ? `${pdh}/${file.location}` : file.location; return keepUrl || ''; }; @@ -420,13 +606,17 @@ 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.replace('keep:', ''), auth); + const pdhWbPath = getNavUrl(pdhUrl, auth); return pdhUrl && pdhWbPath ? - {pdhUrl} : + {pdhUrl} : <>; }); @@ -436,18 +626,18 @@ const KeepUrlPath = withStyles(styles)(({auth, res, pdh, classes}: KeepUrlProps const keepUrlPath = keepUrlParts.length > 1 ? keepUrlParts.slice(1).join('/') : ''; const keepUrlPathNav = getKeepNavUrl(auth, res, pdh); - return keepUrlPath && keepUrlPathNav ? - handleClick(keepUrlPathNav)}>{keepUrlPath} : - <>; + return keepUrlPathNav ? + {keepUrlPath || '/'} : + ; }); const getKeepNavUrl = (auth: AuthState, file: File | Directory, pdh?: string): string => { - let keepUrl = getKeepUrl(file, pdh).replace('keep:', ''); + let keepUrl = getKeepUrl(file, pdh); return (getInlineFileUrl(`${auth.config.keepWebServiceUrl}/c=${keepUrl}?api_token=${auth.apiToken}`, auth.config.keepWebServiceUrl, auth.config.keepWebInlineServiceUrl)); }; const getImageUrl = (auth: AuthState, file: File, pdh?: string): string => { - const keepUrl = getKeepUrl(file, pdh).replace('keep:', ''); + const keepUrl = getKeepUrl(file, pdh); return getInlineFileUrl(`${auth.config.keepWebServiceUrl}/c=${keepUrl}?api_token=${auth.apiToken}`, auth.config.keepWebServiceUrl, auth.config.keepWebInlineServiceUrl); }; @@ -468,21 +658,25 @@ const normalizeDirectoryLocation = (directory: Directory): Directory => { const directoryToProcessIOValue = (directory: Directory, auth: AuthState, pdh?: string): ProcessIOValue => { const normalizedDirectory = normalizeDirectoryLocation(directory); return { - display: - / - , + 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 => { + const resourcePdh = getResourcePdhUrl(file, pdh); return { - display: - / - , + display: , + secondary, imageUrl: isFileImage(file.basename) ? getImageUrl(auth, file, pdh) : undefined, + collection: (resourcePdh !== mainFilePdh) ? : <>, } }; const EmptyValue = withStyles(styles)( ({classes}: WithStyles) => No value ); + +const ImagePlaceholder = withStyles(styles)( + ({classes}: WithStyles) => +);