16115: UI consistency between tabs. Removes unnecessary code splitting.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima@curii.com>

diff --git a/src/views-components/sharing-dialog/sharing-dialog-component.tsx b/src/views-components/sharing-dialog/sharing-dialog-component.tsx
index eca6dc2c3c068ac0001acd33a4cf6338d3db8b0c..4ff9150b10c49d24b1c75a12d17159fb1f0b7d23 100644 (file)
--- a/src/views-components/sharing-dialog/sharing-dialog-component.tsx
+++ b/src/views-components/sharing-dialog/sharing-dialog-component.tsx
@@ -20,13 +20,13 @@ import {
     withStyles
 } from '@material-ui/core/styles';
 import { DialogActions } from 'components/dialog-actions/dialog-actions';
-import { SharingDialogContent } from './sharing-dialog-content';
 import { SharingURLsContent } from './sharing-urls';
 import {
     extractUuidObjectType,
     ResourceObjectType
 } from 'models/resource';
 import { SharingInvitationForm } from './sharing-invitation-form';
+import { SharingManagementForm } from './sharing-management-form';
 
 export interface SharingDialogDataProps {
     open: boolean;
@@ -72,7 +72,11 @@ export default (props: SharingDialogDataProps & SharingDialogActionProps) => {
         }
         <DialogContent>
             { tabNr === SharingDialogTab.PERMISSIONS &&
-            <SharingDialogContent />
+            <Grid container direction='column' spacing={24}>
+              <Grid item>
+                  <SharingManagementForm />
+              </Grid>
+            </Grid>
             }
             { tabNr === SharingDialogTab.URLS &&
             <SharingURLsContent uuid={sharedResourceUuid} />
@@ -84,6 +88,7 @@ export default (props: SharingDialogDataProps & SharingDialogActionProps) => {
                 <Grid item md={12}>
                     <SharingInvitationForm />
                 </Grid> }
+                <Grid item xs />
                 { tabNr === SharingDialogTab.URLS &&
                 <Grid item>
                     <Button
@@ -94,7 +99,6 @@ export default (props: SharingDialogDataProps & SharingDialogActionProps) => {
                     </Button>
                 </Grid>
                 }
-                <Grid item xs />
                 { tabNr === SharingDialogTab.PERMISSIONS &&
                 <Grid item>
                     <Button
@@ -102,7 +106,7 @@ export default (props: SharingDialogDataProps & SharingDialogActionProps) => {
                         color='primary'
                         onClick={onSave}
                         disabled={!saveEnabled}>
-                        Save
+                        Save changes
                     </Button>
                 </Grid>
                 }

diff --git a/src/views-components/sharing-dialog/sharing-dialog-content.tsx b/src/views-components/sharing-dialog/sharing-dialog-content.tsx
deleted file mode 100644 (file)
index ee1ccf8..0000000
--- a/src/views-components/sharing-dialog/sharing-dialog-content.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: AGPL-3.0
-
-import React from 'react';
-import { Grid } from '@material-ui/core';
-
-import { SharingManagementForm } from './sharing-management-form';
-
-export const SharingDialogContent = () =>
-    <Grid container direction='column' spacing={24}>
-        <Grid item>
-            <SharingManagementForm />
-        </Grid>
-    </Grid>;

diff --git a/src/views-components/sharing-dialog/sharing-management-form-component.tsx b/src/views-components/sharing-dialog/sharing-management-form-component.tsx
index 9c3b640362fc02b9bfaf500b1ee4d985fd926979..2ebf8c2d8c806aff8fccfccf034682b627c56c8a 100644 (file)
--- a/src/views-components/sharing-dialog/sharing-management-form-component.tsx
+++ b/src/views-components/sharing-dialog/sharing-management-form-component.tsx
@@ -23,8 +23,10 @@ export default () =>
 const SharingManagementFieldArray = ({ fields }: WrappedFieldArrayProps<{ email: string }>) =>
     <div>
         {
-            fields.map((field, index, fields) =>
+        fields.length > 0
+        ? fields.map((field, index, fields) =>
                 <PermissionManagementRow key={field} {...{ field, index, fields }} />)
+        : <Typography>No permissions set</Typography>
         }
         <Divider />
     </div>;