diff --git a/micro-ui/web/core/package.json b/micro-ui/web/core/package.json index e6f6473605..36788f5946 100644 --- a/micro-ui/web/core/package.json +++ b/micro-ui/web/core/package.json @@ -18,7 +18,7 @@ "@egovernments/digit-ui-components":"0.2.0", "@egovernments/digit-ui-libraries": "1.8.10", "@egovernments/digit-ui-module-workbench": "1.0.19", - "@egovernments/digit-ui-module-core": "1.8.32", + "@egovernments/digit-ui-module-core": "1.8.33", "@egovernments/digit-ui-module-utilities": "1.0.15", "@egovernments/digit-ui-module-open-payment":"0.0.2", "@egovernments/digit-ui-module-hrms": "1.8.11", diff --git a/micro-ui/web/micro-ui-internals/example/package.json b/micro-ui/web/micro-ui-internals/example/package.json index b68268a6cb..b2289a995e 100644 --- a/micro-ui/web/micro-ui-internals/example/package.json +++ b/micro-ui/web/micro-ui-internals/example/package.json @@ -13,7 +13,7 @@ "@egovernments/digit-ui-module-workbench": "1.0.19", "@egovernments/digit-ui-module-pgr": "1.8.12", "@egovernments/digit-ui-module-dss": "1.8.12", - "@egovernments/digit-ui-module-core": "1.8.32", + "@egovernments/digit-ui-module-core": "1.8.33", "@egovernments/digit-ui-module-common": "1.8.10", "@egovernments/digit-ui-module-hrms": "1.8.11", "@egovernments/digit-ui-module-utilities": "1.0.15", diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/CHANGELOG.md b/micro-ui/web/micro-ui-internals/packages/modules/core/CHANGELOG.md index ca9669acc1..b833732e3b 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/core/CHANGELOG.md +++ b/micro-ui/web/micro-ui-internals/packages/modules/core/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## [1.8.33] [10-Mar-2025] +- FEATURE/DUCE-00246 :Userprofile password trimming + ## [1.8.32] [10-Mar-2025] - FEATURE/DUCE-0246 :Userprofile password trimming diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/package.json b/micro-ui/web/micro-ui-internals/packages/modules/core/package.json index 5203466f80..993b1cd26a 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/core/package.json +++ b/micro-ui/web/micro-ui-internals/packages/modules/core/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-core", - "version": "1.8.32", + "version": "1.8.33", "license": "MIT", "main": "dist/index.js", "module": "dist/index.modern.js", diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js index 481dd14add..0fffe83374 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js @@ -222,6 +222,7 @@ const UserProfile = ({ stateCode, userType, cityDetails }) => { }; const setUserCurrentPassword = (value) => { + setCurrentPassword(value); if (!validationConfig?.password.test(value)) { setErrors({ ...errors, @@ -280,20 +281,19 @@ const UserProfile = ({ stateCode, userType, cityDetails }) => { const updateProfile = async () => { setLoading(true); + const trimmedName=name.trim(); + try { const requestData = { ...userInfo, - name, + name:trimmedName, gender: gender?.value, emailId: email, photo: profilePic, }; + - if(name){ - setName((prev)=>prev.trim()); - } - - if (!validationConfig?.name.test(name) || name === "" || name.length > 50 || name.length < 1) { + if (!validationConfig?.name.test(trimmedName) || trimmedName === "" || trimmedName.length > 50 || trimmedName.length < 1) { throw JSON.stringify({ type: "error", message: t("CORE_COMMON_PROFILE_NAME_INVALID"), @@ -356,7 +356,7 @@ const UserProfile = ({ stateCode, userType, cityDetails }) => { ...user, info: { ...user.info, - name, + name:trimmedName, mobileNumber, emailId: email, permanentCity: city, @@ -365,17 +365,17 @@ const UserProfile = ({ stateCode, userType, cityDetails }) => { } } - if (currentPassword.length && newPassword.length && confirmPassword.length) { + if (trimmedCurrentPassword.length && trimmedNewPassword.length && trimmedConfirmPassword.length) { const requestData = { - existingPassword: currentPassword, - newPassword: newPassword, + existingPassword: trimmedCurrentPassword, + newPassword: trimmedNewPassword, tenantId: tenant, type: "EMPLOYEE", username: userInfo?.userName, - confirmPassword: confirmPassword, + confirmPassword: trimmedConfirmPassword, }; - if (newPassword === confirmPassword) { + if (trimmedNewPassword === trimmedConfirmPassword) { try { const res = await Digit.UserService.changePassword(requestData, tenant); @@ -947,4 +947,4 @@ const UserProfile = ({ stateCode, userType, cityDetails }) => { ); }; -export default UserProfile; +export default UserProfile; \ No newline at end of file diff --git a/micro-ui/web/package.json b/micro-ui/web/package.json index 963c8a91ba..6ee9f6e1c7 100644 --- a/micro-ui/web/package.json +++ b/micro-ui/web/package.json @@ -18,7 +18,7 @@ "@egovernments/digit-ui-module-workbench": "1.0.19", "@egovernments/digit-ui-module-pgr": "1.8.12", "@egovernments/digit-ui-module-dss": "1.8.12", - "@egovernments/digit-ui-module-core": "1.8.32", + "@egovernments/digit-ui-module-core": "1.8.33", "@egovernments/digit-ui-module-common": "1.8.10", "@egovernments/digit-ui-module-hrms": "1.8.11", "@egovernments/digit-ui-module-utilities": "1.0.15", diff --git a/micro-ui/web/sandbox/package.json b/micro-ui/web/sandbox/package.json index 87f15db6db..49d378b5c9 100644 --- a/micro-ui/web/sandbox/package.json +++ b/micro-ui/web/sandbox/package.json @@ -23,7 +23,7 @@ "@egovernments/digit-ui-module-workbench": "1.0.19", "@egovernments/digit-ui-module-pgr": "1.8.12", "@egovernments/digit-ui-module-dss": "1.8.12", - "@egovernments/digit-ui-module-core": "1.8.31", + "@egovernments/digit-ui-module-core": "1.8.33", "@egovernments/digit-ui-module-common": "1.8.10", "@egovernments/digit-ui-module-hrms": "1.8.11", "@egovernments/digit-ui-module-utilities": "1.0.15", diff --git a/micro-ui/web/workbench/package.json b/micro-ui/web/workbench/package.json index 3b9efd463c..bb32463e35 100644 --- a/micro-ui/web/workbench/package.json +++ b/micro-ui/web/workbench/package.json @@ -17,7 +17,7 @@ "@egovernments/digit-ui-libraries": "1.8.10", "@egovernments/digit-ui-module-workbench": "1.0.19", "@egovernments/digit-ui-components":"0.2.0", - "@egovernments/digit-ui-module-core": "1.8.32", + "@egovernments/digit-ui-module-core": "1.8.33", "@egovernments/digit-ui-module-utilities": "1.0.15", "@egovernments/digit-ui-react-components": "1.8.19", "babel-loader": "8.1.0",