Merge pull request #9705 from JayaShakthi97/fix/email-field-validation

[bug-fix] Fix email field validation issue and email field clearing issue

Author: JayaShakthi97

.changeset/pink-lobsters-hunt.md

@@ -0,0 +1,6 @@
+---
+"@wso2is/admin.users.v1": patch
+"@wso2is/console": patch
+---
+
+Fix email field validation issue and email field clearing issue

features/admin.users.v1/components/user-profile/user-profile-form.tsx

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2025, WSO2 LLC. (https://www.wso2.com).
+ * Copyright (c) 2025-2026, WSO2 LLC. (https://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -663,7 +663,7 @@ const UserProfileForm: FunctionComponent<UserProfileFormPropsInterface> = ({
                 // Phone numbers are submitted as an array of phone number objects:
                 //   [ { type: "mobile", value: "1234567890" }, { type: "work", value: "1234567890" }].
                 for (const [ type, value ] of Object.entries(
-                    values[fieldName] as Record<string, string>)) {
+                    (values[fieldName] ?? {}) as Record<string, string>)) {
                     if (type === "primary") {
                         patchValue.push(value);
                     } else {
@@ -687,7 +687,7 @@ const UserProfileForm: FunctionComponent<UserProfileFormPropsInterface> = ({
                 // [{ type: "home", formatted: "123 Main St" }, { type: "work", formatted: "456 Business St" }].
                 // "formatted" property is added from UI.
                 for (const [ type, value ] of Object.entries(
-                    values[fieldName] as Record<string, string>)) {
+                    (values[fieldName] ?? {}) as Record<string, string>)) {
                     patchValue.push({
                         formatted: value,
                         type: type

features/admin.users.v1/components/wizard/steps/add-user-basic/add-user-basic.tsx

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023-2025, WSO2 LLC. (https://www.wso2.com).
+ * Copyright (c) 2023-2026, WSO2 LLC. (https://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -901,7 +901,7 @@ export const AddUserBasic: React.FunctionComponent<AddUserBasicProps> = ({
             if (isEmailRequired && isEmpty(value)) {
                 errorMessage = t("user:forms.addUserForm.inputs.email.validations.empty");
 
-            } else if (!SharedUserStoreUtils.validateInputAgainstRegEx(value, emailClaimRegex)) {
+            } else if (!isEmpty(value) && !SharedUserStoreUtils.validateInputAgainstRegEx(value, emailClaimRegex)) {
                 errorMessage = USERNAME_REGEX_VIOLATION_ERROR_MESSAGE;
             }