[arvados-workbench2] updated: 2.4.0-233-gd2eeb3ba

git repository hosting git at public.arvados.org
Mon Oct 17 21:18:24 UTC 2022


Summary of changes:
 src/views/process-panel/process-io-card.tsx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

       via  d2eeb3ba4be53b34a03b9bc8567cc42442f24a41 (commit)
       via  542c909d574067382de91721b42d5f05da4035da (commit)
       via  d29c915c1a724c7e26a4deeacda76846d5635a5f (commit)
      from  3e467c1a87339c399f63db00b15bf34ac8781e31 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit d2eeb3ba4be53b34a03b9bc8567cc42442f24a41
Author: Stephen Smith <stephen at curii.com>
Date:   Mon Oct 17 17:17:18 2022 -0400

    16073: Display root directories with '/'
    
    Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>

diff --git a/src/views/process-panel/process-io-card.tsx b/src/views/process-panel/process-io-card.tsx
index b5bc08bc..a58f6f79 100644
--- a/src/views/process-panel/process-io-card.tsx
+++ b/src/views/process-panel/process-io-card.tsx
@@ -614,9 +614,8 @@ const KeepUrlPath = withStyles(styles)(({auth, res, pdh, classes}: KeepUrlProps
     const keepUrlPath = keepUrlParts.length > 1 ? keepUrlParts.slice(1).join('/') : '';
 
     const keepUrlPathNav = getKeepNavUrl(auth, res, pdh);
-    return keepUrlPath && keepUrlPathNav ?
-        <Tooltip title={"View in keep-web"}><a className={classes.keepLink} href={keepUrlPathNav} target="_blank" rel="noopener noreferrer">{keepUrlPath}</a></Tooltip> :
-        // Show No value for root collection io that lacks path part
+    return keepUrlPathNav ?
+        <Tooltip title={"View in keep-web"}><a className={classes.keepLink} href={keepUrlPathNav} target="_blank" rel="noopener noreferrer">{keepUrlPath || '/'}</a></Tooltip> :
         <EmptyValue />;
 });
 

commit 542c909d574067382de91721b42d5f05da4035da
Author: Stephen Smith <stephen at curii.com>
Date:   Mon Oct 17 17:03:54 2022 -0400

    16073: Add guards against null file parameters
    
    Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>

diff --git a/src/views/process-panel/process-io-card.tsx b/src/views/process-panel/process-io-card.tsx
index 0d148d72..b5bc08bc 100644
--- a/src/views/process-panel/process-io-card.tsx
+++ b/src/views/process-panel/process-io-card.tsx
@@ -548,14 +548,14 @@ export const getIOParamDisplayValue = (auth: AuthState, input: CommandInputParam
 
         case isArrayOfType(input, CWLType.FILE):
             const fileArrayMainFiles = ((input as FileArrayCommandInputParameter).value || []);
-            const firstMainFilePdh = fileArrayMainFiles.length > 0 ? getResourcePdhUrl(fileArrayMainFiles[0], pdh) : "";
+            const firstMainFilePdh = (fileArrayMainFiles.length > 0 && fileArrayMainFiles[0]) ? getResourcePdhUrl(fileArrayMainFiles[0], pdh) : "";
 
             // Convert each main file into separate arrays of ProcessIOValue to preserve secondaryFile grouping
             const fileArrayValues = fileArrayMainFiles.map((mainFile: File, i): ProcessIOValue[] => {
                 const secondaryFiles = ((mainFile as unknown) as FileWithSecondaryFiles)?.secondaryFiles || [];
                 return [
                     // Pass firstMainFilePdh to secondary files and every main file besides the first to hide pdh if equal
-                    fileToProcessIOValue(mainFile, false, auth, pdh, i > 0 ? firstMainFilePdh : ""),
+                    ...(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

commit d29c915c1a724c7e26a4deeacda76846d5635a5f
Author: Stephen Smith <stephen at curii.com>
Date:   Mon Oct 17 17:03:08 2022 -0400

    16073: Fix erroneously showing no parameters message
    
    Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>

diff --git a/src/views/process-panel/process-io-card.tsx b/src/views/process-panel/process-io-card.tsx
index 82846128..0d148d72 100644
--- a/src/views/process-panel/process-io-card.tsx
+++ b/src/views/process-panel/process-io-card.tsx
@@ -287,7 +287,7 @@ export const ProcessIOCard = withStyles(styles)(connect(null, mapDispatchToProps
                                         <ProcessIORaw data={raw} />
                                     </div>}
                             </>}
-                        {!loading && raw && Object.keys(raw).length === 0 && <Grid container item alignItems='center' justify='center'>
+                        {!loading && !hasRaw && !hasParams && <Grid container item alignItems='center' justify='center'>
                             <DefaultView messages={["No parameters found"]} />
                         </Grid>}
                     </>) :

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list