[arvados-workbench2] updated: 2.4.0-236-g299c20e6

git repository hosting git at public.arvados.org
Tue Oct 18 01:48:24 UTC 2022


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

       via  299c20e6816fef465dd1a29ec4787ba7763a9285 (commit)
       via  5cf1a4451ff37863748e8302b039f6514759504e (commit)
      from  a3189c24b31d2623dab96ec955e411db4d327d38 (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 299c20e6816fef465dd1a29ec4787ba7763a9285
Author: Stephen Smith <stephen at curii.com>
Date:   Mon Oct 17 21:47:49 2022 -0400

    16073: Shrink secondary row spacing
    
    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 b2f36f52..40790e58 100644
--- a/src/views/process-panel/process-io-card.tsx
+++ b/src/views/process-panel/process-io-card.tsx
@@ -81,8 +81,9 @@ type CssRules =
   | "imagePreview"
   | "valArray"
   | "secondaryVal"
+  | "secondaryRow"
   | "emptyValue"
-  | "halfRow"
+  | "noBorderRow"
   | "symmetricTabs"
   | "imagePlaceholder"
   | "rowWithPreview"
@@ -166,10 +167,16 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     secondaryVal: {
         paddingLeft: '20px',
     },
+    secondaryRow: {
+        height: '29px',
+        verticalAlign: 'top',
+        position: 'relative',
+        top: '-9px',
+    },
     emptyValue: {
         color: theme.customs.colors.grey500,
     },
-    halfRow: {
+    noBorderRow: {
         '& td': {
             borderBottom: 'none',
         }
@@ -358,10 +365,12 @@ const ProcessIOPreview = withStyles(styles)(
                 {data.map((param: ProcessIOParameter) => {
                     const firstVal = param.value.length > 0 ? param.value[0] : undefined;
                     const rest = param.value.slice(1);
-                    const rowClass = rest.length > 0 ? classes.halfRow : undefined;
+                    const mainRowClasses = {
+                        [classes.noBorderRow]: (rest.length > 0),
+                    };
 
                     return <>
-                        <TableRow className={rowClass} data-cy="process-io-param">
+                        <TableRow className={classNames(mainRowClasses)} data-cy="process-io-param">
                             <TableCell>
                                 {param.id}
                             </TableCell>
@@ -375,8 +384,12 @@ const ProcessIOPreview = withStyles(styles)(
                                 </Typography>
                             </TableCell>
                         </TableRow>
-                        {rest.map((val, i) => (
-                            <TableRow className={(i < rest.length-1) ? rowClass : undefined}>
+                        {rest.map((val, i) => {
+                            const rowClasses = {
+                                [classes.noBorderRow]: (i < rest.length-1),
+                                [classes.secondaryRow]: val.secondary,
+                            };
+                            return <TableRow className={classNames(rowClasses)}>
                                 <TableCell />
                                 {showLabel && <TableCell />}
                                 <TableCell>
@@ -388,7 +401,7 @@ const ProcessIOPreview = withStyles(styles)(
                                     </Typography>
                                 </TableCell>
                             </TableRow>
-                        ))}
+                        })}
                     </>;
                 })}
             </TableBody>

commit 5cf1a4451ff37863748e8302b039f6514759504e
Author: Stephen Smith <stephen at curii.com>
Date:   Mon Oct 17 21:47:06 2022 -0400

    16073: Use default code snippet for io raw json for auto linking functionality
    
    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 a58f6f79..b2f36f52 100644
--- a/src/views/process-panel/process-io-card.tsx
+++ b/src/views/process-panel/process-io-card.tsx
@@ -64,6 +64,7 @@ import { ProcessOutputCollectionFiles } from './process-output-collection-files'
 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';
 
 type CssRules =
   | "card"
@@ -417,9 +418,7 @@ interface ProcessIORawDataProps {
 const ProcessIORaw = withStyles(styles)(
     ({ data }: ProcessIORawDataProps) =>
         <Paper elevation={0}>
-            <pre>
-                {JSON.stringify(data, null, 2)}
-            </pre>
+            <DefaultCodeSnippet lines={[JSON.stringify(data, null, 2)]} linked />
         </Paper>
 );
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list