X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/450946f9f2192f807238cd0b020164896e0bef0d..4f88234088269faa064da9459376c3af2a740a7d:/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 e1ab90cb..2857aa13 100644
--- a/src/views/process-panel/process-io-card.tsx
+++ b/src/views/process-panel/process-io-card.tsx
@@ -21,12 +21,11 @@ import {
     TableRow,
     TableCell,
     Paper,
-    Link,
     Grid,
     Chip,
 } from '@material-ui/core';
 import { ArvadosTheme } from 'common/custom-theme';
-import { CloseIcon, InfoIcon, ProcessIcon } from 'components/icon/icon';
+import { CloseIcon, InfoIcon, ProcessIcon, InputIcon, OutputIcon } from 'components/icon/icon';
 import { MPVPanelProps } from 'components/multi-panel-view/multi-panel-view';
 import {
   BooleanCommandInputParameter,
@@ -53,8 +52,15 @@ import { getInlineFileUrl } from 'views-components/context-menu/actions/helpers'
 import { AuthState } from 'store/auth/auth-reducer';
 import mime from 'mime';
 import { DefaultView } from 'components/default-view/default-view';
+import { getNavUrl } from 'routes/routes';
+import { Link as RouterLink } from 'react-router-dom';
+import { Link as MuiLink } from '@material-ui/core';
+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';
+type CssRules = 'card' | 'content' | 'title' | 'header' | 'avatar' | 'iconHeader' | 'tableWrapper' | 'tableRoot' | 'paramValue' | 'keepLink' | 'imagePreview' | 'valArray' | 'emptyValue';
 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     card: {
@@ -91,36 +97,54 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     },
     paramValue: {
         display: 'flex',
-        alignItems: 'center',
+        alignItems: 'flex-start',
+        flexDirection: 'column',
     },
     keepLink: {
+        color: theme.palette.primary.main,
+        textDecoration: 'none',
+        overflowWrap: 'break-word',
         cursor: 'pointer',
     },
     imagePreview: {
         maxHeight: '15em',
-        marginRight: theme.spacing.unit,
+        maxWidth: '15em',
+        marginBottom: theme.spacing.unit,
     },
     valArray: {
         display: 'flex',
         gap: '10px',
         flexWrap: 'wrap',
+        '& span': {
+            display: 'inline',
+        }
+    },
+    emptyValue: {
+        color: theme.customs.colors.grey500,
     },
 });
 
+export enum ProcessIOCardType {
+    INPUT = 'Inputs',
+    OUTPUT = 'Outputs',
+}
 export interface ProcessIOCardDataProps {
-    label: string;
+    label: ProcessIOCardType;
     params: ProcessIOParameter[];
     raw?: any;
+    mounts?: InputCollectionMount[];
+    outputUuid?: string;
 }
 
 type ProcessIOCardProps = ProcessIOCardDataProps & WithStyles<CssRules> & MPVPanelProps;
 
 export const ProcessIOCard = withStyles(styles)(
-    ({ classes, label, params, raw, doHidePanel, panelName }: ProcessIOCardProps) => {
+    ({ classes, label, params, raw, mounts, outputUuid, doHidePanel, panelName }: ProcessIOCardProps) => {
         const [tabState, setTabState] = useState(0);
         const handleChange = (event: React.MouseEvent<HTMLElement>, value: number) => {
             setTabState(value);
         }
+        const PanelIcon = label == ProcessIOCardType.INPUT ? InputIcon : OutputIcon;
 
         return <Card className={classes.card} data-cy="process-io-card">
             <CardHeader
@@ -129,7 +153,7 @@ export const ProcessIOCard = withStyles(styles)(
                     content: classes.title,
                     avatar: classes.avatar,
                 }}
-                avatar={<ProcessIcon className={classes.iconHeader} />}
+                avatar={<PanelIcon className={classes.iconHeader} />}
                 title={
                     <Typography noWrap variant='h6' color='inherit'>
                         {label}
@@ -144,21 +168,32 @@ export const ProcessIOCard = withStyles(styles)(
                     </div>
                 } />
             <CardContent className={classes.content}>
-                {params.length ?
                 <div>
                     <Tabs value={tabState} onChange={handleChange} variant="fullWidth">
-                        <Tab label="Preview" />
-                        <Tab label="Raw" />
+                        <Tab label="Parameters" />
+                        <Tab label="JSON" />
+                        {label === ProcessIOCardType.INPUT && <Tab label="Collections" />}
+                        {label === ProcessIOCardType.OUTPUT && <Tab label="Collection" />}
                     </Tabs>
                     {tabState === 0 && <div className={classes.tableWrapper}>
-                        <ProcessIOPreview data={params} />
+                        {params.length ?
+                            <ProcessIOPreview data={params} /> :
+                            <Grid container item alignItems='center' justify='center'>
+                                <DefaultView messages={["No parameters found"]} icon={InfoIcon} />
+                            </Grid>}
                         </div>}
                     {tabState === 1 && <div className={classes.tableWrapper}>
-                        <ProcessIORaw data={raw || params} />
+                        {params.length ?
+                            <ProcessIORaw data={raw || params} /> :
+                            <Grid container item alignItems='center' justify='center'>
+                                <DefaultView messages={["No parameters found"]} icon={InfoIcon} />
+                            </Grid>}
+                        </div>}
+                    {tabState === 2 && <div className={classes.tableWrapper}>
+                        {label === ProcessIOCardType.INPUT && <ProcessInputMounts mounts={mounts || []} />}
+                        {label === ProcessIOCardType.OUTPUT && <ProcessOutputCollectionFiles isWritable={false} currentItemUuid={outputUuid} />}
                         </div>}
-                </div> : <Grid container item alignItems='center' justify='center'>
-                    <DefaultView messages={["No parameters found"]} icon={InfoIcon} />
-                </Grid>}
+                </div>
             </CardContent>
         </Card>;
     }
@@ -166,7 +201,6 @@ export const ProcessIOCard = withStyles(styles)(
 
 export type ProcessIOValue = {
     display: ReactElement<any, any>;
-    nav?: string;
     imageUrl?: string;
 }
 
@@ -184,7 +218,7 @@ type ProcessIOPreviewProps = ProcessIOPreviewDataProps & WithStyles<CssRules>;
 
 const ProcessIOPreview = withStyles(styles)(
     ({ classes, data }: ProcessIOPreviewProps) =>
-        <Table className={classes.tableRoot} aria-label="simple table">
+        <Table className={classes.tableRoot} aria-label="Process IO Preview">
             <TableHead>
                 <TableRow>
                     <TableCell>Label</TableCell>
@@ -202,12 +236,9 @@ const ProcessIOPreview = withStyles(styles)(
                         <TableCell>{param.value.map(val => (
                             <Typography className={classes.paramValue}>
                                 {val.imageUrl ? <img className={classes.imagePreview} src={val.imageUrl} alt="Inline Preview" /> : ""}
-                                {val.nav ?
-                                    <Link className={classes.keepLink} onClick={() => handleClick(val.nav)}>{val.display}</Link>
-                                    : <span className={classes.valArray}>
-                                        {val.display}
-                                    </span>
-                                }
+                                <span className={classes.valArray}>
+                                    {val.display}
+                                </span>
                             </Typography>
                         ))}</TableCell>
                     </TableRow>;
@@ -229,55 +260,127 @@ const ProcessIORaw = withStyles(styles)(
         </Paper>
 );
 
+interface ProcessInputMountsDataProps {
+    mounts: InputCollectionMount[];
+}
+
+type ProcessInputMountsProps = ProcessInputMountsDataProps & WithStyles<CssRules>;
+
+const ProcessInputMounts = withStyles(styles)(connect((state: RootState) => ({
+    auth: state.auth,
+}))(({ mounts, classes, auth }: ProcessInputMountsProps & { auth: AuthState }) => (
+    <Table className={classes.tableRoot} aria-label="Process Input Mounts">
+        <TableHead>
+            <TableRow>
+                <TableCell>Path</TableCell>
+                <TableCell>Portable Data Hash</TableCell>
+            </TableRow>
+        </TableHead>
+        <TableBody>
+            {mounts.map(mount => (
+                <TableRow key={mount.path}>
+                    <TableCell><pre>{mount.path}</pre></TableCell>
+                    <TableCell>
+                        <RouterLink to={getNavUrl(mount.pdh, auth)} className={classes.keepLink}>{mount.pdh}</RouterLink>
+                    </TableCell>
+                </TableRow>
+            ))}
+        </TableBody>
+    </Table>
+)));
+
 type FileWithSecondaryFiles = {
     secondaryFiles: File[];
 }
 
-export const getInputDisplayValue = (auth: AuthState, input: CommandInputParameter | CommandOutputParameter, pdh?: string): ProcessIOValue[] => {
+export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParameter | CommandOutputParameter, pdh?: string): ProcessIOValue[] => {
     switch (true) {
         case isPrimitiveOfType(input, CWLType.BOOLEAN):
-            return [{display: <pre>{String((input as BooleanCommandInputParameter).value)}</pre> }];
+            const boolValue = (input as BooleanCommandInputParameter).value;
+
+            return boolValue !== undefined &&
+                    !(Array.isArray(boolValue) && boolValue.length === 0) ?
+                [{display: <pre>{String(boolValue)}</pre> }] :
+                [{display: <EmptyValue />}];
 
         case isPrimitiveOfType(input, CWLType.INT):
         case isPrimitiveOfType(input, CWLType.LONG):
-            return [{display: <pre>{String((input as IntCommandInputParameter).value)}</pre> }];
+            const intValue = (input as IntCommandInputParameter).value;
+
+            return intValue !== undefined &&
+                    // Missing values are empty array
+                    !(Array.isArray(intValue) && intValue.length === 0) ?
+                [{display: <pre>{String(intValue)}</pre> }]
+                : [{display: <EmptyValue />}];
 
         case isPrimitiveOfType(input, CWLType.FLOAT):
         case isPrimitiveOfType(input, CWLType.DOUBLE):
-            return [{display: <pre>{String((input as FloatCommandInputParameter).value)}</pre> }];
+            const floatValue = (input as FloatCommandInputParameter).value;
+
+            return floatValue !== undefined &&
+                    !(Array.isArray(floatValue) && floatValue.length === 0) ?
+                [{display: <pre>{String(floatValue)}</pre> }]:
+                [{display: <EmptyValue />}];
 
         case isPrimitiveOfType(input, CWLType.STRING):
-            return [{display: <pre>{(input as StringCommandInputParameter).value || ""}</pre> }];
+            const stringValue = (input as StringCommandInputParameter).value || undefined;
+
+            return stringValue !== undefined &&
+                    !(Array.isArray(stringValue) && stringValue.length === 0) ?
+                [{display: <pre>{stringValue}</pre> }] :
+                [{display: <EmptyValue />}];
 
         case isPrimitiveOfType(input, CWLType.FILE):
             const mainFile = (input as FileCommandInputParameter).value;
             // secondaryFiles: File[] is not part of CommandOutputParameter so we cast to access secondaryFiles
             const secondaryFiles = ((mainFile as unknown) as FileWithSecondaryFiles)?.secondaryFiles || [];
             const files = [
-                ...(mainFile ? [mainFile] : []),
+                ...(mainFile && !(Array.isArray(mainFile) && mainFile.length === 0) ? [mainFile] : []),
                 ...secondaryFiles
             ];
-            return files.map(file => fileToProcessIOValue(file, auth, pdh));
+
+            return files.length ?
+                files.map(file => fileToProcessIOValue(file, auth, pdh)) :
+                [{display: <EmptyValue />}];
 
         case isPrimitiveOfType(input, CWLType.DIRECTORY):
             const directory = (input as DirectoryCommandInputParameter).value;
-            return directory ? [directoryToProcessIOValue(directory, auth, pdh)] : [];
+
+            return directory !== undefined &&
+                    !(Array.isArray(directory) && directory.length === 0) ?
+                [directoryToProcessIOValue(directory, auth, pdh)] :
+                [{display: <EmptyValue />}];
 
         case typeof input.type === 'object' &&
             !(input.type instanceof Array) &&
             input.type.type === 'enum':
-            return [{ display: <pre>{(input as EnumCommandInputParameter).value || ''}</pre> }];
+            const enumValue = (input as EnumCommandInputParameter).value;
+
+            return enumValue !== undefined ?
+                [{ display: <pre>{(input as EnumCommandInputParameter).value || ''}</pre> }] :
+                [{display: <EmptyValue />}];
 
         case isArrayOfType(input, CWLType.STRING):
-            return [{ display: <>{((input as StringArrayCommandInputParameter).value || []).map((val) => <Chip label={val} />)}</> }];
+            const strArray = (input as StringArrayCommandInputParameter).value || [];
+            return strArray.length ?
+                [{ display: <>{((input as StringArrayCommandInputParameter).value || []).map((val) => <Chip label={val} />)}</> }] :
+                [{display: <EmptyValue />}];
 
         case isArrayOfType(input, CWLType.INT):
         case isArrayOfType(input, CWLType.LONG):
-            return [{ display: <>{((input as IntArrayCommandInputParameter).value || []).map((val) => <Chip label={val} />)}</> }];
+            const intArray = (input as IntArrayCommandInputParameter).value || [];
+
+            return intArray.length ?
+                [{ display: <>{((input as IntArrayCommandInputParameter).value || []).map((val) => <Chip label={val} />)}</> }] :
+                [{display: <EmptyValue />}];
 
         case isArrayOfType(input, CWLType.FLOAT):
         case isArrayOfType(input, CWLType.DOUBLE):
-            return [{ display: <>{((input as FloatArrayCommandInputParameter).value || []).map((val) => <Chip label={val} />)}</> }];
+            const floatArray = (input as FloatArrayCommandInputParameter).value || [];
+
+            return floatArray.length ?
+                [{ display: <>{floatArray.map((val) => <Chip label={val} />)}</> }] :
+                [{display: <EmptyValue />}];
 
         case isArrayOfType(input, CWLType.FILE):
             const fileArrayMainFile = ((input as FileArrayCommandInputParameter).value || []);
@@ -290,12 +393,16 @@ export const getInputDisplayValue = (auth: AuthState, input: CommandInputParamet
                 ...fileArraySecondaryFiles
             ];
 
-            return fileArrayFiles
-                .map(file => fileToProcessIOValue(file, auth, pdh));
+            return fileArrayFiles.length ?
+                fileArrayFiles.map(file => fileToProcessIOValue(file, auth, pdh)) :
+                [{display: <EmptyValue />}];
 
         case isArrayOfType(input, CWLType.DIRECTORY):
             const directories = (input as DirectoryArrayCommandInputParameter).value || [];
-            return directories.map(directory => directoryToProcessIOValue(directory, auth, pdh));
+
+            return directories.length ?
+                directories.map(directory => directoryToProcessIOValue(directory, auth, pdh)) :
+                [{display: <EmptyValue />}];
 
         default:
             return [];
@@ -308,7 +415,34 @@ const getKeepUrl = (file: File | Directory, pdh?: string): string => {
     return keepUrl || '';
 };
 
-const getNavUrl = (auth: AuthState, file: File | Directory, pdh?: string): string => {
+interface KeepUrlProps {
+    auth: AuthState;
+    res: File | Directory;
+    pdh?: string;
+}
+
+const KeepUrlBase = withStyles(styles)(({auth, res, pdh, classes}: KeepUrlProps & WithStyles<CssRules>) => {
+    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);
+    return pdhUrl && pdhWbPath ?
+        <RouterLink to={pdhWbPath} className={classes.keepLink}>{pdhUrl}</RouterLink> :
+        <></>;
+});
+
+const KeepUrlPath = withStyles(styles)(({auth, res, pdh, classes}: KeepUrlProps & WithStyles<CssRules>) => {
+    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 ?
+        <MuiLink className={classes.keepLink} onClick={() => handleClick(keepUrlPathNav)}>{keepUrlPath}</MuiLink> :
+        <></>;
+});
+
+const getKeepNavUrl = (auth: AuthState, file: File | Directory, pdh?: string): string => {
     let keepUrl = getKeepUrl(file, pdh).replace('keep:', '');
     return (getInlineFileUrl(`${auth.config.keepWebServiceUrl}/c=${keepUrl}?api_token=${auth.apiToken}`, auth.config.keepWebServiceUrl, auth.config.keepWebInlineServiceUrl));
 };
@@ -335,13 +469,21 @@ const normalizeDirectoryLocation = (directory: Directory): Directory => {
 const directoryToProcessIOValue = (directory: Directory, auth: AuthState, pdh?: string): ProcessIOValue => {
     const normalizedDirectory = normalizeDirectoryLocation(directory);
     return {
-        display: <>{getKeepUrl(normalizedDirectory, pdh)}</>,
-        nav: getNavUrl(auth, normalizedDirectory, pdh),
+        display: <span>
+            <KeepUrlBase auth={auth} res={normalizedDirectory} pdh={pdh}/>/<KeepUrlPath auth={auth} res={normalizedDirectory} pdh={pdh}/>
+        </span>,
     };
 };
 
-const fileToProcessIOValue = (file: File, auth: AuthState, pdh?: string): ProcessIOValue => ({
-    display: <>{getKeepUrl(file, pdh)}</>,
-    nav: getNavUrl(auth, file, pdh),
-    imageUrl: isFileImage(file.basename) ? getImageUrl(auth, file, pdh) : undefined,
-});
+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>,
+        imageUrl: isFileImage(file.basename) ? getImageUrl(auth, file, pdh) : undefined,
+    }
+};
+
+const EmptyValue = withStyles(styles)(
+    ({classes}: WithStyles<CssRules>) => <span className={classes.emptyValue}>No value</span>
+);
