Paper,
Grid,
Chip,
+ CircularProgress,
} from '@material-ui/core';
import { ArvadosTheme } from 'common/custom-theme';
-import { CloseIcon, ImageIcon, InfoIcon, InputIcon, ImageOffIcon, 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 { Process } from 'store/processes/process';
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';
+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: {
export interface ProcessIOCardDataProps {
process: Process;
label: ProcessIOCardType;
- params: ProcessIOParameter[];
+ params?: ProcessIOParameter[];
raw?: any;
mounts?: InputCollectionMount[];
outputUuid?: string;
type ProcessIOCardProps = ProcessIOCardDataProps & ProcessIOCardActionProps & WithStyles<CssRules> & MPVPanelProps;
export const ProcessIOCard = withStyles(styles)(connect(null, mapDispatchToProps)(
- ({ classes, label, params, raw, mounts, outputUuid, doHidePanel, panelName, process, navigateTo }: ProcessIOCardProps) => {
+ ({ 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);
{ 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>
- {mainProcess ?
- (<>
- <Tabs value={mainProcTabState} onChange={handleMainProcTabChange} variant="fullWidth" className={classes.symmetricTabs}>
- <Tab label="Parameters" />
- <Tab label="JSON" />
- </Tabs>
- {mainProcTabState === 0 && <div className={classes.tableWrapper}>
- {params.length ?
- <ProcessIOPreview data={params} showImagePreview={showImagePreview} /> :
- <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" 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>
- </>)
- }
- </div>
+ {mainProcess ?
+ (<>
+ {params === undefined && <Grid container item alignItems='center' justify='center'>
+ <CircularProgress />
+ </Grid>}
+ {params && params.length > 0 &&
+ <>
+ <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>}
+ </>}
+ {params && params.length === 0 && <Grid container item alignItems='center' justify='center'>
+ <DefaultView messages={["No parameters found"]} />
+ </Grid>}
+ </>) :
+ // Subprocess
+ (<>
+ {((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>;
}
type ProcessIOPreviewProps = ProcessIOPreviewDataProps & WithStyles<CssRules>;
const ProcessIOPreview = withStyles(styles)(
- ({ classes, data, showImagePreview }: 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>Name</TableCell>
- <TableCell>Label</TableCell>
+ {showLabel && <TableCell>Label</TableCell>}
<TableCell>Value</TableCell>
<TableCell>Collection</TableCell>
</TableRow>
<TableCell>
{param.id}
</TableCell>
- <TableCell >{param.label}</TableCell>
+ {showLabel && <TableCell >{param.label}</TableCell>}
<TableCell>
{firstVal && <ProcessValuePreview value={firstVal} showImagePreview={showImagePreview} />}
</TableCell>
{rest.map((val, i) => (
<TableRow className={(i < rest.length-1) ? rowClass : undefined}>
<TableCell />
- <TableCell />
+ {showLabel && <TableCell />}
<TableCell>
<ProcessValuePreview value={val} showImagePreview={showImagePreview} />
</TableCell>
</>;
})}
</TableBody>
- </Table>
-);
+ </Table>;
+});
interface ProcessValuePreviewProps {
value: ProcessIOValue;
}
};
+/*
+ * @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 || '';
};
const keepUrl = getKeepUrl(res, pdh);
const pdhUrl = keepUrl ? keepUrl.split('/').slice(0, 1)[0] : '';
// 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 ?
<Tooltip title={"View collection in Workbench"}><RouterLink to={pdhWbPath} className={classes.keepLink}>{pdhUrl}</RouterLink></Tooltip> :
<></>;
const keepUrlPathNav = getKeepNavUrl(auth, res, pdh);
return keepUrlPath && keepUrlPathNav ?
- <Tooltip title={"View in keep-web"}><MuiLink className={classes.keepLink} onClick={() => handleClick(keepUrlPathNav)}>{keepUrlPath}</MuiLink></Tooltip> :
+ <Tooltip title={"View in keep-web"}><a className={classes.keepLink} href={keepUrlPathNav} target="_blank">{keepUrlPath}</a></Tooltip> :
// Show No value for root collection io that lacks path part
<EmptyValue />;
});
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);
};
projects / arvados.git / blobdiff