X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5e9c2244747eff9fc02ff3c0d140bdde5e0b6845..edb0ce16ee7ccef6cec38c9787ba0dadde5da697:/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 4f93f48c2e..43be924067 100644
--- a/src/views/process-panel/process-io-card.tsx
+++ b/src/views/process-panel/process-io-card.tsx
@@ -39,23 +39,23 @@ import {
 } from 'components/icon/icon';
 import { MPVPanelProps } from 'components/multi-panel-view/multi-panel-view';
 import {
-  BooleanCommandInputParameter,
-  CommandInputParameter,
-  CWLType,
-  Directory,
-  DirectoryArrayCommandInputParameter,
-  DirectoryCommandInputParameter,
-  EnumCommandInputParameter,
-  FileArrayCommandInputParameter,
-  FileCommandInputParameter,
-  FloatArrayCommandInputParameter,
-  FloatCommandInputParameter,
-  IntArrayCommandInputParameter,
-  IntCommandInputParameter,
-  isArrayOfType,
-  isPrimitiveOfType,
-  StringArrayCommandInputParameter,
-  StringCommandInputParameter,
+    BooleanCommandInputParameter,
+    CommandInputParameter,
+    CWLType,
+    Directory,
+    DirectoryArrayCommandInputParameter,
+    DirectoryCommandInputParameter,
+    EnumCommandInputParameter,
+    FileArrayCommandInputParameter,
+    FileCommandInputParameter,
+    FloatArrayCommandInputParameter,
+    FloatCommandInputParameter,
+    IntArrayCommandInputParameter,
+    IntCommandInputParameter,
+    isArrayOfType,
+    isPrimitiveOfType,
+    StringArrayCommandInputParameter,
+    StringCommandInputParameter,
 } from "models/workflow";
 import { CommandOutputParameter } from 'cwlts/mappings/v1.0/CommandOutputParameter';
 import { File } from 'models/workflow';
@@ -74,29 +74,30 @@ 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"
-  | "content"
-  | "title"
-  | "header"
-  | "avatar"
-  | "iconHeader"
-  | "tableWrapper"
-  | "tableRoot"
-  | "paramValue"
-  | "keepLink"
-  | "collectionLink"
-  | "imagePreview"
-  | "valArray"
-  | "secondaryVal"
-  | "secondaryRow"
-  | "emptyValue"
-  | "noBorderRow"
-  | "symmetricTabs"
-  | "imagePlaceholder"
-  | "rowWithPreview"
-  | "labelColumn";
+    | "card"
+    | "content"
+    | "title"
+    | "header"
+    | "avatar"
+    | "iconHeader"
+    | "tableWrapper"
+    | "tableRoot"
+    | "paramValue"
+    | "keepLink"
+    | "collectionLink"
+    | "imagePreview"
+    | "valArray"
+    | "secondaryVal"
+    | "secondaryRow"
+    | "emptyValue"
+    | "noBorderRow"
+    | "symmetricTabs"
+    | "imagePlaceholder"
+    | "rowWithPreview"
+    | "labelColumn";
 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     card: {
@@ -108,7 +109,7 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     },
     iconHeader: {
         fontSize: '1.875rem',
-        color: theme.customs.colors.green700,
+        color: theme.customs.colors.greyL,
     },
     avatar: {
         alignSelf: 'flex-start',
@@ -124,10 +125,13 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     },
     title: {
         overflow: 'hidden',
-        paddingTop: theme.spacing.unit * 0.5
+        paddingTop: theme.spacing.unit * 0.5,
+        color: theme.customs.colors.greyD,
+        fontSize: '1.875rem'
     },
     tableWrapper: {
-        height: `calc(100% - ${theme.spacing.unit * 6}px)`,
+        height: 'auto',
+        maxHeight: `calc(100% - ${theme.spacing.unit * 4.5}px)`,
         overflow: 'auto',
     },
     tableRoot: {
@@ -183,7 +187,7 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
         top: '-9px',
     },
     emptyValue: {
-        color: theme.customs.colors.grey500,
+        color: theme.customs.colors.grey700,
     },
     noBorderRow: {
         '& td': {
@@ -217,12 +221,13 @@ export enum ProcessIOCardType {
     OUTPUT = 'Outputs',
 }
 export interface ProcessIOCardDataProps {
-    process: Process;
+    process?: Process;
     label: ProcessIOCardType;
     params: ProcessIOParameter[] | null;
     raw: any;
     mounts?: InputCollectionMount[];
     outputUuid?: string;
+    showParams?: boolean;
 }
 
 export interface ProcessIOCardActionProps {
@@ -236,21 +241,30 @@ const mapDispatchToProps = (dispatch: Dispatch): ProcessIOCardActionProps => ({
 type ProcessIOCardProps = ProcessIOCardDataProps & ProcessIOCardActionProps & WithStyles<CssRules> & MPVPanelProps;
 
 export const ProcessIOCard = withStyles(styles)(connect(null, mapDispatchToProps)(
-    ({ classes, label, params, raw, mounts, outputUuid, doHidePanel, doMaximizePanel, doUnMaximizePanel, panelMaximized, panelName, process, navigateTo }: ProcessIOCardProps) => {
+    ({ classes, label, params, raw, mounts, outputUuid, doHidePanel, doMaximizePanel,
+        doUnMaximizePanel, panelMaximized, panelName, process, navigateTo, showParams }: ProcessIOCardProps) => {
         const [mainProcTabState, setMainProcTabState] = useState(0);
+        const [subProcTabState, setSubProcTabState] = useState(0);
         const handleMainProcTabChange = (event: React.MouseEvent<HTMLElement>, value: number) => {
             setMainProcTabState(value);
         }
+        const handleSubProcTabChange = (event: React.MouseEvent<HTMLElement>, value: number) => {
+            setSubProcTabState(value);
+        }
 
         const [showImagePreview, setShowImagePreview] = useState(false);
 
         const PanelIcon = label === ProcessIOCardType.INPUT ? InputIcon : OutputIcon;
-        const mainProcess = !process.containerRequest.requestingContainerUuid;
+        const mainProcess = !(process && process!.containerRequest.requestingContainerUuid);
 
         const loading = raw === null || raw === undefined || params === null;
         const hasRaw = !!(raw && Object.keys(raw).length > 0);
         const hasParams = !!(params && params.length > 0);
 
+        // Subprocess
+        const hasInputMounts = !!(label === ProcessIOCardType.INPUT && mounts && mounts.length);
+        const hasOutputCollecton = !!(label === ProcessIOCardType.OUTPUT && outputUuid);
+
         return <Card className={classes.card} data-cy="process-io-card">
             <CardHeader
                 className={classes.header}
@@ -266,47 +280,47 @@ export const ProcessIOCard = withStyles(styles)(connect(null, mapDispatchToProps
                 }
                 action={
                     <div>
-                        { mainProcess && <Tooltip title={"Toggle Image Preview"} disableFocusListener>
-                            <IconButton data-cy="io-preview-image-toggle" onClick={() =>{setShowImagePreview(!showImagePreview)}}>{showImagePreview ? <ImageIcon /> : <ImageOffIcon />}</IconButton>
-                        </Tooltip> }
-                        { doUnMaximizePanel && panelMaximized &&
-                        <Tooltip title={`Unmaximize ${panelName || 'panel'}`} disableFocusListener>
-                            <IconButton onClick={doUnMaximizePanel}><UnMaximizeIcon /></IconButton>
-                        </Tooltip> }
-                        { doMaximizePanel && !panelMaximized &&
-                        <Tooltip title={`Maximize ${panelName || 'panel'}`} disableFocusListener>
-                            <IconButton onClick={doMaximizePanel}><MaximizeIcon /></IconButton>
-                        </Tooltip> }
-                        { doHidePanel &&
-                        <Tooltip title={`Close ${panelName || 'panel'}`} disableFocusListener>
-                            <IconButton disabled={panelMaximized} onClick={doHidePanel}><CloseIcon /></IconButton>
-                        </Tooltip> }
+                        {mainProcess && <Tooltip title={"Toggle Image Preview"} disableFocusListener>
+                            <IconButton data-cy="io-preview-image-toggle" onClick={() => { setShowImagePreview(!showImagePreview) }}>{showImagePreview ? <ImageIcon /> : <ImageOffIcon />}</IconButton>
+                        </Tooltip>}
+                        {doUnMaximizePanel && panelMaximized &&
+                            <Tooltip title={`Unmaximize ${panelName || 'panel'}`} disableFocusListener>
+                                <IconButton onClick={doUnMaximizePanel}><UnMaximizeIcon /></IconButton>
+                            </Tooltip>}
+                        {doMaximizePanel && !panelMaximized &&
+                            <Tooltip title={`Maximize ${panelName || 'panel'}`} disableFocusListener>
+                                <IconButton onClick={doMaximizePanel}><MaximizeIcon /></IconButton>
+                            </Tooltip>}
+                        {doHidePanel &&
+                            <Tooltip title={`Close ${panelName || 'panel'}`} disableFocusListener>
+                                <IconButton disabled={panelMaximized} onClick={doHidePanel}><CloseIcon /></IconButton>
+                            </Tooltip>}
                     </div>
                 } />
             <CardContent className={classes.content}>
-                {mainProcess ?
+                {(mainProcess || showParams) ?
                     (<>
                         {/* raw is undefined until params are loaded */}
                         {loading && <Grid container item alignItems='center' justify='center'>
                             <CircularProgress />
                         </Grid>}
                         {/* 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
-                          */}
+			   *   Raw when all params are empty
+			   *   Params when raw is provided by containerRequest properties but workflow mount is absent for preview
+			   */}
                         {(!loading && (hasRaw || hasParams)) &&
                             <>
                                 <Tabs value={mainProcTabState} onChange={handleMainProcTabChange} variant="fullWidth" className={classes.symmetricTabs}>
                                     {/* params will be empty on processes without workflow definitions in mounts, so we only show raw */}
                                     {hasParams && <Tab label="Parameters" />}
-                                    <Tab label="JSON" />
+                                    {!showParams && <Tab label="JSON" />}
                                 </Tabs>
                                 {(mainProcTabState === 0 && params && hasParams) && <div className={classes.tableWrapper}>
-                                        <ProcessIOPreview data={params} showImagePreview={showImagePreview} />
-                                    </div>}
+                                    <ProcessIOPreview data={params} showImagePreview={showImagePreview} valueLabel={showParams ? "Default value" : "Value"} />
+                                </div>}
                                 {(mainProcTabState === 1 || !hasParams) && <div className={classes.tableWrapper}>
-                                        <ProcessIORaw data={raw} />
-                                    </div>}
+                                    <ProcessIORaw data={raw} />
+                                </div>}
                             </>}
                         {!loading && !hasRaw && !hasParams && <Grid container item alignItems='center' justify='center'>
                             <DefaultView messages={["No parameters found"]} />
@@ -314,25 +328,32 @@ export const ProcessIOCard = withStyles(styles)(connect(null, mapDispatchToProps
                     </>) :
                     // Subprocess
                     (<>
-                        {((mounts && mounts.length) || outputUuid) ?
+                        {loading && <Grid container item alignItems='center' justify='center'>
+                            <CircularProgress />
+                        </Grid>}
+                        {!loading && (hasInputMounts || hasOutputCollecton || hasRaw) ?
                             <>
-                                <Tabs value={0} variant="fullWidth" className={classes.symmetricTabs}>
-                                    {label === ProcessIOCardType.INPUT && <Tab label="Collections" />}
-                                    {label === ProcessIOCardType.OUTPUT && <Tab label="Collection" />}
+                                <Tabs value={subProcTabState} onChange={handleSubProcTabChange} variant="fullWidth" className={classes.symmetricTabs}>
+                                    {hasInputMounts && <Tab label="Collections" />}
+                                    {hasOutputCollecton && <Tab label="Collection" />}
+                                    <Tab label="JSON" />
                                 </Tabs>
                                 <div className={classes.tableWrapper}>
-                                    {label === ProcessIOCardType.INPUT && <ProcessInputMounts mounts={mounts || []} />}
-                                    {label === ProcessIOCardType.OUTPUT && <>
+                                    {subProcTabState === 0 && hasInputMounts && <ProcessInputMounts mounts={mounts || []} />}
+                                    {subProcTabState === 0 && hasOutputCollecton && <>
                                         {outputUuid && <Typography className={classes.collectionLink}>
-                                            Output Collection: <MuiLink className={classes.keepLink} onClick={() => {navigateTo(outputUuid || "")}}>
-                                            {outputUuid}
-                                        </MuiLink></Typography>}
+                                            Output Collection: <MuiLink className={classes.keepLink} onClick={() => { navigateTo(outputUuid || "") }}>
+                                                {outputUuid}
+                                            </MuiLink></Typography>}
                                         <ProcessOutputCollectionFiles isWritable={false} currentItemUuid={outputUuid} />
                                     </>}
+                                    {(subProcTabState === 1 || (!hasInputMounts && !hasOutputCollecton)) && <div className={classes.tableWrapper}>
+                                        <ProcessIORaw data={raw} />
+                                    </div>}
                                 </div>
                             </> :
                             <Grid container item alignItems='center' justify='center'>
-                                <DefaultView messages={["No collection(s) found"]} />
+                                <DefaultView messages={["No data to display"]} />
                             </Grid>
                         }
                     </>)
@@ -358,19 +379,20 @@ export type ProcessIOParameter = {
 interface ProcessIOPreviewDataProps {
     data: ProcessIOParameter[];
     showImagePreview: boolean;
+    valueLabel: string;
 }
 
 type ProcessIOPreviewProps = ProcessIOPreviewDataProps & WithStyles<CssRules>;
 
 const ProcessIOPreview = withStyles(styles)(
-    ({ classes, data, showImagePreview }: ProcessIOPreviewProps) => {
+    ({ classes, data, showImagePreview, valueLabel }: ProcessIOPreviewProps) => {
         const showLabel = data.some((param: ProcessIOParameter) => param.label);
         return <Table className={classes.tableRoot} aria-label="Process IO Preview">
             <TableHead>
                 <TableRow>
                     <TableCell>Name</TableCell>
                     {showLabel && <TableCell className={classes.labelColumn}>Label</TableCell>}
-                    <TableCell>Value</TableCell>
+                    <TableCell>{valueLabel}</TableCell>
                     <TableCell>Collection</TableCell>
                 </TableRow>
             </TableHead>
@@ -382,7 +404,7 @@ const ProcessIOPreview = withStyles(styles)(
                         [classes.noBorderRow]: (rest.length > 0),
                     };
 
-                    return <>
+                    return <React.Fragment key={param.id}>
                         <TableRow className={classNames(mainRowClasses)} data-cy="process-io-param">
                             <TableCell>
                                 {param.id}
@@ -399,10 +421,10 @@ const ProcessIOPreview = withStyles(styles)(
                         </TableRow>
                         {rest.map((val, i) => {
                             const rowClasses = {
-                                [classes.noBorderRow]: (i < rest.length-1),
+                                [classes.noBorderRow]: (i < rest.length - 1),
                                 [classes.secondaryRow]: val.secondary,
                             };
-                            return <TableRow className={classNames(rowClasses)}>
+                            return <TableRow className={classNames(rowClasses)} key={i}>
                                 <TableCell />
                                 {showLabel && <TableCell />}
                                 <TableCell>
@@ -415,11 +437,11 @@ const ProcessIOPreview = withStyles(styles)(
                                 </TableCell>
                             </TableRow>
                         })}
-                    </>;
+                    </React.Fragment>;
                 })}
             </TableBody>
-        </Table>;
-});
+        </Table >;
+    });
 
 interface ProcessValuePreviewProps {
     value: ProcessIOValue;
@@ -427,7 +449,7 @@ interface ProcessValuePreviewProps {
 }
 
 const ProcessValuePreview = withStyles(styles)(
-    ({value, showImagePreview, classes}: ProcessValuePreviewProps & WithStyles<CssRules>) =>
+    ({ 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 /> : ""}
@@ -486,33 +508,33 @@ export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParam
         case isPrimitiveOfType(input, CWLType.BOOLEAN):
             const boolValue = (input as BooleanCommandInputParameter).value;
             return boolValue !== undefined &&
-                    !(Array.isArray(boolValue) && boolValue.length === 0) ?
-                [{display: renderPrimitiveValue(boolValue, false) }] :
-                [{display: <EmptyValue />}];
+                !(Array.isArray(boolValue) && boolValue.length === 0) ?
+                [{ display: renderPrimitiveValue(boolValue, false) }] :
+                [{ display: <EmptyValue /> }];
 
         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: renderPrimitiveValue(intValue, false) }]
-                : [{display: <EmptyValue />}];
+                // Missing values are empty array
+                !(Array.isArray(intValue) && intValue.length === 0) ?
+                [{ display: renderPrimitiveValue(intValue, false) }]
+                : [{ display: <EmptyValue /> }];
 
         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: renderPrimitiveValue(floatValue, false) }]:
-                [{display: <EmptyValue />}];
+                !(Array.isArray(floatValue) && floatValue.length === 0) ?
+                [{ display: renderPrimitiveValue(floatValue, false) }] :
+                [{ display: <EmptyValue /> }];
 
         case isPrimitiveOfType(input, CWLType.STRING):
             const stringValue = (input as StringCommandInputParameter).value || undefined;
             return stringValue !== undefined &&
-                    !(Array.isArray(stringValue) && stringValue.length === 0) ?
-                [{display: renderPrimitiveValue(stringValue, false) }] :
-                [{display: <EmptyValue />}];
+                !(Array.isArray(stringValue) && stringValue.length === 0) ?
+                [{ display: renderPrimitiveValue(stringValue, false) }] :
+                [{ display: <EmptyValue /> }];
 
         case isPrimitiveOfType(input, CWLType.FILE):
             const mainFile = (input as FileCommandInputParameter).value;
@@ -525,14 +547,14 @@ export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParam
             const mainFilePdhUrl = mainFile ? getResourcePdhUrl(mainFile, pdh) : "";
             return files.length ?
                 files.map((file, i) => fileToProcessIOValue(file, (i > 0), auth, pdh, (i > 0 ? mainFilePdhUrl : ""))) :
-                [{display: <EmptyValue />}];
+                [{ display: <EmptyValue /> }];
 
         case isPrimitiveOfType(input, CWLType.DIRECTORY):
             const directory = (input as DirectoryCommandInputParameter).value;
             return directory !== undefined &&
-                    !(Array.isArray(directory) && directory.length === 0) ?
+                !(Array.isArray(directory) && directory.length === 0) ?
                 [directoryToProcessIOValue(directory, auth, pdh)] :
-                [{display: <EmptyValue />}];
+                [{ display: <EmptyValue /> }];
 
         case typeof input.type === 'object' &&
             !(input.type instanceof Array) &&
@@ -540,27 +562,27 @@ export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParam
             const enumValue = (input as EnumCommandInputParameter).value;
             return enumValue !== undefined && enumValue ?
                 [{ display: <pre>{enumValue}</pre> }] :
-                [{display: <EmptyValue />}];
+                [{ display: <EmptyValue /> }];
 
         case isArrayOfType(input, CWLType.STRING):
             const strArray = (input as StringArrayCommandInputParameter).value || [];
             return strArray.length ?
                 [{ display: <>{strArray.map((val) => renderPrimitiveValue(val, true))}</> }] :
-                [{display: <EmptyValue />}];
+                [{ display: <EmptyValue /> }];
 
         case isArrayOfType(input, CWLType.INT):
         case isArrayOfType(input, CWLType.LONG):
             const intArray = (input as IntArrayCommandInputParameter).value || [];
             return intArray.length ?
                 [{ display: <>{intArray.map((val) => renderPrimitiveValue(val, true))}</> }] :
-                [{display: <EmptyValue />}];
+                [{ display: <EmptyValue /> }];
 
         case isArrayOfType(input, CWLType.FLOAT):
         case isArrayOfType(input, CWLType.DOUBLE):
             const floatArray = (input as FloatArrayCommandInputParameter).value || [];
             return floatArray.length ?
                 [{ display: <>{floatArray.map((val) => renderPrimitiveValue(val, true))}</> }] :
-                [{display: <EmptyValue />}];
+                [{ display: <EmptyValue /> }];
 
         case isArrayOfType(input, CWLType.FILE):
             const fileArrayMainFiles = ((input as FileArrayCommandInputParameter).value || []);
@@ -574,21 +596,21 @@ export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParam
                     ...(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 each mainFile/secondaryFile group into single array preserving ordering
             }).reduce((acc: ProcessIOValue[], mainFile: ProcessIOValue[]) => (acc.concat(mainFile)), []);
 
             return fileArrayValues.length ?
                 fileArrayValues :
-                [{display: <EmptyValue />}];
+                [{ display: <EmptyValue /> }];
 
         case isArrayOfType(input, CWLType.DIRECTORY):
             const directories = (input as DirectoryArrayCommandInputParameter).value || [];
             return directories.length ?
                 directories.map(directory => directoryToProcessIOValue(directory, auth, pdh)) :
-                [{display: <EmptyValue />}];
+                [{ display: <EmptyValue /> }];
 
         default:
-            return [{display: <UnsupportedValue />}];
+            return [{ display: <UnsupportedValue /> }];
     }
 };
 
@@ -607,8 +629,8 @@ const renderPrimitiveValue = (value: any, asChip: boolean) => {
 const getKeepUrl = (file: File | Directory, pdh?: string): string => {
     const isKeepUrl = file.location?.startsWith('keep:') || false;
     const keepUrl = isKeepUrl ?
-                        file.location?.replace('keep:', '') :
-                        pdh ? `${pdh}/${file.location}` : file.location;
+        file.location?.replace('keep:', '') :
+        pdh ? `${pdh}/${file.location}` : file.location;
     return keepUrl || '';
 };
 
@@ -623,7 +645,7 @@ const getResourcePdhUrl = (res: File | Directory, pdh?: string): string => {
     return keepUrl ? keepUrl.split('/').slice(0, 1)[0] : '';
 };
 
-const KeepUrlBase = withStyles(styles)(({auth, res, pdh, classes}: KeepUrlProps & WithStyles<CssRules>) => {
+const KeepUrlBase = withStyles(styles)(({ auth, res, pdh, classes }: KeepUrlProps & WithStyles<CssRules>) => {
     const pdhUrl = getResourcePdhUrl(res, pdh);
     // Passing a pdh always returns a relative wb2 collection url
     const pdhWbPath = getNavUrl(pdhUrl, auth);
@@ -632,7 +654,7 @@ const KeepUrlBase = withStyles(styles)(({auth, res, pdh, classes}: KeepUrlProps
         <></>;
 });
 
-const KeepUrlPath = withStyles(styles)(({auth, res, pdh, classes}: KeepUrlProps & WithStyles<CssRules>) => {
+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('/') : '';
@@ -657,6 +679,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;
@@ -668,24 +695,31 @@ const normalizeDirectoryLocation = (directory: Directory): Directory => {
 };
 
 const directoryToProcessIOValue = (directory: Directory, auth: AuthState, pdh?: string): ProcessIOValue => {
-    if (isExternalValue(directory)) {return {display: <UnsupportedValue />}}
+    if (isExternalValue(directory)) { return { display: <UnsupportedValue /> } }
 
     const normalizedDirectory = normalizeDirectoryLocation(directory);
     return {
-        display: <KeepUrlPath auth={auth} res={normalizedDirectory} pdh={pdh}/>,
-        collection: <KeepUrlBase auth={auth} res={normalizedDirectory} pdh={pdh}/>,
+        display: <KeepUrlPath auth={auth} res={normalizedDirectory} pdh={pdh} />,
+        collection: <KeepUrlBase auth={auth} res={normalizedDirectory} pdh={pdh} />,
     };
 };
 
 const fileToProcessIOValue = (file: File, secondary: boolean, auth: AuthState, pdh: string | undefined, mainFilePdh: string): ProcessIOValue => {
-    if (isExternalValue(file)) {return {display: <UnsupportedValue />}}
+    if (isExternalValue(file)) { return { display: <UnsupportedValue /> } }
+
+    if (isFileUrl(file.location)) {
+        return {
+            display: <MuiLink href={file.location} target="_blank">{file.location}</MuiLink>,
+            secondary,
+        };
+    }
 
     const resourcePdh = getResourcePdhUrl(file, pdh);
     return {
-        display: <KeepUrlPath auth={auth} res={file} pdh={pdh}/>,
+        display: <KeepUrlPath auth={auth} res={file} pdh={pdh} />,
         secondary,
         imageUrl: isFileImage(file.basename) ? getImageUrl(auth, file, pdh) : undefined,
-        collection: (resourcePdh !== mainFilePdh) ? <KeepUrlBase auth={auth} res={file} pdh={pdh}/> : <></>,
+        collection: (resourcePdh !== mainFilePdh) ? <KeepUrlBase auth={auth} res={file} pdh={pdh} /> : <></>,
     }
 };
 
@@ -693,18 +727,18 @@ const isExternalValue = (val: any) =>
     Object.keys(val).includes('$import') ||
     Object.keys(val).includes('$include')
 
-const EmptyValue = withStyles(styles)(
-    ({classes}: WithStyles<CssRules>) => <span className={classes.emptyValue}>No value</span>
+export const EmptyValue = withStyles(styles)(
+    ({ classes }: WithStyles<CssRules>) => <span className={classes.emptyValue}>No value</span>
 );
 
 const UnsupportedValue = withStyles(styles)(
-    ({classes}: WithStyles<CssRules>) => <span className={classes.emptyValue}>Cannot display value</span>
+    ({ classes }: WithStyles<CssRules>) => <span className={classes.emptyValue}>Cannot display value</span>
 );
 
 const UnsupportedValueChip = withStyles(styles)(
-    ({classes}: WithStyles<CssRules>) => <Chip icon={<InfoIcon />} label={"Cannot display value"} />
+    ({ classes }: WithStyles<CssRules>) => <Chip icon={<InfoIcon />} label={"Cannot display value"} />
 );
 
 const ImagePlaceholder = withStyles(styles)(
-    ({classes}: WithStyles<CssRules>) => <span className={classes.imagePlaceholder}><ImageIcon /></span>
+    ({ classes }: WithStyles<CssRules>) => <span className={classes.imagePlaceholder}><ImageIcon /></span>
 );
