Improve profile editor

app/gabsocial/features/edit_profile/index.js

@@ -9,6 +9,7 @@ import {
   SimpleForm,
   FieldsGroup,
   TextInput,
+  Checkbox,
 } from 'gabsocial/features/forms';
 import { patchMe } from 'gabsocial/actions/me';
 
@@ -33,21 +34,27 @@ class EditProfile extends ImmutablePureComponent {
     account: ImmutablePropTypes.map,
   };
 
-  constructor(props) {
+  state = {
-    super(props);
+    isLoading: false,
-    this.state = { isLoading: false };
   }
 
-  getFormData = (form) => {
+  getParams = () => {
-    return Object.fromEntries(
+    const { state } = this;
-      new FormData(form).entries()
+    return {
-    );
+      discoverable: state.discoverable,
+      bot: state.bot,
+      display_name: state.display_name,
+      note: state.note,
+      // avatar: state.avatar,
+      // header: state.header,
+      locked: state.locked,
+      fields_attributes: state.fields_attributes,
+    };
   }
 
   handleSubmit = (event) => {
     const { dispatch } = this.props;
-    const formData = this.getFormData(event.target);
+    dispatch(patchMe(this.getParams())).then(() => {
-    dispatch(patchMe(formData)).then(() => {
       this.setState({ isLoading: false });
     }).catch((error) => {
       this.setState({ isLoading: false });
@@ -56,8 +63,21 @@ class EditProfile extends ImmutablePureComponent {
     event.preventDefault();
   }
 
+  componentWillMount() {
+    const { account } = this.props;
+    this.setState(account.toJS());
+  }
+
+  handleCheckboxChange = e => {
+    this.setState({ [e.target.name]: e.target.checked });
+  }
+
+  handleTextChange = e => {
+    this.setState({ [e.target.name]: e.target.value });
+  }
+
   render() {
-    const { account, intl } = this.props;
+    const { intl } = this.props;
 
     return (
       <Column icon='users' heading={intl.formatMessage(messages.heading)} backBtnSlim>
@@ -67,12 +87,29 @@ class EditProfile extends ImmutablePureComponent {
               <TextInput
                 label='Display name'
                 name='display_name'
-                defaultValue={account.get('display_name')}
+                value={this.state.display_name}
+                maxLength={30}
+                onChange={this.handleTextChange}
               />
               <TextInput
                 label='Bio'
                 name='note'
-                defaultValue={account.get('bio')}
+                value={this.state.note}
+                onChange={this.handleTextChange}
+              />
+              <Checkbox
+                label='Lock account'
+                hint='Requires you to manually approve followers'
+                name='locked'
+                checked={this.state.locked}
+                onChange={this.handleCheckboxChange}
+              />
+              <Checkbox
+                label='This is a bot account'
+                hint='This account mainly performs automated actions and might not be monitored'
+                name='bot'
+                checked={this.state.bot}
+                onChange={this.handleCheckboxChange}
               />
             </FieldsGroup>
           </fieldset>

app/gabsocial/features/forms/index.js

@@ -48,6 +48,7 @@ export class Checkbox extends ImmutablePureComponent {
 
   static propTypes = {
     label: PropTypes.string,
+    name: PropTypes.string,
     checked: PropTypes.bool,
     onChange: PropTypes.func,
   }
@@ -57,7 +58,7 @@ export class Checkbox extends ImmutablePureComponent {
   }
 
   render() {
-    const { label, checked, onChange } = this.props;
+    const { label, name, checked, onChange } = this.props;
     const id = uuidv4();
 
     return (
@@ -70,6 +71,7 @@ export class Checkbox extends ImmutablePureComponent {
             <label className='checkbox'>
               <input
                 id={id}
+                name={name}
                 className='boolean optional'
                 type='checkbox'
                 checked={checked}
@@ -189,27 +191,25 @@ export class TextInput extends ImmutablePureComponent {
 
   static propTypes = {
     label: PropTypes.string,
-    name: PropTypes.string,
-    defaultValue: PropTypes.string,
     maxLength: PropTypes.number,
   }
 
   render() {
-    const { label, name, defaultValue, maxLength } = this.props;
+    const { label, maxLength, ...props } = this.props;
+    const id = uuidv4();
 
     return (
       <div className='input with_label string optional'>
         <div className='label_input'>
-          <label className='string optional' htmlFor={name}>{label}</label>
+          <label className='string optional' htmlFor={id}>{label}</label>
           <div className='label_input__wrapper'>
             <input
               maxlength={maxLength}
               className='string optional'
               size={maxLength}
               type='text'
-              defaultValue={defaultValue}
+              id={id}
-              name={name}
+              {...props}
-              id={name}
             />
           </div>
         </div>