[arvados] updated: 2.7.0-6295-g4a1e25b2df
git repository hosting
git at public.arvados.org
Tue Apr 9 18:35:30 UTC 2024
Summary of changes:
.../sharing-dialog/sharing-management-form-component.tsx | 15 ++++++++++-----
.../sharing-public-access-form-component.tsx | 4 ++--
.../sharing-dialog/visibility-level-select.tsx | 1 -
3 files changed, 12 insertions(+), 8 deletions(-)
via 4a1e25b2df1817cb3bfa153076efd1a98ed802ff (commit)
from 91567eb5eed5ae55e941c581697b4ddd53ddacec (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 4a1e25b2df1817cb3bfa153076efd1a98ed802ff
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Tue Apr 9 14:35:24 2024 -0400
21313: moved items so that all rows align properly Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
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 b7ac8ced76..fa3cc46189 100644
--- 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 5fc3f4e38e..161cff58c7 100644
--- 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 4f12e3eacd..b90bc79c9d 100644
--- 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)(
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list