From: Lucas Di Pentima <lucas@di-pentima.com.ar>
Date: Tue, 20 Oct 2020 14:39:35 +0000 (-0300)
Subject: 16719: Enhances collection panel.
X-Git-Tag: 2.1.1~7^2~7
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/8df7e312b38b8e01bfac8c719b0f883cf866c2c8

16719: Enhances collection panel.

* 'More options' menu renamed to 'Actions' and moved to the top.
* 'This is an old version' warning moved to the bottom.
* Condensed layout makes the main panel to take less vertical space.
* Added attributes: version, created_at, modified_at.
* Reworded some attribute labels on past versions.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>
---

diff --git a/src/components/details-attribute/details-attribute.tsx b/src/components/details-attribute/details-attribute.tsx
index 8f470858..18d0d8b7 100644
--- a/src/components/details-attribute/details-attribute.tsx
+++ b/src/components/details-attribute/details-attribute.tsx
@@ -21,8 +21,7 @@ type CssRules = 'attribute' | 'label' | 'value' | 'lowercaseValue' | 'link' | 'c
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     attribute: {
         display: 'flex',
-        alignItems: 'flex-start',
-        marginBottom: theme.spacing.unit
+        alignItems: 'flex-start'
     },
     label: {
         boxSizing: 'border-box',
diff --git a/src/views/collection-panel/collection-panel.tsx b/src/views/collection-panel/collection-panel.tsx
index a21d70ed..6e0b8609 100644
--- a/src/views/collection-panel/collection-panel.tsx
+++ b/src/views/collection-panel/collection-panel.tsx
@@ -21,7 +21,7 @@ import { deleteCollectionTag, navigateToProcess, collectionPanelActions } from '
 import { getResource } from '~/store/resources/resources';
 import { openContextMenu } from '~/store/context-menu/context-menu-actions';
 import { ContextMenuKind } from '~/views-components/context-menu/context-menu';
-import { formatFileSize } from "~/common/formatters";
+import { formatDate, formatFileSize } from "~/common/formatters";
 import { openDetailsPanel } from '~/store/details-panel/details-panel-action';
 import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions';
 import { getPropertyChip } from '~/views-components/resource-properties-form/property-chip';
@@ -70,8 +70,7 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
         textAlign: 'center'
     },
     warningLabel: {
-        fontStyle: 'italic',
-        fontWeight: 'bold'
+        fontStyle: 'italic'
     },
     collectionName: {
         flexDirection: 'column',
@@ -132,45 +131,56 @@ export const CollectionPanel = withStyles(styles)(
                     ? <div className={classes.root}>
                         <ExpansionPanel data-cy='collection-info-panel' defaultExpanded>
                             <ExpansionPanelSummary expandIcon={<ExpandIcon />}>
-                                <span>
-                                    <IconButton onClick={this.openCollectionDetails}>
-                                        { isOldVersion
-                                        ? <CollectionOldVersionIcon className={classes.iconHeader} />
-                                        : <CollectionIcon className={classes.iconHeader} /> }
-                                    </IconButton>
-                                    <IllegalNamingWarning name={item.name}/>
-                                    <span>
-                                        {item.name}
-                                        {isWritable ||
-                                        <Tooltip title="Read-only">
-                                            <ReadOnlyIcon data-cy="read-only-icon" className={classes.readOnlyIcon} />
+                                <Grid container justify="space-between">
+                                    <Grid item xs={11}><span>
+                                        <IconButton onClick={this.openCollectionDetails}>
+                                            { isOldVersion
+                                            ? <CollectionOldVersionIcon className={classes.iconHeader} />
+                                            : <CollectionIcon className={classes.iconHeader} /> }
+                                        </IconButton>
+                                        <IllegalNamingWarning name={item.name}/>
+                                        <span>
+                                            {item.name}
+                                            {isWritable ||
+                                            <Tooltip title="Read-only">
+                                                <ReadOnlyIcon data-cy="read-only-icon" className={classes.readOnlyIcon} />
+                                            </Tooltip>
+                                            }
+                                        </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>
-                                        }
-                                        {isOldVersion &&
-                                        <Typography className={classes.warningLabel} variant="caption">
-                                            This is an old version. Copy it as a new one if you need to make changes. Go to the current version if you need to share it.
-                                        </Typography>
-                                        }
-                                    </span>
-                                </span>
+                                    </Grid>
+                                </Grid>
                             </ExpansionPanelSummary>
                             <ExpansionPanelDetails>
                                 <Grid container justify="space-between">
-                                    <Grid item xs={11}>
+                                    <Grid item xs={12}>
                                         <Typography variant="caption">
                                             {item.description}
                                         </Typography>
                                         <DetailsAttribute classLabel={classes.label} classValue={classes.value}
-                                            label='Collection UUID'
+                                            label={isOldVersion ? "This version's UUID" : "Collection UUID"}
                                             linkToUuid={item.uuid} />
                                         <DetailsAttribute classLabel={classes.label} classValue={classes.value}
-                                            label='Portable data hash'
+                                            label={isOldVersion ? "This version's PDH" : "Portable data hash"}
                                             linkToUuid={item.portableDataHash} />
                                         {isOldVersion &&
                                         <DetailsAttribute classLabel={classes.label} classValue={classes.value}
-                                            label='Current Version UUID'
+                                            label='Most recent version'
                                             linkToUuid={item.currentVersionUuid} />
                                         }
+                                        <DetailsAttribute label='Last modified' value={formatDate(item.modifiedAt)} />
+                                        <DetailsAttribute label='Created at' value={formatDate(item.createdAt)} />
+                                        <DetailsAttribute classLabel={classes.label} classValue={classes.value}
+                                            label='Version number' value={item.version} />
                                         <DetailsAttribute classLabel={classes.label} classValue={classes.value}
                                             label='Number of files' value={item.fileCount} />
                                         <DetailsAttribute classLabel={classes.label} classValue={classes.value}
@@ -182,16 +192,11 @@ export const CollectionPanel = withStyles(styles)(
                                                 <DetailsAttribute classLabel={classes.link} label='Link to process' />
                                             </span>
                                         }
-                                    </Grid>
-                                    <Grid item xs={1} style={{textAlign: "right"}}>
-                                        <Tooltip title="More options" disableFocusListener>
-                                            <IconButton
-                                                data-cy='collection-panel-options-btn'
-                                                aria-label="More options"
-                                                onClick={this.handleContextMenu}>
-                                                <MoreOptionsIcon />
-                                            </IconButton>
-                                        </Tooltip>
+                                        {isOldVersion &&
+                                        <Typography className={classes.warningLabel} variant="caption">
+                                            This is an old version. Copy it as a new one if you need to make changes. Go to the current version if you need to share it.
+                                        </Typography>
+                                        }
                                     </Grid>
                                 </Grid>
                             </ExpansionPanelDetails>
@@ -260,6 +265,8 @@ export const CollectionPanel = withStyles(styles)(
                             : ContextMenuKind.COLLECTION
                         : ContextMenuKind.READONLY_COLLECTION
                 };
+                // Avoid expanding/collapsing the panel
+                event.stopPropagation();
                 this.props.dispatch<any>(openContextMenu(event, resource));
             }