X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/392a0a3992e48d0544523869b850b925d6d7f4c8..cd7f6fd81788f459642408df05be2daf214ef437:/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 caea890eb1..7284159ebf 100644 --- a/src/views/process-panel/process-io-card.tsx +++ b/src/views/process-panel/process-io-card.tsx @@ -3,6 +3,7 @@ // SPDX-License-Identifier: AGPL-3.0 import React, { ReactElement, useState } from 'react'; +import { Dispatch } from 'redux'; import { StyleRulesCallback, WithStyles, @@ -23,9 +24,10 @@ import { Paper, Grid, Chip, + CircularProgress, } from '@material-ui/core'; import { ArvadosTheme } from 'common/custom-theme'; -import { CloseIcon, InfoIcon, ProcessIcon } 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, @@ -58,8 +60,29 @@ 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'; - -type CssRules = 'card' | 'content' | 'title' | 'header' | 'avatar' | 'iconHeader' | 'tableWrapper' | 'tableRoot' | 'paramValue' | 'keepLink' | 'imagePreview' | 'valArray' | 'emptyValue'; +import { ProcessOutputCollectionFiles } from './process-output-collection-files'; +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"; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ card: { @@ -78,6 +101,7 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ 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': { @@ -89,14 +113,23 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ paddingTop: theme.spacing.unit * 0.5 }, tableWrapper: { + height: `calc(100% - ${theme.spacing.unit * 6}px)`, overflow: 'auto', }, tableRoot: { width: '100%', + '& thead th': { + verticalAlign: 'bottom', + paddingBottom: '10px', + }, + '& td, & th': { + paddingRight: '25px', + } }, paramValue: { display: 'flex', - alignItems: 'center', + alignItems: 'flex-start', + flexDirection: 'column', }, keepLink: { color: theme.palette.primary.main, @@ -104,9 +137,19 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ overflowWrap: 'break-word', cursor: 'pointer', }, + collectionLink: { + margin: '10px', + '& a': { + 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', @@ -119,6 +162,28 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ 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 { @@ -126,21 +191,36 @@ export enum ProcessIOCardType { OUTPUT = 'Outputs', } export interface ProcessIOCardDataProps { + process: Process; label: ProcessIOCardType; - params: ProcessIOParameter[]; + params?: ProcessIOParameter[]; raw?: any; mounts?: InputCollectionMount[]; + outputUuid?: string; } -type ProcessIOCardProps = ProcessIOCardDataProps & WithStyles & MPVPanelProps; +export interface ProcessIOCardActionProps { + navigateTo: (uuid: string) => void; +} -export const ProcessIOCard = withStyles(styles)( - ({ classes, label, params, raw, mounts, doHidePanel, panelName }: ProcessIOCardProps) => { - const [tabState, setTabState] = useState(0); - const handleChange = (event: React.MouseEvent, value: number) => { - setTabState(value); +const mapDispatchToProps = (dispatch: Dispatch): ProcessIOCardActionProps => ({ + navigateTo: (uuid) => dispatch(navigateTo(uuid)), +}); + +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) => { + const [mainProcTabState, setMainProcTabState] = useState(0); + const handleMainProcTabChange = (event: React.MouseEvent, value: number) => { + setMainProcTabState(value); } + const [showImagePreview, setShowImagePreview] = useState(false); + + const PanelIcon = label === ProcessIOCardType.INPUT ? InputIcon : OutputIcon; + const mainProcess = !process.containerRequest.requestingContainerUuid; + return } + avatar={} title={ {label} @@ -156,6 +236,13 @@ export const ProcessIOCard = withStyles(styles)( } action={
+ { mainProcess && + {setShowImagePreview(!showImagePreview)}}>{showImagePreview ? : } + } + { doMaximizePanel && !panelMaximized && + + + } { doHidePanel && @@ -163,89 +250,157 @@ export const ProcessIOCard = withStyles(styles)(
} /> -
- - - - {label === ProcessIOCardType.INPUT && } - - {tabState === 0 &&
- {params.length ? - : + {mainProcess ? + (<> + {params === undefined && + + } + {params && params.length > 0 && + <> + + + + + {mainProcTabState === 0 &&
+ +
} + {mainProcTabState === 1 &&
+ +
} + } + {params && params.length === 0 && + + } + ) : + // Subprocess + (<> + {((mounts && mounts.length) || outputUuid) ? + <> + + {label === ProcessIOCardType.INPUT && } + {label === ProcessIOCardType.OUTPUT && } + +
+ {label === ProcessIOCardType.INPUT && } + {label === ProcessIOCardType.OUTPUT && <> + {outputUuid && + Output Collection: {navigateTo(outputUuid || "")}}> + {outputUuid} + } + + } +
+ : - - } -
} - {tabState === 1 &&
- {params.length ? - : - - - } -
} - {tabState === 2 &&
- {label === ProcessIOCardType.INPUT && } -
} -
+ + + } + ) + } ; } -); +)); export type ProcessIOValue = { display: ReactElement; imageUrl?: string; + collection?: ReactElement; } export type ProcessIOParameter = { id: string; - doc: string; + label: string; value: ProcessIOValue[]; } interface ProcessIOPreviewDataProps { data: ProcessIOParameter[]; + showImagePreview: boolean; } type ProcessIOPreviewProps = ProcessIOPreviewDataProps & WithStyles; const ProcessIOPreview = withStyles(styles)( - ({ classes, data }: ProcessIOPreviewProps) => - + ({ classes, data, showImagePreview }: ProcessIOPreviewProps) => { + const showLabel = data.some((param: ProcessIOParameter) => param.label); + return
- Label - Description + Name + {showLabel && Label} Value + Collection {data.map((param: ProcessIOParameter) => { - return - - {param.id} - - {param.doc} - {param.value.map(val => ( - - {val.imageUrl ? Inline Preview : ""} - - {val.display} - - - ))} - ; + 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 <> + + + {param.id} + + {showLabel && {param.label}} + + {firstVal && } + + + + {firstVal?.collection} + + + + {rest.map((val, i) => ( + + + {showLabel && } + + + + + + {val.collection} + + + + ))} + ; })} -
-); + ; +}); + +interface ProcessValuePreviewProps { + value: ProcessIOValue; + showImagePreview: boolean; +} + +const ProcessValuePreview = withStyles(styles)( + ({value, showImagePreview, classes}: ProcessValuePreviewProps & WithStyles) => + + {value.imageUrl && showImagePreview ? Inline Preview : ""} + {value.imageUrl && !showImagePreview ? : ""} + + {value.display} + + +) const handleClick = (url) => { window.open(url, '_blank'); } + +interface ProcessIORawDataProps { + data: ProcessIOParameter[]; +} + const ProcessIORaw = withStyles(styles)( - ({ data }: ProcessIOPreviewProps) => + ({ data }: ProcessIORawDataProps) => 
                 {JSON.stringify(data, null, 2)}
@@ -402,9 +557,14 @@ export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParam
     }
 };
 
+/*
+ * @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 || '';
 };
 
@@ -418,9 +578,9 @@ const KeepUrlBase = withStyles(styles)(({auth, res, pdh, classes}: KeepUrlProps
     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 ?
-        {pdhUrl} :
+        {pdhUrl} :
         <>;
 });
 
@@ -431,17 +591,18 @@ const KeepUrlPath = withStyles(styles)(({auth, res, pdh, classes}: KeepUrlProps
 
     const keepUrlPathNav = getKeepNavUrl(auth, res, pdh);
     return keepUrlPath && keepUrlPathNav ?
-         handleClick(keepUrlPathNav)}>{keepUrlPath} :
-        <>;
+        {keepUrlPath} :
+        // Show No value for root collection io that lacks path part
+        ;
 });
 
 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);
 };
 
@@ -462,21 +623,23 @@ const normalizeDirectoryLocation = (directory: Directory): Directory => {
 const directoryToProcessIOValue = (directory: Directory, auth: AuthState, pdh?: string): ProcessIOValue => {
     const normalizedDirectory = normalizeDirectoryLocation(directory);
     return {
-        display: 
-            /
-        ,
+        display: ,
+        collection: ,
     };
 };
 
 const fileToProcessIOValue = (file: File, auth: AuthState, pdh?: string): ProcessIOValue => {
     return {
-        display: 
-            /
-        ,
+        display: ,
         imageUrl: isFileImage(file.basename) ? getImageUrl(auth, file, pdh) : undefined,
+        collection: ,
     }
 };
 
 const EmptyValue = withStyles(styles)(
     ({classes}: WithStyles) => No value
 );
+
+const ImagePlaceholder = withStyles(styles)(
+    ({classes}: WithStyles) => 
+);