[ARVADOS-WORKBENCH2] updated: 1.2.0-753-g1c729da
Git user
git at public.curoverse.com
Sun Oct 28 19:03:40 EDT 2018
Summary of changes:
.../sharing-dialog/sharing-management-form-component.tsx | 12 ++++++++----
.../sharing-public-access-form-component.tsx | 14 ++++++--------
2 files changed, 14 insertions(+), 12 deletions(-)
via 1c729da03cf3aadfbe3efce2b9e47ea5eb2c9d92 (commit)
from fbbda4cdc95898465b9d74c1761ee2817ef01b70 (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 1c729da03cf3aadfbe3efce2b9e47ea5eb2c9d92
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Mon Oct 29 00:03:24 2018 +0100
Improve layouts of sharing dialog
Feature #14365
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
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 688f416..51e69f8 100644
--- a/src/views-components/sharing-dialog/sharing-management-form-component.tsx
+++ b/src/views-components/sharing-dialog/sharing-management-form-component.tsx
@@ -3,11 +3,12 @@
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
-import { Grid, StyleRulesCallback, Divider } from '@material-ui/core';
+import { Grid, StyleRulesCallback, Divider, IconButton, Typography } from '@material-ui/core';
import { Field, WrappedFieldProps, WrappedFieldArrayProps, FieldArray, FieldsProps } from 'redux-form';
import { PermissionSelect } from './permission-select';
import { WithStyles } from '@material-ui/core/styles';
import withStyles from '@material-ui/core/styles/withStyles';
+import { CloseIcon } from '~/components/icon/icon';
export default () =>
@@ -31,12 +32,15 @@ const PermissionManagementRow = withStyles(permissionManagementRowStyles)(
({ field, index, fields, classes }: { field: string, index: number, fields: FieldsProps<{ email: string }> } & WithStyles<'root'>) =>
<>
<Divider />
- <Grid container alignItems='center' spacing={8} className={classes.root}>
+ <Grid container alignItems='center' spacing={8} wrap='nowrap' className={classes.root}>
<Grid item xs={8}>
- {fields.get(index).email}
+ <Typography noWrap variant='subheading'>{fields.get(index).email}</Typography>
</Grid>
- <Grid item xs={4}>
+ <Grid item xs={4} container wrap='nowrap'>
<Field name={`${field}.permissions`} component={PermissionSelectComponent} />
+ <IconButton onClick={() => fields.remove(index)}>
+ <CloseIcon />
+ </IconButton>
</Grid>
</Grid>
</>
diff --git a/src/views-components/sharing-dialog/sharing-public-access-form-component.tsx b/src/views-components/sharing-dialog/sharing-public-access-form-component.tsx
index bb902d5..b931cac 100644
--- a/src/views-components/sharing-dialog/sharing-public-access-form-component.tsx
+++ b/src/views-components/sharing-dialog/sharing-public-access-form-component.tsx
@@ -3,7 +3,7 @@
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
-import { Grid, StyleRulesCallback, Divider, Switch } from '@material-ui/core';
+import { Grid, StyleRulesCallback, Divider, Switch, Typography } from '@material-ui/core';
import { Field, WrappedFieldProps, formValues, formValueSelector } from 'redux-form';
import { PermissionSelect } from './permission-select';
import { WithStyles } from '@material-ui/core/styles';
@@ -21,14 +21,12 @@ const SharingPublicAccessForm = withStyles(sharingPublicAccessStyles)(
<>
<Divider />
<Grid container alignItems='center' spacing={8} className={classes.root}>
- <Grid item xs={6}>
- Public access
+ <Grid item xs={8}>
+ <Typography variant='subheading'>Public access</Typography>
</Grid>
- <Grid item xs={2}>
- <Field name='enabled' component={PublicAccessSwitch} />
- </Grid>
- <Grid item xs={4}>
+ <Grid item xs={4} container wrap='nowrap'>
<Field name='permissions' component={PermissionSelectComponent} />
+ <Field name='enabled' component={PublicAccessSwitch} />
</Grid>
</Grid>
</>
@@ -41,7 +39,7 @@ const PublicAccessSwitch = (props: WrappedFieldProps) =>
const publicAccessSwitchStyles: StyleRulesCallback<'root'> = theme => ({
root: {
- margin: `-${theme.spacing.unit * 2}px auto`,
+ margin: `0 -7px`,
}
});
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list