// SPDX-License-Identifier: AGPL-3.0
import React, { ReactElement, useState } from 'react';
+import { Dispatch } from 'redux';
import {
StyleRulesCallback,
WithStyles,
Chip,
} from '@material-ui/core';
import { ArvadosTheme } from 'common/custom-theme';
-import { CloseIcon, InfoIcon, ProcessIcon, InputIcon, OutputIcon } 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,
import { RootState } from 'store/store';
import { ProcessOutputCollectionFiles } from './process-output-collection-files';
import { Process } from 'store/processes/process';
-
-type CssRules = 'card' | 'content' | 'title' | 'header' | 'avatar' | 'iconHeader' | 'tableWrapper' | 'tableRoot' | 'paramValue' | 'keepLink' | 'imagePreview' | 'valArray' | 'emptyValue';
+import { navigateTo } from 'store/navigation/navigation-action';
+
+type CssRules =
+ | "card"
+ | "content"
+ | "title"
+ | "header"
+ | "avatar"
+ | "iconHeader"
+ | "tableWrapper"
+ | "tableRoot"
+ | "paramValue"
+ | "keepLink"
+ | "collectionLink"
+ | "imagePreview"
+ | "valArray"
+ | "emptyValue"
+ | "halfRow"
+ | "symmetricTabs"
+ | "imagePlaceholder"
+ | "rowWithPreview";
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
card: {
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': {
paddingTop: theme.spacing.unit * 0.5
},
tableWrapper: {
+ height: `calc(100% - ${theme.spacing.unit * 6}px)`,
overflow: 'auto',
},
tableRoot: {
'& thead th': {
verticalAlign: 'bottom',
paddingBottom: '10px',
+ },
+ '& td, & th': {
+ paddingRight: '25px',
}
},
paramValue: {
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',
emptyValue: {
color: theme.customs.colors.grey500,
},
+ halfRow: {
+ '& 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',
+ }
});
export enum ProcessIOCardType {
outputUuid?: string;
}
-type ProcessIOCardProps = ProcessIOCardDataProps & WithStyles<CssRules> & MPVPanelProps;
+export interface ProcessIOCardActionProps {
+ navigateTo: (uuid: string) => void;
+}
-export const ProcessIOCard = withStyles(styles)(
- ({ classes, label, params, raw, mounts, outputUuid, doHidePanel, panelName, process }: ProcessIOCardProps) => {
+const mapDispatchToProps = (dispatch: Dispatch): ProcessIOCardActionProps => ({
+ navigateTo: (uuid) => dispatch<any>(navigateTo(uuid)),
+});
+
+type ProcessIOCardProps = ProcessIOCardDataProps & ProcessIOCardActionProps & WithStyles<CssRules> & MPVPanelProps;
+
+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<HTMLElement>, value: number) => {
setMainProcTabState(value);
}
- const PanelIcon = label == ProcessIOCardType.INPUT ? InputIcon : OutputIcon;
+ const [showImagePreview, setShowImagePreview] = useState(false);
+
+ const PanelIcon = label === ProcessIOCardType.INPUT ? InputIcon : OutputIcon;
+ const mainProcess = !process.containerRequest.requestingContainerUuid;
return <Card className={classes.card} data-cy="process-io-card">
<CardHeader
}
action={
<div>
+ { mainProcess && <Tooltip title={"Toggle Image Preview"} disableFocusListener>
+ <IconButton data-cy="io-preview-image-toggle" onClick={() =>{setShowImagePreview(!showImagePreview)}}>{showImagePreview ? <ImageIcon /> : <ImageOffIcon />}</IconButton>
+ </Tooltip> }
+ { doMaximizePanel && !panelMaximized &&
+ <Tooltip title={`Maximize ${panelName || 'panel'}`} disableFocusListener>
+ <IconButton onClick={doMaximizePanel}><MaximizeIcon /></IconButton>
+ </Tooltip> }
{ doHidePanel &&
<Tooltip title={`Close ${panelName || 'panel'}`} disableFocusListener>
<IconButton onClick={doHidePanel}><CloseIcon /></IconButton>
</div>
} />
<CardContent className={classes.content}>
- <div>
- {!process.containerRequest.requestingContainerUuid ?
- (<>
- <Tabs value={mainProcTabState} onChange={handleMainProcTabChange} variant="fullWidth">
- <Tab label="Parameters" />
- <Tab label="JSON" />
- </Tabs>
- {mainProcTabState === 0 && <div className={classes.tableWrapper}>
- {params.length ?
- <ProcessIOPreview data={params} /> :
- <Grid container item alignItems='center' justify='center'>
- <DefaultView messages={["No parameters found"]} icon={InfoIcon} />
- </Grid>}
- </div>}
- {mainProcTabState === 1 && <div className={classes.tableWrapper}>
- {params.length ?
- <ProcessIORaw data={raw || params} /> :
- <Grid container item alignItems='center' justify='center'>
- <DefaultView messages={["No parameters found"]} icon={InfoIcon} />
- </Grid>}
- </div>}
- </>) :
- (<>
- <Tabs value={0} variant="fullWidth">
- {label === ProcessIOCardType.INPUT && <Tab label="Collections" />}
- {label === ProcessIOCardType.OUTPUT && <Tab label="Collection" />}
- </Tabs>
- <div className={classes.tableWrapper}>
- {label === ProcessIOCardType.INPUT && <ProcessInputMounts mounts={mounts || []} />}
- {label === ProcessIOCardType.OUTPUT && <ProcessOutputCollectionFiles isWritable={false} currentItemUuid={outputUuid} />}
- </div>
- </>)
- }
- </div>
+ {mainProcess ?
+ (<>
+ {params.length ?
+ <>
+ <Tabs value={mainProcTabState} onChange={handleMainProcTabChange} variant="fullWidth" className={classes.symmetricTabs}>
+ <Tab label="Parameters" />
+ <Tab label="JSON" />
+ </Tabs>
+ {mainProcTabState === 0 && <div className={classes.tableWrapper}>
+ <ProcessIOPreview data={params} showImagePreview={showImagePreview} />
+ </div>}
+ {mainProcTabState === 1 && <div className={classes.tableWrapper}>
+ <ProcessIORaw data={raw || params} />
+ </div>}
+ </> :
+ <Grid container item alignItems='center' justify='center'>
+ <DefaultView messages={["No parameters found"]} />
+ </Grid>
+ }
+ </>) :
+ (<>
+ {((mounts && mounts.length) || outputUuid) ?
+ <>
+ <Tabs value={0} variant="fullWidth" className={classes.symmetricTabs}>
+ {label === ProcessIOCardType.INPUT && <Tab label="Collections" />}
+ {label === ProcessIOCardType.OUTPUT && <Tab label="Collection" />}
+ </Tabs>
+ <div className={classes.tableWrapper}>
+ {label === ProcessIOCardType.INPUT && <ProcessInputMounts mounts={mounts || []} />}
+ {label === ProcessIOCardType.OUTPUT && <>
+ {outputUuid && <Typography className={classes.collectionLink}>
+ Output Collection: <MuiLink className={classes.keepLink} onClick={() => {navigateTo(outputUuid || "")}}>
+ {outputUuid}
+ </MuiLink></Typography>}
+ <ProcessOutputCollectionFiles isWritable={false} currentItemUuid={outputUuid} />
+ </>}
+ </div>
+ </> :
+ <Grid container item alignItems='center' justify='center'>
+ <DefaultView messages={["No collection(s) found"]} />
+ </Grid>
+ }
+ </>)
+ }
</CardContent>
</Card>;
}
-);
+));
export type ProcessIOValue = {
display: ReactElement<any, any>;
imageUrl?: string;
+ collection?: ReactElement<any, any>;
}
export type ProcessIOParameter = {
id: string;
- doc: string;
+ label: string;
value: ProcessIOValue[];
}
interface ProcessIOPreviewDataProps {
data: ProcessIOParameter[];
+ showImagePreview: boolean;
}
type ProcessIOPreviewProps = ProcessIOPreviewDataProps & WithStyles<CssRules>;
const ProcessIOPreview = withStyles(styles)(
- ({ classes, data }: ProcessIOPreviewProps) =>
- <Table className={classes.tableRoot} aria-label="Process IO Preview">
+ ({ classes, data, showImagePreview }: ProcessIOPreviewProps) => {
+ const showLabel = data.some((param: ProcessIOParameter) => param.label);
+ return <Table className={classes.tableRoot} aria-label="Process IO Preview">
<TableHead>
<TableRow>
- <TableCell>Label</TableCell>
- <TableCell>Description</TableCell>
+ <TableCell>Name</TableCell>
+ {showLabel && <TableCell>Label</TableCell>}
<TableCell>Value</TableCell>
+ <TableCell>Collection</TableCell>
</TableRow>
</TableHead>
<TableBody>
{data.map((param: ProcessIOParameter) => {
- return <TableRow key={param.id}>
- <TableCell component="th" scope="row">
- {param.id}
- </TableCell>
- <TableCell>{param.doc}</TableCell>
- <TableCell>{param.value.map(val => (
- <Typography className={classes.paramValue}>
- {val.imageUrl ? <img className={classes.imagePreview} src={val.imageUrl} alt="Inline Preview" /> : ""}
- <span className={classes.valArray}>
- {val.display}
- </span>
- </Typography>
- ))}</TableCell>
- </TableRow>;
+ const firstVal = param.value.length > 0 ? param.value[0] : undefined;
+ const rest = param.value.slice(1);
+ const rowClass = rest.length > 0 ? classes.halfRow : undefined;
+
+ return <>
+ <TableRow className={rowClass} data-cy="process-io-param">
+ <TableCell>
+ {param.id}
+ </TableCell>
+ {showLabel && <TableCell >{param.label}</TableCell>}
+ <TableCell>
+ {firstVal && <ProcessValuePreview value={firstVal} showImagePreview={showImagePreview} />}
+ </TableCell>
+ <TableCell className={firstVal?.imageUrl ? classes.rowWithPreview : undefined}>
+ <Typography className={classes.paramValue}>
+ {firstVal?.collection}
+ </Typography>
+ </TableCell>
+ </TableRow>
+ {rest.map((val, i) => (
+ <TableRow className={(i < rest.length-1) ? rowClass : undefined}>
+ <TableCell />
+ {showLabel && <TableCell />}
+ <TableCell>
+ <ProcessValuePreview value={val} showImagePreview={showImagePreview} />
+ </TableCell>
+ <TableCell className={firstVal?.imageUrl ? classes.rowWithPreview : undefined}>
+ <Typography className={classes.paramValue}>
+ {val.collection}
+ </Typography>
+ </TableCell>
+ </TableRow>
+ ))}
+ </>;
})}
</TableBody>
- </Table>
-);
+ </Table>;
+});
+
+interface ProcessValuePreviewProps {
+ value: ProcessIOValue;
+ showImagePreview: boolean;
+}
+
+const ProcessValuePreview = withStyles(styles)(
+ ({value, showImagePreview, classes}: ProcessValuePreviewProps & WithStyles<CssRules>) =>
+ <Typography className={classes.paramValue}>
+ {value.imageUrl && showImagePreview ? <img className={classes.imagePreview} src={value.imageUrl} alt="Inline Preview" /> : ""}
+ {value.imageUrl && !showImagePreview ? <ImagePlaceholder /> : ""}
+ <span className={classes.valArray}>
+ {value.display}
+ </span>
+ </Typography>
+)
const handleClick = (url) => {
window.open(url, '_blank');
}
+
+interface ProcessIORawDataProps {
+ data: ProcessIOParameter[];
+}
+
const ProcessIORaw = withStyles(styles)(
- ({ data }: ProcessIOPreviewProps) =>
+ ({ data }: ProcessIORawDataProps) =>
<Paper elevation={0}>
<pre>
{JSON.stringify(data, null, 2)}
const directoryToProcessIOValue = (directory: Directory, auth: AuthState, pdh?: string): ProcessIOValue => {
const normalizedDirectory = normalizeDirectoryLocation(directory);
return {
- display: <span>
- <KeepUrlBase auth={auth} res={normalizedDirectory} pdh={pdh}/>/<KeepUrlPath auth={auth} res={normalizedDirectory} pdh={pdh}/>
- </span>,
+ display: <KeepUrlPath auth={auth} res={normalizedDirectory} pdh={pdh}/>,
+ collection: <KeepUrlBase auth={auth} res={normalizedDirectory} pdh={pdh}/>,
};
};
const fileToProcessIOValue = (file: File, auth: AuthState, pdh?: string): ProcessIOValue => {
return {
- display: <span>
- <KeepUrlBase auth={auth} res={file} pdh={pdh}/>/<KeepUrlPath auth={auth} res={file} pdh={pdh}/>
- </span>,
+ display: <KeepUrlPath auth={auth} res={file} pdh={pdh}/>,
imageUrl: isFileImage(file.basename) ? getImageUrl(auth, file, pdh) : undefined,
+ collection: <KeepUrlBase auth={auth} res={file} pdh={pdh}/>,
}
};
const EmptyValue = withStyles(styles)(
({classes}: WithStyles<CssRules>) => <span className={classes.emptyValue}>No value</span>
);
+
+const ImagePlaceholder = withStyles(styles)(
+ ({classes}: WithStyles<CssRules>) => <span className={classes.imagePlaceholder}><ImageIcon /></span>
+);
projects / arvados-workbench2.git / blobdiff