From 82c2d374ead5821bb812ffd3e0ddd74a897693bb Mon Sep 17 00:00:00 2001 From: manvendra-s-rathore Date: Wed, 13 Mar 2024 14:35:00 +0530 Subject: [PATCH 1/3] UIU-3047 callout message fix --- .../EditUserProfilePicture/EditUserProfilePicture.js | 6 +++++- .../EditUserProfilePicture/EditUserProfilePicture.test.js | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/components/EditSections/EditUserInfo/components/EditUserProfilePicture/EditUserProfilePicture.js b/src/components/EditSections/EditUserInfo/components/EditUserProfilePicture/EditUserProfilePicture.js index bcbed9fde..ead8cb8ed 100644 --- a/src/components/EditSections/EditUserInfo/components/EditUserProfilePicture/EditUserProfilePicture.js +++ b/src/components/EditSections/EditUserInfo/components/EditUserProfilePicture/EditUserProfilePicture.js @@ -104,6 +104,10 @@ const EditUserProfilePicture = ({ profilePictureId, form, personal, profilePictu setLocalFileModalOpen(prev => !prev); }, []); + const onFileSelect = (event) => { + event.target.value = ''; + }; + const onFileChange = async (e) => { const maxFileSize = profilePictureMaxFileSize || PROFILE_PIC_DEFAULT_MAX_SIZE; const maxFileSizeInBytes = maxFileSize * 1024 * 1024; @@ -279,7 +283,7 @@ const EditUserProfilePicture = ({ profilePictureId, form, personal, profilePictu croppedLocalImage={croppedLocalImage} />
- + { hasAllProfilePicturePerms && ( { const consoleWarnMock = jest.spyOn(console, 'warn').mockImplementation(() => {}); const file = new File(['fake content'], mockImage, { type: 'image/png' }); const fileInput = screen.getByTestId('hidden-file-input'); + + fireEvent.click(fileInput, { target: { files: [file] } }); fireEvent.change(fileInput, { target: { files: [file] } }); await waitFor(() => { From ec3eb0008fabf846ea72b6e1eb810974121932a1 Mon Sep 17 00:00:00 2001 From: manvendra-s-rathore Date: Wed, 13 Mar 2024 16:07:58 +0530 Subject: [PATCH 2/3] add comments --- .../components/EditUserProfilePicture/EditUserProfilePicture.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/EditSections/EditUserInfo/components/EditUserProfilePicture/EditUserProfilePicture.js b/src/components/EditSections/EditUserInfo/components/EditUserProfilePicture/EditUserProfilePicture.js index ead8cb8ed..96dd1f3c7 100644 --- a/src/components/EditSections/EditUserInfo/components/EditUserProfilePicture/EditUserProfilePicture.js +++ b/src/components/EditSections/EditUserInfo/components/EditUserProfilePicture/EditUserProfilePicture.js @@ -104,6 +104,7 @@ const EditUserProfilePicture = ({ profilePictureId, form, personal, profilePictu setLocalFileModalOpen(prev => !prev); }, []); + // to invoke error callout message on same local file upload. const onFileSelect = (event) => { event.target.value = ''; }; From 28e15aaf6eb76e01948e1fbd9c5045bf11a81906 Mon Sep 17 00:00:00 2001 From: manvendra-s-rathore Date: Mon, 20 May 2024 16:27:28 +0530 Subject: [PATCH 3/3] rename constant to specify size type --- .../EditUserProfilePicture/EditUserProfilePicture.js | 4 ++-- src/constants.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/EditSections/EditUserInfo/components/EditUserProfilePicture/EditUserProfilePicture.js b/src/components/EditSections/EditUserInfo/components/EditUserProfilePicture/EditUserProfilePicture.js index 96dd1f3c7..58834a385 100644 --- a/src/components/EditSections/EditUserInfo/components/EditUserProfilePicture/EditUserProfilePicture.js +++ b/src/components/EditSections/EditUserInfo/components/EditUserProfilePicture/EditUserProfilePicture.js @@ -23,7 +23,7 @@ import { getRotatedImage, createImage } from './utils/canvasUtils'; import { ACCEPTED_IMAGE_TYPES, PROFILE_PIC_API, - PROFILE_PIC_DEFAULT_MAX_SIZE, + PROFILE_PIC_DEFAULT_MAX_SIZE_IN_MB, } from '../../../../../constants'; const ORIENTATION_TO_ANGLE = { @@ -110,7 +110,7 @@ const EditUserProfilePicture = ({ profilePictureId, form, personal, profilePictu }; const onFileChange = async (e) => { - const maxFileSize = profilePictureMaxFileSize || PROFILE_PIC_DEFAULT_MAX_SIZE; + const maxFileSize = profilePictureMaxFileSize || PROFILE_PIC_DEFAULT_MAX_SIZE_IN_MB; const maxFileSizeInBytes = maxFileSize * 1024 * 1024; if (maxFileSizeInBytes && e.target.files?.length > 0) { if (e.target.files[0].size > maxFileSizeInBytes) { diff --git a/src/constants.js b/src/constants.js index 0bee0a0fa..cc979f3de 100644 --- a/src/constants.js +++ b/src/constants.js @@ -362,5 +362,5 @@ export const DCB_VIRTUAL_USER = { type: DCB, }; -export const PROFILE_PIC_DEFAULT_MAX_SIZE = 10; +export const PROFILE_PIC_DEFAULT_MAX_SIZE_IN_MB = 10; export const ACCEPTED_IMAGE_TYPES = 'image/jpg, image/jpeg, image/png';