diff --git a/src/components/UploadProduct/index.jsx b/src/components/UploadProduct/index.jsx index f0d194b..27896c2 100644 --- a/src/components/UploadProduct/index.jsx +++ b/src/components/UploadProduct/index.jsx @@ -147,14 +147,14 @@ export default function UploadProduct({uploadTypes}) { file_name: selectedFile.substring(0,21).replace(/ /gi, ""),//selectedFile.replace(/[ -]/gi, ""), file_size: imgDetails.size, file_type: imgDetails.type, - file_data: img.file, + file_data: img.file?.split(",")[1], title: itemName, description: description, msg_type: 'FILE', // action: 'WRENCHBOARD_RESOURCE_MYFILES', action: 11307 } - + if(!isValidFile(imgDetails, uploadTypes?.data)){ // FUNCTION TO CHECK IF FILE TYPE IS VALID setRequestStatus({loading: false, status: null, message: 'File type not supported'}) return setTimeout(()=>{ @@ -602,7 +602,10 @@ export default function UploadProduct({uploadTypes}) { //FUNCTIONS to check if file upload type is valid const isValidFile = (file, supportedFile=[]) => { - let fileType = file.type.split("/")[1]; + let fileType = file.type.split("/")[1].toLowerCase(); + if(fileType=='jpg' || fileType=='jpeg'){ //forcing both JPG and JPEG TO RETURN JPG AS FILE TYPE + fileType = 'jpg' + } let valid = supportedFile.filter(item => ( item.name.toLowerCase() == fileType.toLowerCase() )) @@ -615,7 +618,10 @@ const isValidFile = (file, supportedFile=[]) => { //FUNCTIONS TO CHECK IF FILE SIZE IS VALID const isValidFileSize = (file, supportedFile=[]) => { - let fileType = file.type.split("/")[1]; + let fileType = file.type.split("/")[1].toLowerCase(); + if(fileType=='jpg' || fileType=='jpeg'){ //forcing both JPG and JPEG TO RETURN JPG AS FILE TYPE + fileType = 'jpg' + } let fileSize = file.size; let valid = supportedFile.filter(item => ( item.name.toLowerCase() == fileType.toLowerCase()