updated user profile form

Author: guardofparadise

src/components/Users/form/UsersForm.js

@@ -70,15 +70,18 @@ class UsersForm extends Component {
 
                 { this.props.currentUser && this.props.currentUser.role === 'admin' && !this.props.isProfile &&
                   <>
-                    <RadioFormItem
-                      name={'role'}
-                      schema={usersFields}
-                    />
-
-                    <SwitchFormItem
-                      name={'disabled'}
-                      schema={usersFields}
-                    />
+                    {this.props.isProfile ? null : (
+                      <>
+                        <SwitchFormItem
+                          name={'disabled'}
+                          schema={usersFields}
+                        />
+                        <RadioFormItem
+                          name={'role'}
+                          schema={usersFields}
+                        />
+                      </>
+                    )}
                   </>
                 }
 

src/components/Users/form/UsersFormPage.js

@@ -43,6 +43,11 @@ class UsersFormPage extends Component {
 
   isProfile = () => {
     const { match } = this.props;
+    const currentUser = JSON.parse(localStorage.getItem('user'));
+    const currentUserId = currentUser.user.id;
+    if (match.params.id === currentUserId) {
+      return true
+    }
     return match.url === '/app/profile';
   };