Merge pull request #3983 from OneCommunityGlobal/venkataramanan_fix_user_validation_errors_in_user_management

Venkataramanan. Update user field validation while create new user in User Management…

Author: one-community

src/components/UserProfile/AddNewUserProfile/UserProfileAdd.jsx

@@ -219,7 +219,7 @@ class UserProfileAdd extends Component {
                         value={lastName}
                         onChange={(e) => this.handleUserProfile(e)}
                         placeholder="Last Name"
-                        invalid={!!(this.state.formSubmitted && this.state.formErrors.lastName)}
+                        invalid={this.state.formSubmitted && (!!this.state.formErrors.lastName || lastName.length < 2)}
                         className={darkMode ? 'bg-darkmode-liblack text-light border-0' : ''}
                       />
                       {this.state.formSubmitted && this.state.formErrors.lastName && (
@@ -747,6 +747,9 @@ class UserProfileAdd extends Component {
       return false;
     } else if (firstLength && lastLength && phone.length >= 9) {
       return true;
+    }  else if (this.state.userProfile.lastName.length < 2) {
+      toast.error('Last Name must be at least 2 characters long');
+      return false;
     } else {
       toast.error('Please fill all the required fields');
       return false;
@@ -894,62 +897,46 @@ class UserProfileAdd extends Component {
             this.props.userCreated();
           })
           .catch(err => {
-            if (err.response?.data?.type) {
-              switch (err.response.data.type) {
+            const res = err.response;
+            const status = res?.status;
+            const data = res?.data || {};
+
+            if (!res) {
+              toast.error(`Network error: ${err.message}`);
+              return;
+            }
+
+            // Handle Mongoose validation error cleanup
+            if (data?.errors && typeof data.errors === 'object') {
+              const firstErrorKey = Object.keys(data.errors)[0];
+              const firstError = data.errors[firstErrorKey];
+              const fieldName = firstError.path || firstErrorKey;
+              const message = firstError.message;
+          
+              toast.error(`${fieldName.charAt(0).toUpperCase() + fieldName.slice(1)}: ${message}`);
+              return;
+            }
+
+            // Fallback to known type-based errors
+            if (data.type) {
+              switch (data.type) {
                 case 'email':
-                  this.setState({
-                    formValid: {
-                      ...that.state.formValid,
-                      email: false,
-                    },
-                    formErrors: {
-                      ...that.state.formErrors,
-                      email: 'Email already exists',
-                    },
-                  });
-                  break;
+                  toast.error('Email already exists');
+                  return;
                 case 'phoneNumber':
-                  this.setState({
-                    formValid: {
-                      ...that.state.formValid,
-                      phoneNumber: false,
-                      showphone: false,
-                    },
-                    formErrors: {
-                      ...that.state.formErrors,
-                      phoneNumber: 'Phone number already exists',
-                    },
-                  });
-                  break;
+                  toast.error('Phone number already exists');
+                  return;
                 case 'name':
-                  if (
-                    this.checkIfDuplicate(userData.firstName, userData.lastName) &&
-                    !allowsDuplicateName
-                  ) {
-                    this.setState({
-                      popupOpen: true,
-                    });
-                  }
-                  break;
+                  toast.error('A user with this first and last name already exists');
+                  return;
                 case 'credentials':
-                  this.setState({
-                    formValid: {
-                      ...that.state.formValid,
-                      email: false,
-                    },
-                    formErrors: {
-                      ...that.state.formErrors,
-                      actualEmail: 'Actual email or password may be incorrect',
-                      actualPassword: 'Actual email or password may be incorrect',
-                    },
-                  });
-                  break;
+                  toast.error('Admin credentials were not accepted');
+                  return;
               }
             }
-            toast.error(
-              err.response?.data?.error ||
-              'An unknown error occurred while attempting to create this user.',
-            );
+
+            // Generic fallback
+            toast.error(`Create failed${status ? ` (${status})` : ''}: ${data.error || 'Unknown error occurred.'}`);
           });
       }
     }
@@ -1059,22 +1046,24 @@ class UserProfileAdd extends Component {
           },
         });
         break;
-      case 'lastName':
-        this.setState({
-          userProfile: {
-            ...userProfile,
-            [event.target.id]: event.target.value,
-          },
-          formValid: {
-            ...formValid,
-            [event.target.id]: event.target.value.length > 0,
-          },
-          formErrors: {
-            ...formErrors,
-            lastName: event.target.value.length > 0 ? '' : 'Last Name required',
-          },
-        });
-        break;
+        case 'lastName':
+          this.setState({
+            userProfile: {
+              ...userProfile,
+              [event.target.id]: event.target.value,
+            },
+            formValid: {
+              ...formValid,
+              [event.target.id]: event.target.value.length >= 2,
+            },
+            formErrors: {
+              ...formErrors,
+              lastName: event.target.value.length >= 2
+                ? ''
+                : 'Last Name cannot be less than 2 characters long',
+            },
+          });
+          break;
       case 'email':
         this.setState({
           userProfile: {