X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/5cf1a4451ff37863748e8302b039f6514759504e..24f65df0b986dd604b47d148cc84e3a96b25cc66:/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 b2f36f52..ceba293e 100644 --- a/src/views/process-panel/process-io-card.tsx +++ b/src/views/process-panel/process-io-card.tsx @@ -27,7 +27,16 @@ 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, @@ -65,6 +74,7 @@ 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" @@ -81,8 +91,9 @@ type CssRules = | "imagePreview" | "valArray" | "secondaryVal" + | "secondaryRow" | "emptyValue" - | "halfRow" + | "noBorderRow" | "symmetricTabs" | "imagePlaceholder" | "rowWithPreview" @@ -94,7 +105,7 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ }, header: { paddingTop: theme.spacing.unit, - paddingBottom: theme.spacing.unit, + paddingBottom: 0, }, iconHeader: { fontSize: '1.875rem', @@ -107,7 +118,7 @@ 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, } @@ -117,7 +128,8 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ paddingTop: theme.spacing.unit * 0.5 }, tableWrapper: { - height: `calc(100% - ${theme.spacing.unit * 6}px)`, + height: 'auto', + maxHeight: `calc(100% - ${theme.spacing.unit * 4.5}px)`, overflow: 'auto', }, tableRoot: { @@ -166,10 +178,16 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ secondaryVal: { paddingLeft: '20px', }, + secondaryRow: { + height: '29px', + verticalAlign: 'top', + position: 'relative', + top: '-9px', + }, emptyValue: { color: theme.customs.colors.grey500, }, - halfRow: { + noBorderRow: { '& td': { borderBottom: 'none', } @@ -203,8 +221,8 @@ export enum ProcessIOCardType { export interface ProcessIOCardDataProps { process: Process; label: ProcessIOCardType; - params?: ProcessIOParameter[]; - raw?: any; + params: ProcessIOParameter[] | null; + raw: any; mounts?: InputCollectionMount[]; outputUuid?: string; } @@ -220,7 +238,7 @@ 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 }: ProcessIOCardProps) => { const [mainProcTabState, setMainProcTabState] = useState(0); const handleMainProcTabChange = (event: React.MouseEvent, value: number) => { setMainProcTabState(value); @@ -231,7 +249,7 @@ export const ProcessIOCard = withStyles(styles)(connect(null, mapDispatchToProps const PanelIcon = label === ProcessIOCardType.INPUT ? InputIcon : OutputIcon; const mainProcess = !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); @@ -253,13 +271,17 @@ export const ProcessIOCard = withStyles(styles)(connect(null, mapDispatchToProps { mainProcess && {setShowImagePreview(!showImagePreview)}}>{showImagePreview ? : } } + { doUnMaximizePanel && panelMaximized && + + + } { doMaximizePanel && !panelMaximized && } { doHidePanel && - + } } /> @@ -358,10 +380,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} @@ -375,8 +399,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 && } @@ -388,7 +416,7 @@ const ProcessIOPreview = withStyles(styles)( - ))} + })} ; })} @@ -459,37 +487,33 @@ 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: 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: 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: 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: renderPrimitiveValue(stringValue, false) }] : [{display: }]; case isPrimitiveOfType(input, CWLType.FILE): @@ -501,14 +525,12 @@ export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParam ...secondaryFiles ]; const mainFilePdhUrl = mainFile ? getResourcePdhUrl(mainFile, pdh) : ""; - return files.length ? 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) ? [directoryToProcessIOValue(directory, auth, pdh)] : @@ -518,31 +540,28 @@ export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParam !(input.type instanceof Array) && input.type.type === 'enum': const enumValue = (input as EnumCommandInputParameter).value; - - return enumValue !== undefined ? - [{ display: 
{(input as EnumCommandInputParameter).value || ''}
}] : + 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: <>{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: <>{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: <>{floatArray.map((val) => renderPrimitiveValue(val, true))} }] : [{display: }]; case isArrayOfType(input, CWLType.FILE): @@ -566,13 +585,21 @@ export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParam case isArrayOfType(input, CWLType.DIRECTORY): const directories = (input as DirectoryArrayCommandInputParameter).value || []; - return directories.length ? directories.map(directory => directoryToProcessIOValue(directory, auth, pdh)) : [{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 ? : ; } }; @@ -632,6 +659,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; @@ -643,6 +675,8 @@ 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: , @@ -651,6 +685,15 @@ const directoryToProcessIOValue = (directory: Directory, auth: AuthState, pdh?: }; 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: , @@ -660,10 +703,22 @@ const fileToProcessIOValue = (file: File, secondary: boolean, auth: AuthState, p } }; +const isExternalValue = (val: any) => + Object.keys(val).includes('$import') || + Object.keys(val).includes('$include') + 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) => );