19482: Initial commit. Input/output/collection cards work
authorPeter Amstutz <peter.amstutz@curii.com>
Thu, 16 Feb 2023 04:27:40 +0000 (23:27 -0500)
committerPeter Amstutz <peter.amstutz@curii.com>
Thu, 16 Feb 2023 04:27:40 +0000 (23:27 -0500)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

src/routes/route-change-handlers.ts
src/routes/routes.ts
src/store/navigation/navigation-action.ts
src/store/process-panel/process-panel-actions.ts
src/store/workbench/workbench-actions.ts
src/views/process-panel/process-io-card.tsx
src/views/workbench/workbench.tsx
src/views/workflow-panel/registered-workflow-panel.tsx [new file with mode: 0644]

index 237b6d9611bd3d5c9b3f8ff994c92a9dc075e5b5..cded6d65cd38dcce7e00fac722131399c324feec 100644 (file)
@@ -47,6 +47,7 @@ const handleLocationChange = (store: RootStore) => ({ pathname }: Location) => {
     const linksMatch = Routes.matchLinksRoute(pathname);
     const collectionsContentAddressMatch = Routes.matchCollectionsContentAddressRoute(pathname);
     const allProcessesMatch = Routes.matchAllProcessesRoute(pathname);
+    const registeredWorkflowMatch = Routes.matchRegisteredWorkflowRoute(pathname);
 
     store.dispatch(dialogActions.CLOSE_ALL_DIALOGS());
     store.dispatch(contextMenuActions.CLOSE_CONTEXT_MENU());
@@ -112,5 +113,7 @@ const handleLocationChange = (store: RootStore) => ({ pathname }: Location) => {
         store.dispatch(WorkbenchActions.loadCollectionContentAddress);
     } else if (allProcessesMatch) {
         store.dispatch(WorkbenchActions.loadAllProcesses());
+    } else if (registeredWorkflowMatch) {
+        store.dispatch(WorkbenchActions.loadRegisteredWorkflow(registeredWorkflowMatch.params.id));
     }
 };
index 22c8f4c8e52414b8d84c99cc439facc4d4f9ecdf..4dfd998e8dadcc08450fc727b4389c03d199c5c0 100644 (file)
@@ -31,6 +31,7 @@ export const Routes = {
     VIRTUAL_MACHINES_ADMIN: '/virtual-machines-admin',
     VIRTUAL_MACHINES_USER: '/virtual-machines-user',
     WORKFLOWS: '/workflows',
+    REGISTEREDWORKFLOW: `/workflows/:id(${RESOURCE_UUID_PATTERN})`,
     SEARCH_RESULTS: '/search-results',
     SSH_KEYS_ADMIN: `/ssh-keys-admin`,
     SSH_KEYS_USER: `/ssh-keys-user`,
@@ -61,6 +62,8 @@ export const getResourceUrl = (uuid: string) => {
             return getCollectionUrl(uuid);
         case ResourceKind.PROCESS:
             return getProcessUrl(uuid);
+        case ResourceKind.WORKFLOW:
+            return getWorkflowUrl(uuid);
         default:
             return undefined;
     }
@@ -77,12 +80,12 @@ export const getNavUrl = (uuid: string, config: FederationConfig, includeToken:
     } else if (config.remoteHostsConfig[cls]) {
         let u: URL;
         if (config.remoteHostsConfig[cls].workbench2Url) {
-           /* NOTE: wb2 presently doesn't support passing api_token
-              to arbitrary page to set credentials, only through
-              api-token route.  So for navigation to work, user needs
-              to already be logged in.  In the future we want to just
-              request the records and display in the current
-              workbench instance making this redirect unnecessary. */
+            /* NOTE: wb2 presently doesn't support passing api_token
+               to arbitrary page to set credentials, only through
+               api-token route.  So for navigation to work, user needs
+               to already be logged in.  In the future we want to just
+               request the records and display in the current
+               workbench instance making this redirect unnecessary. */
             u = new URL(config.remoteHostsConfig[cls].workbench2Url);
         } else {
             u = new URL(config.remoteHostsConfig[cls].workbenchUrl);
@@ -100,6 +103,8 @@ export const getNavUrl = (uuid: string, config: FederationConfig, includeToken:
 
 export const getProcessUrl = (uuid: string) => `/processes/${uuid}`;
 
+export const getWorkflowUrl = (uuid: string) => `/workflows/${uuid}`;
+
 export const getGroupUrl = (uuid: string) => `/group/${uuid}`;
 
 export const getUserProfileUrl = (uuid: string) => `/user/${uuid}`;
@@ -120,6 +125,9 @@ export const matchTrashRoute = (route: string) =>
 export const matchAllProcessesRoute = (route: string) =>
     matchPath(route, { path: Routes.ALL_PROCESSES });
 
+export const matchRegisteredWorkflowRoute = (route: string) =>
+    matchPath<ResourceRouteParams>(route, { path: Routes.REGISTEREDWORKFLOW });
+
 export const matchProjectRoute = (route: string) =>
     matchPath<ResourceRouteParams>(route, { path: Routes.PROJECTS });
 
index 146530cae8e3ffaf530da19ca3be07743026c78f..edda2c61ca4d57861c98b7577238019923fc8db2 100644 (file)
@@ -42,7 +42,8 @@ export const navigateTo = (uuid: string) =>
                 dispatch<any>(navigateToAdminVirtualMachines);
                 return;
             case ResourceKind.WORKFLOW:
-                dispatch<any>(openDetailsPanel(uuid));
+                dispatch<any>(pushOrGoto(getNavUrl(uuid, getState().auth)));
+                // dispatch<any>(openDetailsPanel(uuid));
                 return;
         }
 
index b361f7acae0cbd8478fc7ed4896be92467863601..9668485c2cbbd6fd399ea9776c555fbedd643fe2 100644 (file)
@@ -165,7 +165,7 @@ export const initProcessPanelFilters = processPanelActions.SET_PROCESS_PANEL_FIL
     ProcessStatus.CANCELLED
 ]);
 
-const formatInputData = (inputs: CommandInputParameter[], auth: AuthState): ProcessIOParameter[] => {
+export const formatInputData = (inputs: CommandInputParameter[], auth: AuthState): ProcessIOParameter[] => {
     return inputs.map(input => {
         return {
             id: getIOParamId(input),
@@ -175,7 +175,7 @@ const formatInputData = (inputs: CommandInputParameter[], auth: AuthState): Proc
     });
 };
 
-const formatOutputData = (definitions: CommandOutputParameter[], values: any, pdh: string | undefined, auth: AuthState): ProcessIOParameter[] => {
+export const formatOutputData = (definitions: CommandOutputParameter[], values: any, pdh: string | undefined, auth: AuthState): ProcessIOParameter[] => {
     return definitions.map(output => {
         return {
             id: getIOParamId(output),
index 1cf71706420fc6c7be736b9d8e4282cdf94ace47..7cb0987b39fd6b8f62cd6efb9eada1929fd660c6 100644 (file)
@@ -588,6 +588,12 @@ export const loadProcess = (uuid: string) =>
         }
     });
 
+export const loadRegisteredWorkflow = (uuid: string) =>
+    handleFirstTimeLoad(async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+        const workflow = await services.workflowService.get(uuid);
+        dispatch<any>(updateResources([workflow]));
+    });
+
 export const updateProcess =
     (data: processUpdateActions.ProcessUpdateFormDialogData) =>
         async (dispatch: Dispatch) => {
index 045bfca2113cce747cfdb3b099141d70fbb29efa..7a2f80949af9d7a2dbdaf8c912a4725806d8e6df 100644 (file)
@@ -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';
@@ -77,27 +77,27 @@ import { DefaultCodeSnippet } from 'components/default-code-snippet/default-code
 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: {
@@ -221,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 {
@@ -240,7 +241,8 @@ 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) => {
@@ -253,7 +255,7 @@ export const ProcessIOCard = withStyles(styles)(connect(null, mapDispatchToProps
         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);
@@ -278,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"]} />
@@ -340,9 +342,9 @@ export const ProcessIOCard = withStyles(styles)(connect(null, mapDispatchToProps
                                     {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}>
@@ -377,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>
@@ -418,7 +421,7 @@ 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)}>
@@ -438,7 +441,7 @@ const ProcessIOPreview = withStyles(styles)(
                 })}
             </TableBody>
         </Table>;
-});
+    });
 
 interface ProcessValuePreviewProps {
     value: ProcessIOValue;
@@ -446,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 /> : ""}
@@ -505,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;
@@ -544,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) &&
@@ -559,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 || []);
@@ -593,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 /> }];
     }
 };
 
@@ -626,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 || '';
 };
 
@@ -642,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);
@@ -651,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('/') : '';
@@ -692,17 +695,17 @@ 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 {
@@ -713,10 +716,10 @@ const fileToProcessIOValue = (file: File, secondary: boolean, auth: AuthState, p
 
     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} /> : <></>,
     }
 };
 
@@ -724,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>
 );
index 7103efd132a1b8e1ac149229d1fbcda0e7620a7f..d549c52935136d42c6fb295b71269a5750a04c4a 100644 (file)
@@ -41,6 +41,7 @@ import { SharedWithMePanel } from 'views/shared-with-me-panel/shared-with-me-pan
 import { RunProcessPanel } from 'views/run-process-panel/run-process-panel';
 import SplitterLayout from 'react-splitter-layout';
 import { WorkflowPanel } from 'views/workflow-panel/workflow-panel';
+import { RegisteredWorkflowPanel } from 'views/workflow-panel/registered-workflow-panel';
 import { SearchResultsPanel } from 'views/search-results-panel/search-results-panel';
 import { SshKeyPanel } from 'views/ssh-key-panel/ssh-key-panel';
 import { SshKeyAdminPanel } from 'views/ssh-key-panel/ssh-key-admin-panel';
@@ -166,6 +167,7 @@ let routes = <>
     <Route path={Routes.TRASH} component={TrashPanel} />
     <Route path={Routes.SHARED_WITH_ME} component={SharedWithMePanel} />
     <Route path={Routes.RUN_PROCESS} component={RunProcessPanel} />
+    <Route path={Routes.REGISTEREDWORKFLOW} component={RegisteredWorkflowPanel} />
     <Route path={Routes.WORKFLOWS} component={WorkflowPanel} />
     <Route path={Routes.SEARCH_RESULTS} component={SearchResultsPanel} />
     <Route path={Routes.VIRTUAL_MACHINES_USER} component={VirtualMachineUserPanel} />
@@ -195,22 +197,22 @@ routes = React.createElement(React.Fragment, null, pluginConfig.centerPanelList.
 const applyCollapsedState = (isCollapsed) => {
     const rightPanel: Element = document.getElementsByClassName('layout-pane')[1]
     const totalWidth: number = document.getElementsByClassName('splitter-layout')[0]?.clientWidth
-    const rightPanelExpandedWidth = ((totalWidth-COLLAPSE_ICON_SIZE)) / (totalWidth/100) 
-    if(rightPanel) {
+    const rightPanelExpandedWidth = ((totalWidth - COLLAPSE_ICON_SIZE)) / (totalWidth / 100)
+    if (rightPanel) {
         rightPanel.setAttribute('style', `width: ${isCollapsed ? rightPanelExpandedWidth : getSplitterInitialSize()}%`)
     }
     const splitter = document.getElementsByClassName('layout-splitter')[0]
     isCollapsed ? splitter?.classList.add('layout-splitter-disabled') : splitter?.classList.remove('layout-splitter-disabled')
-    
+
 }
 
 export const WorkbenchPanel =
-    withStyles(styles)((props: WorkbenchPanelProps) =>{
+    withStyles(styles)((props: WorkbenchPanelProps) => {
 
         //panel size will not scale automatically on window resize, so we do it manually
-        window.addEventListener('resize', ()=>applyCollapsedState(props.sidePanelIsCollapsed))
+        window.addEventListener('resize', () => applyCollapsedState(props.sidePanelIsCollapsed))
         applyCollapsedState(props.sidePanelIsCollapsed)
-        
+
         return <Grid container item xs className={props.classes.root}>
             {props.sessionIdleTimeout > 0 && <AutoLogout />}
             <Grid container item xs className={props.classes.container}>
@@ -296,5 +298,6 @@ export const WorkbenchPanel =
             <WebDavS3InfoDialog />
             <Banner />
             {React.createElement(React.Fragment, null, pluginConfig.dialogs)}
-        </Grid>}
+        </Grid>
+    }
     );
diff --git a/src/views/workflow-panel/registered-workflow-panel.tsx b/src/views/workflow-panel/registered-workflow-panel.tsx
new file mode 100644 (file)
index 0000000..be9a037
--- /dev/null
@@ -0,0 +1,232 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import React from 'react';
+import {
+    StyleRulesCallback,
+    WithStyles,
+    withStyles,
+    IconButton,
+    Grid,
+    Tooltip,
+    Typography,
+    Card
+} from '@material-ui/core';
+import { connect, DispatchProp } from "react-redux";
+import { RouteComponentProps } from 'react-router';
+import { ArvadosTheme } from 'common/custom-theme';
+import { RootState } from 'store/store';
+import { MoreOptionsIcon, WorkflowIcon } from 'components/icon/icon';
+import {
+    WorkflowResource, parseWorkflowDefinition, getWorkflowInputs,
+    getWorkflowOutputs, getWorkflow, getIOParamId
+} from 'models/workflow';
+import { ProcessOutputCollectionFiles } from 'views/process-panel/process-output-collection-files';
+import { WorkflowDetailsAttributes } from 'views-components/details-panel/workflow-details';
+import { getResource } from 'store/resources/resources';
+import { openContextMenu, resourceUuidToContextMenuKind } from 'store/context-menu/context-menu-actions';
+import { MPVContainer, MPVPanelContent, MPVPanelState } from 'components/multi-panel-view/multi-panel-view';
+import { ProcessIOCard, ProcessIOCardType, ProcessIOParameter } from 'views/process-panel/process-io-card';
+import { formatInputData, formatOutputData } from 'store/process-panel/process-panel-actions';
+
+type CssRules = 'root'
+    | 'button'
+    | 'infoCard'
+    | 'propertiesCard'
+    | 'filesCard'
+    | 'iconHeader'
+    | 'tag'
+    | 'label'
+    | 'value'
+    | 'link'
+    | 'centeredLabel'
+    | 'warningLabel'
+    | 'collectionName'
+    | 'readOnlyIcon';
+
+const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
+    root: {
+        width: '100%',
+    },
+    button: {
+        cursor: 'pointer'
+    },
+    infoCard: {
+        paddingLeft: theme.spacing.unit * 2,
+        paddingRight: theme.spacing.unit * 2,
+        paddingBottom: theme.spacing.unit * 2,
+    },
+    propertiesCard: {
+        padding: 0,
+    },
+    filesCard: {
+        padding: 0,
+    },
+    iconHeader: {
+        fontSize: '1.875rem',
+        color: theme.customs.colors.greyL
+    },
+    tag: {
+        marginRight: theme.spacing.unit / 2,
+        marginBottom: theme.spacing.unit / 2
+    },
+    label: {
+        fontSize: '0.875rem',
+    },
+    centeredLabel: {
+        fontSize: '0.875rem',
+        textAlign: 'center'
+    },
+    warningLabel: {
+        fontStyle: 'italic'
+    },
+    collectionName: {
+        flexDirection: 'column',
+    },
+    value: {
+        textTransform: 'none',
+        fontSize: '0.875rem'
+    },
+    link: {
+        fontSize: '0.875rem',
+        color: theme.palette.primary.main,
+        '&:hover': {
+            cursor: 'pointer'
+        }
+    },
+    readOnlyIcon: {
+        marginLeft: theme.spacing.unit,
+        fontSize: 'small',
+    }
+});
+
+interface RegisteredWorkflowPanelDataProps {
+    item: WorkflowResource;
+    workflowCollection: string;
+    inputParams: ProcessIOParameter[];
+    outputParams: ProcessIOParameter[];
+}
+
+type RegisteredWorkflowPanelProps = RegisteredWorkflowPanelDataProps & DispatchProp & WithStyles<CssRules>
+
+export const RegisteredWorkflowPanel = withStyles(styles)(connect(
+    (state: RootState, props: RouteComponentProps<{ id: string }>) => {
+        const item = getResource<WorkflowResource>(props.match.params.id)(state.resources);
+        let inputParams: ProcessIOParameter[] = [];
+        let outputParams: ProcessIOParameter[] = [];
+        let workflowCollection = "";
+        if (item) {
+            // parse definition
+            const wfdef = parseWorkflowDefinition(item);
+
+            const inputs = getWorkflowInputs(wfdef);
+            if (inputs) {
+                inputs.forEach(elm => {
+                    elm.value = elm.default;
+                });
+                inputParams = formatInputData(inputs, state.auth);
+            }
+
+            const outputs = getWorkflowOutputs(wfdef);
+            if (outputs) {
+                outputParams = formatOutputData(outputs, {}, undefined, state.auth);
+            }
+
+            const wf = getWorkflow(wfdef);
+            if (wf) {
+                const REGEX = /keep:([0-9a-f]{32}\+\d+)\/.*/;
+                if (wf["steps"]) {
+                    workflowCollection = wf["steps"][0].run.match(REGEX)[1];
+                }
+            }
+
+            // get the properties from the collection
+        }
+        return { item, inputParams, outputParams, workflowCollection };
+    })(
+        class extends React.Component<RegisteredWorkflowPanelProps> {
+            render() {
+                const { classes, item, inputParams, outputParams, workflowCollection, dispatch } = this.props;
+                const panelsData: MPVPanelState[] = [
+                    { name: "Details" },
+                    { name: "Inputs" },
+                    { name: "Outputs" },
+                    { name: "Files" },
+                ];
+                return item
+                    ? <MPVContainer className={classes.root} spacing={8} direction="column" justify-content="flex-start" wrap="nowrap" panelStates={panelsData}>
+                        <MPVPanelContent xs="auto" data-cy='registered-workflow-info-panel'>
+                            <Card className={classes.infoCard}>
+                                <Grid container justify="space-between">
+                                    <Grid item xs={11}><span>
+                                        <WorkflowIcon className={classes.iconHeader} />
+                                        <span>
+                                            {item.name}
+                                        </span>
+                                    </span></Grid>
+                                    <Grid item xs={1} style={{ textAlign: "right" }}>
+                                        <Tooltip title="Actions" disableFocusListener>
+                                            <IconButton
+                                                data-cy='collection-panel-options-btn'
+                                                aria-label="Actions"
+                                                onClick={this.handleContextMenu}>
+                                                <MoreOptionsIcon />
+                                            </IconButton>
+                                        </Tooltip>
+                                    </Grid>
+                                </Grid>
+                                <Grid container justify="space-between">
+                                    <Grid item xs={12}>
+                                        <Typography variant="caption">
+                                            {item.description}
+                                        </Typography>
+                                        <WorkflowDetailsAttributes workflow={item} />
+                                    </Grid>
+                                </Grid>
+                            </Card>
+                        </MPVPanelContent>
+                        <MPVPanelContent forwardProps xs maxHeight='50%' data-cy="process-inputs">
+                            <ProcessIOCard
+                                label={ProcessIOCardType.INPUT}
+                                params={inputParams}
+                                raw={{}}
+                                showParams={true}
+                            />
+                        </MPVPanelContent>
+                        <MPVPanelContent forwardProps xs maxHeight='50%' data-cy="process-outputs">
+                            <ProcessIOCard
+                                label={ProcessIOCardType.OUTPUT}
+                                params={outputParams}
+                                raw={{}}
+                                showParams={true}
+                            />
+                        </MPVPanelContent>
+                        <MPVPanelContent xs>
+                            <Card className={classes.filesCard}>
+                                <ProcessOutputCollectionFiles isWritable={false} currentItemUuid={workflowCollection} />
+                            </Card>
+                        </MPVPanelContent>
+                    </MPVContainer>
+                    : null;
+            }
+
+            handleContextMenu = (event: React.MouseEvent<any>) => {
+                const { uuid, ownerUuid, name, description,
+                    kind } = this.props.item;
+                const menuKind = this.props.dispatch<any>(resourceUuidToContextMenuKind(uuid));
+                const resource = {
+                    uuid,
+                    ownerUuid,
+                    name,
+                    description,
+                    kind,
+                    menuKind,
+                };
+                // Avoid expanding/collapsing the panel
+                event.stopPropagation();
+                this.props.dispatch<any>(openContextMenu(event, resource));
+            }
+        }
+    )
+);