20306: Reworked dialog layout to hopefully be less confusing

[arvados-workbench2.git] / src / views-components / sharing-dialog / sharing-dialog-component.tsx

diff --git a/src/views-components/sharing-dialog/sharing-dialog-component.tsx b/src/views-components/sharing-dialog/sharing-dialog-component.tsx
index 089eee8d9683d82a0e2340be5deae3abb6f04204..aeb54f567e0aa6c1f80d32965971c12f55c893ae 100644 (file)
--- a/src/views-components/sharing-dialog/sharing-dialog-component.tsx
+++ b/src/views-components/sharing-dialog/sharing-dialog-component.tsx
@@ -113,11 +113,14 @@ export default (props: SharingDialogComponentProps) => {
             {tabNr === SharingDialogTab.PERMISSIONS &&
                 <Grid container direction='column' spacing={24}>
                     <Grid item>
-                        <SharingPublicAccessForm onSave={onSave} />
+                        <SharingInvitationForm onSave={onSave} saveEnabled={saveEnabled} />
                     </Grid>
                     <Grid item>
                         <SharingManagementForm onSave={onSave} />
                     </Grid>
+                    <Grid item>
+                        <SharingPublicAccessForm onSave={onSave} />
+                    </Grid>
                 </Grid>
             }
             {tabNr === SharingDialogTab.URLS &&
@@ -126,11 +129,6 @@ export default (props: SharingDialogComponentProps) => {
         </DialogContent>
         <DialogActions>
             <Grid container spacing={8}>
-                {tabNr === SharingDialogTab.PERMISSIONS &&
-                    <Grid item md={12}>
-                        <SharingInvitationForm onSave={onSave} saveEnabled={saveEnabled} />
-                    </Grid>
-                }
                 {tabNr === SharingDialogTab.URLS && withExpiration && <>
                     <Grid item container direction='row' md={12}>
                         <MuiPickersUtilsProvider utils={DateFnsUtils}>