Create visibility level select

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

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 6f70c2df876ba43bebfc394a0be29202768fd68c..5f57a927d68b33d5f330e62b10982a3f31609b2a 100644 (file)
--- 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,16 +3,15 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from 'react';
-import { Grid, StyleRulesCallback, Divider, Switch, Typography } from '@material-ui/core';
-import { Field, WrappedFieldProps, formValues, formValueSelector } from 'redux-form';
-import { PermissionSelect, formatPermissionLevel, parsePermissionLevel } from './permission-select';
+import { Grid, StyleRulesCallback, Divider, Typography } from '@material-ui/core';
+import { Field, WrappedFieldProps } from 'redux-form';
 import { WithStyles } from '@material-ui/core/styles';
 import withStyles from '@material-ui/core/styles/withStyles';
-import { connect } from 'react-redux';
+import { VisibilityLevelSelect } from './visibility-level-select';
 
 const sharingPublicAccessStyles: StyleRulesCallback<'root'> = theme => ({
     root: {
-        padding: `${theme.spacing.unit}px 0`,
+        padding: `${theme.spacing.unit * 2}px 0`,
     }
 });
 
@@ -22,16 +21,10 @@ const SharingPublicAccessForm = withStyles(sharingPublicAccessStyles)(
             <Divider />
             <Grid container alignItems='center' spacing={8} className={classes.root}>
                 <Grid item xs={8}>
-                    <Typography variant='subheading'>Public access</Typography>
+                    <Typography variant='subheading'>Public visibility</Typography>
                 </Grid>
                 <Grid item xs={4} container wrap='nowrap'>
-                    <Field
-                        name='permissions'
-                        component={PermissionSelectComponent}
-                        format={formatPermissionLevel}
-                        parse={parsePermissionLevel}
-                    />
-                    <Field name='enabled' component={PublicAccessSwitch} />
+                    <Field name='visibility' component={VisibilityLevelSelectComponent} />
                 </Grid>
             </Grid>
         </>
@@ -39,24 +32,5 @@ const SharingPublicAccessForm = withStyles(sharingPublicAccessStyles)(
 
 export default () => <SharingPublicAccessForm />;
 
-const PublicAccessSwitch = (props: WrappedFieldProps) =>
-    <PublicAccessSwitchComponent {...props} />;
-
-const publicAccessSwitchStyles: StyleRulesCallback<'root'> = theme => ({
-    root: {
-        margin: `0 -7px`,
-    }
-});
-
-const PublicAccessSwitchComponent = withStyles(publicAccessSwitchStyles)(
-    ({ input, classes }: WrappedFieldProps & WithStyles<'root'>) =>
-        <Switch checked={input.value} onChange={input.onChange} color='primary' classes={classes} />
-);
-
-const PermissionSelectComponent = connect(
-    (state: any, props: WrappedFieldProps) => ({
-        disabled: !formValueSelector(props.meta.form)(state, 'enabled'),
-    })
-)(({ input, disabled }: WrappedFieldProps & { disabled: boolean }) => {
-    return <PermissionSelect disabled={disabled} fullWidth disableUnderline {...input} />;
-});
+const VisibilityLevelSelectComponent = ({ input }: WrappedFieldProps) =>
+    <VisibilityLevelSelect fullWidth disableUnderline {...input} />;