Add username to user

client/src/components/UserPopup/EditEmailStep.jsx

@@ -16,12 +16,12 @@ const createMessage = (error) => {
   }
 
   switch (error.message) {
-    case 'User is already exist':
+    case 'Email already in use':
       return {
         type: 'error',
-        content: 'common.userIsAlreadyExist',
+        content: 'common.emailAlreadyInUse',
       };
-    case 'Current password is not valid':
+    case 'Invalid current password':
       return {
         type: 'error',
         content: 'common.invalidCurrentPassword',
@@ -83,11 +83,11 @@ const EditEmailStep = React.memo(
       if (wasSubmitting && !isSubmitting) {
         if (error) {
           switch (error.message) {
-            case 'User is already exist':
+            case 'Email already in use':
               emailField.current.select();
 
               break;
-            case 'Current password is not valid':
+            case 'Invalid current password':
               setData((prevData) => ({
                 ...prevData,
                 currentPassword: '',

client/src/components/UserPopup/EditPasswordStep.jsx

@@ -15,7 +15,7 @@ const createMessage = (error) => {
   }
 
   switch (error.message) {
-    case 'Current password is not valid':
+    case 'Invalid current password':
       return {
         type: 'error',
         content: 'common.invalidCurrentPassword',
@@ -67,7 +67,7 @@ const EditPasswordStep = React.memo(
       if (wasSubmitting && !isSubmitting) {
         if (!error) {
           onClose();
-        } else if (error.message === 'Current password is not valid') {
+        } else if (error.message === 'Invalid current password') {
           setData((prevData) => ({
             ...prevData,
             currentPassword: '',

client/src/components/UserPopup/EditUsernameStep.jsx

@@ -0,0 +1,182 @@
+import React, { useCallback, useEffect, useMemo, useRef } from 'react';
+import PropTypes from 'prop-types';
+import { useTranslation } from 'react-i18next';
+import { Button, Form, Message } from 'semantic-ui-react';
+import { useDidUpdate, usePrevious, useToggle } from '../../lib/hooks';
+import { Input, Popup } from '../../lib/custom-ui';
+
+import { useForm } from '../../hooks';
+import { isUsername } from '../../utils/validator';
+
+import styles from './EditUsernameStep.module.css';
+
+const createMessage = (error) => {
+  if (!error) {
+    return error;
+  }
+
+  switch (error.message) {
+    case 'Username already in use':
+      return {
+        type: 'error',
+        content: 'common.usernameAlreadyInUse',
+      };
+    case 'Invalid current password':
+      return {
+        type: 'error',
+        content: 'common.invalidCurrentPassword',
+      };
+    default:
+      return {
+        type: 'warning',
+        content: 'common.unknownError',
+      };
+  }
+};
+
+const EditUsernameStep = React.memo(
+  ({ defaultData, username, isSubmitting, error, onUpdate, onMessageDismiss, onBack, onClose }) => {
+    const [t] = useTranslation();
+    const wasSubmitting = usePrevious(isSubmitting);
+
+    const [data, handleFieldChange, setData] = useForm({
+      username: '',
+      currentPassword: '',
+      ...defaultData,
+    });
+
+    const message = useMemo(() => createMessage(error), [error]);
+    const [focusCurrentPasswordFieldState, focusCurrentPasswordField] = useToggle();
+
+    const usernameField = useRef(null);
+    const currentPasswordField = useRef(null);
+
+    const handleSubmit = useCallback(() => {
+      const cleanData = {
+        ...data,
+        username: data.username.trim() || null,
+      };
+
+      if (cleanData.username && !isUsername(cleanData.username)) {
+        usernameField.current.select();
+        return;
+      }
+
+      if (cleanData.username === username) {
+        onClose();
+        return;
+      }
+
+      if (!cleanData.currentPassword) {
+        currentPasswordField.current.focus();
+        return;
+      }
+
+      onUpdate(cleanData);
+    }, [username, onUpdate, onClose, data]);
+
+    useEffect(() => {
+      usernameField.current.select();
+    }, []);
+
+    useEffect(() => {
+      if (wasSubmitting && !isSubmitting) {
+        if (error) {
+          switch (error.message) {
+            case 'Username already in use':
+              usernameField.current.select();
+
+              break;
+            case 'Invalid current password':
+              setData((prevData) => ({
+                ...prevData,
+                currentPassword: '',
+              }));
+              focusCurrentPasswordField();
+
+              break;
+            default:
+          }
+        } else {
+          onClose();
+        }
+      }
+    }, [isSubmitting, wasSubmitting, error, onClose, setData, focusCurrentPasswordField]);
+
+    useDidUpdate(() => {
+      currentPasswordField.current.focus();
+    }, [focusCurrentPasswordFieldState]);
+
+    return (
+      <>
+        <Popup.Header onBack={onBack}>
+          {t('common.editUsername', {
+            context: 'title',
+          })}
+        </Popup.Header>
+        <Popup.Content>
+          {message && (
+            <Message
+              // eslint-disable-next-line react/jsx-props-no-spreading
+              {...{
+                [message.type]: true,
+              }}
+              visible
+              content={t(message.content)}
+              onDismiss={onMessageDismiss}
+            />
+          )}
+          <Form onSubmit={handleSubmit}>
+            <div className={styles.text}>{t('common.newUsername')}</div>
+            <Input
+              fluid
+              ref={usernameField}
+              name="username"
+              value={data.username}
+              placeholder={username}
+              className={styles.field}
+              onChange={handleFieldChange}
+            />
+            {data.username.trim() !== (username || '') && (
+              <>
+                <div className={styles.text}>{t('common.currentPassword')}</div>
+                <Input.Password
+                  fluid
+                  ref={currentPasswordField}
+                  name="currentPassword"
+                  value={data.currentPassword}
+                  className={styles.field}
+                  onChange={handleFieldChange}
+                />
+              </>
+            )}
+            <Button
+              positive
+              content={t('action.save')}
+              loading={isSubmitting}
+              disabled={isSubmitting}
+            />
+          </Form>
+        </Popup.Content>
+      </>
+    );
+  },
+);
+
+EditUsernameStep.propTypes = {
+  defaultData: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
+  username: PropTypes.string,
+  isSubmitting: PropTypes.bool.isRequired,
+  error: PropTypes.object, // eslint-disable-line react/forbid-prop-types
+  onUpdate: PropTypes.func.isRequired,
+  onMessageDismiss: PropTypes.func.isRequired,
+  onBack: PropTypes.func.isRequired,
+  onClose: PropTypes.func.isRequired,
+};
+
+EditUsernameStep.defaultProps = {
+  username: undefined,
+  error: undefined,
+};
+
+export default EditUsernameStep;

client/src/components/UserPopup/EditUsernameStep.module.css

@@ -0,0 +1,10 @@
+.field {
+  margin-bottom: 8px;
+}
+
+.text {
+  color: #444444;
+  font-size: 12px;
+  font-weight: bold;
+  padding-bottom: 6px;
+}

client/src/components/UserPopup/UserPopup.jsx

@@ -7,6 +7,7 @@ import { Popup } from '../../lib/custom-ui';
 
 import { useSteps } from '../../hooks';
 import EditNameStep from './EditNameStep';
+import EditUsernameStep from './EditUsernameStep';
 import EditAvatarStep from './EditAvatarStep';
 import EditEmailStep from './EditEmailStep';
 import EditPasswordStep from './EditPasswordStep';
@@ -15,6 +16,7 @@ import styles from './UserPopup.module.css';
 
 const StepTypes = {
   EDIT_NAME: 'EDIT_NAME',
+  EDIT_USERNAME: 'EDIT_USERNAME',
   EDIT_AVATAR: 'EDIT_AVATAR',
   EDIT_EMAIL: 'EDIT_EMAIL',
   EDIT_PASSWORD: 'EDIT_PASSWORD',
@@ -24,12 +26,16 @@ const UserStep = React.memo(
   ({
     email,
     name,
+    username,
     avatar,
     isAvatarUploading,
+    usernameUpdateForm,
     emailUpdateForm,
     passwordUpdateForm,
     onUpdate,
     onAvatarUpload,
+    onUsernameUpdate,
+    onUsernameUpdateMessageDismiss,
     onEmailUpdate,
     onEmailUpdateMessageDismiss,
     onPasswordUpdate,
@@ -48,6 +54,10 @@ const UserStep = React.memo(
       openStep(StepTypes.EDIT_AVATAR);
     }, [openStep]);
 
+    const handleUsernameEditClick = useCallback(() => {
+      openStep(StepTypes.EDIT_USERNAME);
+    }, [openStep]);
+
     const handleEmailEditClick = useCallback(() => {
       openStep(StepTypes.EDIT_EMAIL);
     }, [openStep]);
@@ -93,6 +103,19 @@ const UserStep = React.memo(
               onBack={handleBack}
             />
           );
+        case StepTypes.EDIT_USERNAME:
+          return (
+            <EditUsernameStep
+              defaultData={usernameUpdateForm.data}
+              username={username}
+              isSubmitting={usernameUpdateForm.isSubmitting}
+              error={usernameUpdateForm.error}
+              onUpdate={onUsernameUpdate}
+              onMessageDismiss={onUsernameUpdateMessageDismiss}
+              onBack={handleBack}
+              onClose={onClose}
+            />
+          );
         case StepTypes.EDIT_EMAIL:
           return (
             <EditEmailStep
@@ -124,7 +147,11 @@ const UserStep = React.memo(
 
     return (
       <>
-        <Popup.Header>{name}</Popup.Header>
+        <Popup.Header>
+          {t('common.userActions', {
+            context: 'title',
+          })}
+        </Popup.Header>
         <Popup.Content>
           <Menu secondary vertical className={styles.menu}>
             <Menu.Item className={styles.menuItem} onClick={handleNameEditClick}>
@@ -137,6 +164,11 @@ const UserStep = React.memo(
                 context: 'title',
               })}
             </Menu.Item>
+            <Menu.Item className={styles.menuItem} onClick={handleUsernameEditClick}>
+              {t('action.editUsername', {
+                context: 'title',
+              })}
+            </Menu.Item>
             <Menu.Item className={styles.menuItem} onClick={handleEmailEditClick}>
               {t('action.editEmail', {
                 context: 'title',
@@ -162,14 +194,18 @@ const UserStep = React.memo(
 UserStep.propTypes = {
   email: PropTypes.string.isRequired,
   name: PropTypes.string.isRequired,
+  username: PropTypes.string,
   avatar: PropTypes.string,
   isAvatarUploading: PropTypes.bool.isRequired,
   /* eslint-disable react/forbid-prop-types */
+  usernameUpdateForm: PropTypes.object.isRequired,
   emailUpdateForm: PropTypes.object.isRequired,
   passwordUpdateForm: PropTypes.object.isRequired,
   /* eslint-enable react/forbid-prop-types */
   onUpdate: PropTypes.func.isRequired,
   onAvatarUpload: PropTypes.func.isRequired,
+  onUsernameUpdate: PropTypes.func.isRequired,
+  onUsernameUpdateMessageDismiss: PropTypes.func.isRequired,
   onEmailUpdate: PropTypes.func.isRequired,
   onEmailUpdateMessageDismiss: PropTypes.func.isRequired,
   onPasswordUpdate: PropTypes.func.isRequired,
@@ -179,6 +215,7 @@ UserStep.propTypes = {
 };
 
 UserStep.defaultProps = {
+  username: undefined,
   avatar: undefined,
 };