From f6cdf630d0475ac93c49b1c3da5902a945b3cb98 Mon Sep 17 00:00:00 2001
From: adeelehsan <adeel.ehsan@arbisoft.com>
Date: Mon, 1 Mar 2021 12:45:52 +0500
Subject: [PATCH] Fixed syncing of registration and field errors

VAN-376
---
 src/register/RegistrationPage.jsx            | 35 +++++++++++++++-----
 src/register/tests/RegistrationPage.test.jsx | 12 +++++++
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/register/RegistrationPage.jsx b/src/register/RegistrationPage.jsx
index 3fc92875..9d888f4f 100644
--- a/src/register/RegistrationPage.jsx
+++ b/src/register/RegistrationPage.jsx
@@ -68,6 +68,7 @@ class RegistrationPage extends React.Component {
       formValid: false,
       updateFieldErrors: false,
       updateAlertErrors: false,
+      registrationErrorsUpdated: false,
     };
   }
 
@@ -106,9 +107,19 @@ class RegistrationPage extends React.Component {
     if (this.props.registrationError !== nextProps.registrationError) {
       this.setState({
         formValid: false,
+        registrationErrorsUpdated: true,
       });
       return false;
     }
+
+    if (this.state.registrationErrorsUpdated && this.props.registrationError === nextProps.registrationError) {
+      this.setState({
+        formValid: false,
+        registrationErrorsUpdated: false,
+      });
+      return false;
+    }
+
     return true;
   }
 
@@ -166,7 +177,7 @@ class RegistrationPage extends React.Component {
     let finalValidation = this.state.formValid;
     if (!this.state.formValid) {
       Object.keys(payload).forEach(key => {
-        finalValidation = this.validateInput(key, payload[key]);
+        finalValidation = this.validateInput(key, payload[key], payload);
       });
     }
     // Since optional fields are not validated we can add it to payload after required fields
@@ -216,11 +227,13 @@ class RegistrationPage extends React.Component {
   }
 
   handleOnChange(e) {
-    this.setState({
-      [e.target.name]: e.target.value,
-      updateFieldErrors: false,
-      updateAlertErrors: false,
-    });
+    if (!(e.target.name === 'username' && e.target.value.length > 30)) {
+      this.setState({
+        [e.target.name]: e.target.value,
+        updateFieldErrors: false,
+        updateAlertErrors: false,
+      });
+    }
   }
 
   handleOnOptional(e) {
@@ -276,7 +289,7 @@ class RegistrationPage extends React.Component {
       case 'username':
         if (value.length < 1) {
           errors.username = intl.formatMessage(messages['username.validation.message']);
-        } else if (value.length <= 1) {
+        } else if (value.length <= 1 || value.length > 30) {
           errors.username = intl.formatMessage(messages['username.ratelimit.less.chars.message']);
         } else if (!value.match(/^[a-zA-Z0-9_-]*$/i)) {
           errors.username = intl.formatMessage(messages['username.format.validation.message']);
@@ -344,23 +357,27 @@ class RegistrationPage extends React.Component {
       validationAlertMessages,
     } = this.state;
     Object.entries(errors).map(([key, value]) => {
-      validationAlertMessages[key][0].user_message = value;
+      if (validationAlertMessages[key]) {
+        validationAlertMessages[key][0].user_message = value;
+      }
       return validationAlertMessages;
     });
   }
 
   renderErrors() {
     let errorsObject = null;
+    let { registrationErrorsUpdated } = this.state;
     const {
       updateAlertErrors,
       updateFieldErrors,
       validationAlertMessages,
     } = this.state;
     const { registrationError, submitState } = this.props;
-    if (registrationError) {
+    if (registrationError && registrationErrorsUpdated) {
       if (updateFieldErrors && submitState !== PENDING_STATE) {
         this.updateFieldErrors(registrationError);
       }
+      registrationErrorsUpdated = false;
       errorsObject = registrationError;
     } else {
       if (updateAlertErrors && submitState !== PENDING_STATE) {
diff --git a/src/register/tests/RegistrationPage.test.jsx b/src/register/tests/RegistrationPage.test.jsx
index ae4fcc98..819336eb 100644
--- a/src/register/tests/RegistrationPage.test.jsx
+++ b/src/register/tests/RegistrationPage.test.jsx
@@ -44,6 +44,7 @@ describe('RegistrationPageTests', () => {
         finishAuthUrl: null,
         providers: [],
         secondaryProviders: [],
+        pipelineUserDetails: null,
       },
     },
   };
@@ -301,8 +302,19 @@ describe('RegistrationPageTests', () => {
       },
     });
 
+    const nextProps = {
+      validations: null,
+      thirdPartyAuthContext: {
+        pipelineUserDetails: null,
+      },
+      registrationError: {
+        username: [{ username: errors.username }],
+      },
+    };
+
     const registrationPage = mount(reduxWrapper(<IntlRegistrationPage {...props} />));
     registrationPage.find('button.btn-brand').simulate('click');
+    registrationPage.find('RegistrationPage').instance().shouldComponentUpdate(nextProps);
     expect(registrationPage.find('#email-invalid-feedback').text()).toEqual(errors.email);
     expect(registrationPage.find('#username-invalid-feedback').text()).toEqual(errors.username);
     expect(registrationPage.find('#validation-errors').first().text()).toEqual(