21313: moved items so that all rows align properly Arvados-DCO-1.1-Signed-off-by...

diff --git a/services/workbench2/src/views-components/sharing-dialog/sharing-management-form-component.tsx b/services/workbench2/src/views-components/sharing-dialog/sharing-management-form-component.tsx
index b7ac8ced7612c1a234f7c64f5e61c037bb516660..fa3cc4618924f014768e9999f0469314e310a243 100644 (file)
--- a/services/workbench2/src/views-components/sharing-dialog/sharing-management-form-component.tsx
+++ b/services/workbench2/src/views-components/sharing-dialog/sharing-management-form-component.tsx
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import React from 'react';
-import { Grid, StyleRulesCallback, Divider, IconButton, Typography } from '@material-ui/core';
+import { Grid, StyleRulesCallback, Divider, IconButton, Typography, Tooltip } from '@material-ui/core';
 import {
     Field,
     WrappedFieldProps,
@@ -52,9 +52,16 @@ const PermissionManagementRow = withStyles(permissionManagementRowStyles)(
     ({ field, index, fields, classes, onSave }: { field: string, index: number, fields: FieldArrayFieldsProps<{ email: string }>, onSave: () => void; } & WithStyles<'root'>) =>
         <>
             <Grid container alignItems='center' spacing={8} wrap='nowrap' className={classes.root}>
-                <Grid item xs={8}>
+                <Grid item xs={7}>
                     <Typography noWrap variant='subtitle1'>{fields.get(index).email}</Typography>
                 </Grid>
+                <Grid item xs={1} container wrap='nowrap'>
+                    <Tooltip title='Remove access'>
+                        <IconButton onClick={() => { fields.remove(index); onSave(); }}>
+                            <CloseIcon />
+                        </IconButton>
+                    </Tooltip>
+                </Grid>
                 <Grid item xs={4} container wrap='nowrap'>
                     <Field
                         name={`${field}.permissions` as string}
@@ -63,9 +70,7 @@ const PermissionManagementRow = withStyles(permissionManagementRowStyles)(
                         parse={parsePermissionLevel}
                         onChange={onSave}
                     />
-                    <IconButton onClick={() => { fields.remove(index); onSave(); }}>
-                        <CloseIcon />
-                    </IconButton>
+                    
                 </Grid>
             </Grid>
             <Divider />

diff --git a/services/workbench2/src/views-components/sharing-dialog/sharing-public-access-form-component.tsx b/services/workbench2/src/views-components/sharing-dialog/sharing-public-access-form-component.tsx
index 5fc3f4e38ecce5a0ac7adb24568ea16b5e956e2e..161cff58c7d269f6b0ad14219984228348a459f1 100644 (file)
--- a/services/workbench2/src/views-components/sharing-dialog/sharing-public-access-form-component.tsx
+++ b/services/workbench2/src/views-components/sharing-dialog/sharing-public-access-form-component.tsx
@@ -29,13 +29,13 @@ const SharingPublicAccessForm = withStyles(sharingPublicAccessStyles)(
     ({ classes, visibility, includePublic, onSave }: WithStyles<'root' | 'heading'> & AccessProps) =>
         <>
             <Typography className={classes.heading}>General access</Typography>
-            <Grid container alignItems='center' spacing={8} className={classes.root}>
+            <Grid container alignItems='center' className={classes.root}>
                 <Grid item xs={8}>
                     <Typography variant='subtitle1'>
                         {renderVisibilityInfo(visibility)}
                     </Typography>
                 </Grid>
-                <Grid item xs={4} container wrap='nowrap'>
+                <Grid item xs={4} wrap='nowrap'>
                     <Field<{ includePublic: boolean }> name='visibility' component={VisibilityLevelSelectComponent} includePublic={includePublic} onChange={onSave} />
                 </Grid>
             </Grid>

diff --git a/services/workbench2/src/views-components/sharing-dialog/visibility-level-select.tsx b/services/workbench2/src/views-components/sharing-dialog/visibility-level-select.tsx
index 4f12e3eacd203b6ece64a848abcd0d36a8da6746..b90bc79c9da930c0a9f6fec68248d5dfd434d920 100644 (file)
--- a/services/workbench2/src/views-components/sharing-dialog/visibility-level-select.tsx
+++ b/services/workbench2/src/views-components/sharing-dialog/visibility-level-select.tsx
@@ -17,7 +17,6 @@ type VisibilityLevelSelectClasses = 'root';
 
 const VisibilityLevelSelectStyles: StyleRulesCallback<VisibilityLevelSelectClasses> = theme => ({
     root: {
-        marginLeft: theme.spacing.unit,
     }
 });
 export const VisibilityLevelSelect = withStyles(VisibilityLevelSelectStyles)(