From 8519aa1feadeaea78856d3bb5709e6c92e271e38 Mon Sep 17 00:00:00 2001 From: Vitalii Kiiko Date: Wed, 5 Feb 2025 10:57:52 +0100 Subject: [PATCH 1/2] - temp added logs; --- src/components/FormField/components/Fileupload/index.js | 5 ++++- .../FormField/components/FileuploadAsync/index.js | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/components/FormField/components/Fileupload/index.js b/src/components/FormField/components/Fileupload/index.js index 0bdcfeb..aeb43b9 100644 --- a/src/components/FormField/components/Fileupload/index.js +++ b/src/components/FormField/components/Fileupload/index.js @@ -133,10 +133,12 @@ const Fileupload = ({ } const onBeforeDrop = (e) => { + console.log('e.dataTransfer.files:', e.dataTransfer.files) return !isEmpty(e.dataTransfer.files) ? validateFileInputType(e.dataTransfer.files) : false; } const onBeforeSelect = (e) => { + console.log('e.originalEvent.target.files:', e.originalEvent.target.files) if (e.originalEvent.target.files) { return !isEmpty(e.originalEvent.target.files) ? validateFileInputType(e.originalEvent.target.files) @@ -146,10 +148,11 @@ const Fileupload = ({ const validateFileInputType = (files) => { const MIMEtype = new RegExp(acceptFormats); - + console.log('MIMEtype', MIMEtype) return Array.prototype.every.call(files, function passesAcceptedFormat(file) { const fileExtension = `.${file.name.split('.').pop().toLowerCase()}`; const fileType = file.type; + console.log('fileExtension', fileExtension, MIMEtype.test(fileType), MIMEtype.test(fileExtension)) return MIMEtype.test(fileType) || MIMEtype.test(fileExtension); }); } diff --git a/src/components/FormField/components/FileuploadAsync/index.js b/src/components/FormField/components/FileuploadAsync/index.js index 50a59be..e8ca752 100644 --- a/src/components/FormField/components/FileuploadAsync/index.js +++ b/src/components/FormField/components/FileuploadAsync/index.js @@ -121,17 +121,18 @@ const FileuploadAsync = ({ } const onBeforeDrop = (e) => { + console.log('e.dataTransfer.files:', e.dataTransfer.files) return !isEmpty(e.dataTransfer.files) ? validateFileInputType(e.dataTransfer.files) : false; } const onBeforeSelect = (e) => { const files = inputRef.current.getFiles(); const uploadedfiles = inputRef.current.getUploadedFiles(); - + console.log('files:', files) if (!multiple && (uploadedfiles.length > 0 || files.length > 0)) { return false; } - + console.log('e.originalEvent.target.files:', e.originalEvent.target.files) if (e.originalEvent.target.files) { return !isEmpty(e.originalEvent.target.files) ? validateFileInputType(e.originalEvent.target.files) @@ -141,10 +142,11 @@ const FileuploadAsync = ({ const validateFileInputType = (files) => { const MIMEtype = new RegExp(acceptFormats); - + console.log('MIMEtype', MIMEtype) return Array.prototype.every.call(files, function passesAcceptedFormat(file) { const fileExtension = `.${file.name.split('.').pop().toLowerCase()}`; const fileType = file.type; + console.log('fileExtension', fileExtension, MIMEtype.test(fileType), MIMEtype.test(fileExtension)) return MIMEtype.test(fileType) || MIMEtype.test(fileExtension); }); } From a2420ba26deaf7ca12e23d10bf8b197a41a523f2 Mon Sep 17 00:00:00 2001 From: Vitalii Kiiko Date: Wed, 5 Feb 2025 11:14:07 +0100 Subject: [PATCH 2/2] - updated mime type check for zip files; --- src/components/FormField/components/Fileupload/index.js | 5 +---- .../FormField/components/FileuploadAsync/index.js | 8 +++----- src/configData.js | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/components/FormField/components/Fileupload/index.js b/src/components/FormField/components/Fileupload/index.js index aeb43b9..0bdcfeb 100644 --- a/src/components/FormField/components/Fileupload/index.js +++ b/src/components/FormField/components/Fileupload/index.js @@ -133,12 +133,10 @@ const Fileupload = ({ } const onBeforeDrop = (e) => { - console.log('e.dataTransfer.files:', e.dataTransfer.files) return !isEmpty(e.dataTransfer.files) ? validateFileInputType(e.dataTransfer.files) : false; } const onBeforeSelect = (e) => { - console.log('e.originalEvent.target.files:', e.originalEvent.target.files) if (e.originalEvent.target.files) { return !isEmpty(e.originalEvent.target.files) ? validateFileInputType(e.originalEvent.target.files) @@ -148,11 +146,10 @@ const Fileupload = ({ const validateFileInputType = (files) => { const MIMEtype = new RegExp(acceptFormats); - console.log('MIMEtype', MIMEtype) + return Array.prototype.every.call(files, function passesAcceptedFormat(file) { const fileExtension = `.${file.name.split('.').pop().toLowerCase()}`; const fileType = file.type; - console.log('fileExtension', fileExtension, MIMEtype.test(fileType), MIMEtype.test(fileExtension)) return MIMEtype.test(fileType) || MIMEtype.test(fileExtension); }); } diff --git a/src/components/FormField/components/FileuploadAsync/index.js b/src/components/FormField/components/FileuploadAsync/index.js index e8ca752..50a59be 100644 --- a/src/components/FormField/components/FileuploadAsync/index.js +++ b/src/components/FormField/components/FileuploadAsync/index.js @@ -121,18 +121,17 @@ const FileuploadAsync = ({ } const onBeforeDrop = (e) => { - console.log('e.dataTransfer.files:', e.dataTransfer.files) return !isEmpty(e.dataTransfer.files) ? validateFileInputType(e.dataTransfer.files) : false; } const onBeforeSelect = (e) => { const files = inputRef.current.getFiles(); const uploadedfiles = inputRef.current.getUploadedFiles(); - console.log('files:', files) + if (!multiple && (uploadedfiles.length > 0 || files.length > 0)) { return false; } - console.log('e.originalEvent.target.files:', e.originalEvent.target.files) + if (e.originalEvent.target.files) { return !isEmpty(e.originalEvent.target.files) ? validateFileInputType(e.originalEvent.target.files) @@ -142,11 +141,10 @@ const FileuploadAsync = ({ const validateFileInputType = (files) => { const MIMEtype = new RegExp(acceptFormats); - console.log('MIMEtype', MIMEtype) + return Array.prototype.every.call(files, function passesAcceptedFormat(file) { const fileExtension = `.${file.name.split('.').pop().toLowerCase()}`; const fileType = file.type; - console.log('fileExtension', fileExtension, MIMEtype.test(fileType), MIMEtype.test(fileExtension)) return MIMEtype.test(fileType) || MIMEtype.test(fileExtension); }); } diff --git a/src/configData.js b/src/configData.js index 5d3e7b8..c37fc50 100644 --- a/src/configData.js +++ b/src/configData.js @@ -1,7 +1,7 @@ export const mimeTypes = [ { name: 'PDF', code: '.pdf,application/pdf' }, { name: 'p7m', code: '.p7m,application/pkcs7-mime,application/x-pkcs7-mime' }, - { name: 'ZIP', code: 'application/zip' }, + { name: 'ZIP', code: 'application/zip,.zip' }, { name: 'Immagine', code: 'image/*' }, { name: 'Word',