21313: moved save button to bottom of share dialog Arvados-DCO-1.1-Signed-off-by...

diff --git a/services/workbench2/src/views-components/sharing-dialog/sharing-dialog-component.tsx b/services/workbench2/src/views-components/sharing-dialog/sharing-dialog-component.tsx
index 5d646c4658f7a76ee3df96f257c710b6a86695d7..a4800521de8a4187f602bb8fff2ca1069eabb9a9 100644 (file)
--- a/services/workbench2/src/views-components/sharing-dialog/sharing-dialog-component.tsx
+++ b/services/workbench2/src/views-components/sharing-dialog/sharing-dialog-component.tsx
@@ -89,6 +89,7 @@ export default (props: SharingDialogComponentProps) => {
         className="sharing-dialog"
         fullWidth
         maxWidth='sm'
+        disableBackdropClick={saveEnabled}
         >
         <DialogTitle>
             Sharing settings
@@ -178,13 +179,28 @@ export default (props: SharingDialogComponentProps) => {
                 </>
                 }
                 <Grid item>
+                    <Button onClick={() => {
+                            onSave();
+                        }}
+                        disabled={!saveEnabled}
+                        color='primary'
+                        variant='contained'
+                        size='small'
+                        style={{ marginLeft: '10px' }}
+                        >
+                            Save
+                    </Button>
                     <Button onClick={() => {
                         onClose();
                         setWithExpiration(false);
-                    }}
-                    disabled={saveEnabled}
-                    >
-                        Close
+                        }}
+                        disabled={saveEnabled}
+                        color='primary'
+                        variant='contained'
+                        size='small'
+                        style={{ marginLeft: '10px' }}
+                        >
+                            Close
                     </Button>
                 </Grid>
             </Grid>

diff --git a/services/workbench2/src/views-components/sharing-dialog/sharing-invitation-form-component.tsx b/services/workbench2/src/views-components/sharing-dialog/sharing-invitation-form-component.tsx
index 7e1bf3659e3198223d22d29c1c78d4586973115c..ca1a83d9c00f4467fc828646107e5de509e208f3 100644 (file)
--- a/services/workbench2/src/views-components/sharing-dialog/sharing-invitation-form-component.tsx
+++ b/services/workbench2/src/views-components/sharing-dialog/sharing-invitation-form-component.tsx
@@ -48,30 +48,13 @@ const SharingInvitationFormComponent = (props: { onSave: () => void, saveEnabled
 export default SharingInvitationFormComponent;
 
 const StyledSharingInvitationFormComponent = withStyles(styles)(
-    ({ onSave, saveEnabled, classes }: { onSave: () => void, saveEnabled: boolean } & WithStyles<SharingStyles>) =>
+    ({ classes }: { onSave: () => void, saveEnabled: boolean } & WithStyles<SharingStyles>) =>
         <Grid container spacing={8} wrap='nowrap' className={classes.root} >
             <Grid data-cy="invite-people-field" item xs={8}>
                 <InvitedPeopleField />
-                {saveEnabled && 
-                    <Typography 
-                        variant='caption' 
-                        className={classes.shareWarning}
-                        >
-                        You must click &#x1F7A4; to add a participant.
-                    </Typography>}
             </Grid>
             <Grid data-cy="permission-select-field" item xs={4} container wrap='nowrap'>
                 <PermissionSelectField />
-                <IconButton onClick={onSave} disabled={!saveEnabled} color="primary" classes={{
-                    root: classes.addButtonRoot,
-                    colorPrimary: classes.addButtonPrimary,
-                    disabled: classes.addButtonDisabled
-                }}
-                    data-cy='add-invited-people'>
-                    <Tooltip title="Add authorization">
-                        <AddIcon />
-                    </Tooltip>
-                </IconButton>
             </Grid>
         </Grid >);