diff --git a/src/components/FileuploadApplicationSignedPdf/index.js b/src/components/FileuploadApplicationSignedPdf/index.js index f519b91..286d08f 100644 --- a/src/components/FileuploadApplicationSignedPdf/index.js +++ b/src/components/FileuploadApplicationSignedPdf/index.js @@ -128,7 +128,10 @@ const FileuploadApplicationSignedPdf = ({ return Array.prototype.every.call(files, function passesAcceptedFormat(file) { const fileExtension = `.${file.name.split('.').pop().toLowerCase()}`; const fileType = file.type; - return MIMEtype.test(fileType) || MIMEtype.test(fileExtension); + if (file.size === 0) { + alert('Il file non è valido'); + } + return file.size > 0 && (MIMEtype.test(fileType) || MIMEtype.test(fileExtension)); }); } diff --git a/src/components/FileuploadDelega/index.js b/src/components/FileuploadDelega/index.js index b53f387..afa70a4 100644 --- a/src/components/FileuploadDelega/index.js +++ b/src/components/FileuploadDelega/index.js @@ -128,7 +128,10 @@ const FileuploadDelega = ({ return Array.prototype.every.call(files, function passesAcceptedFormat(file) { const fileExtension = `.${file.name.split('.').pop().toLowerCase()}`; const fileType = file.type; - return MIMEtype.test(fileType) || MIMEtype.test(fileExtension); + if (file.size === 0) { + alert('Il file non è valido'); + } + return file.size > 0 && (MIMEtype.test(fileType) || MIMEtype.test(fileExtension)); }); } diff --git a/src/components/FormField/components/Fileupload/index.js b/src/components/FormField/components/Fileupload/index.js index 49cf709..9c21022 100644 --- a/src/components/FormField/components/Fileupload/index.js +++ b/src/components/FormField/components/Fileupload/index.js @@ -74,7 +74,6 @@ const Fileupload = ({ } const confirmDelete = (event, file) => { - console.log('confirmDelete', file) confirmPopup({ target: event.currentTarget, message: __('Sei sicuro di cancellare il file?', 'gepafin'), @@ -165,7 +164,10 @@ const Fileupload = ({ return Array.prototype.every.call(files, function passesAcceptedFormat(file) { const fileExtension = `.${file.name.split('.').pop().toLowerCase()}`; const fileType = file.type; - return MIMEtype.test(fileType) || MIMEtype.test(fileExtension); + if (file.size === 0) { + alert('Il file non è valido'); + } + return file.size > 0 && (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..d28c704 100644 --- a/src/components/FormField/components/FileuploadAsync/index.js +++ b/src/components/FormField/components/FileuploadAsync/index.js @@ -29,6 +29,7 @@ const FileuploadAsync = ({ accept = ['image/*'], doctype = 'images', maxSize = defaultMaxFileSize, + minSize = 1, emptyText = __('Trascina qui il tuo file', 'gepafin'), chooseLabel = __('Aggiungi immagine', 'gepafin'), multiple = false, @@ -145,7 +146,10 @@ const FileuploadAsync = ({ return Array.prototype.every.call(files, function passesAcceptedFormat(file) { const fileExtension = `.${file.name.split('.').pop().toLowerCase()}`; const fileType = file.type; - return MIMEtype.test(fileType) || MIMEtype.test(fileExtension); + if (file.size === 0) { + alert('Il file non è valido'); + } + return file.size > 0 && (MIMEtype.test(fileType) || MIMEtype.test(fileExtension)); }); } @@ -164,16 +168,16 @@ const FileuploadAsync = ({ useEffect(() => { const properMime = accept.map ? accept - .map(v => { - const found = head(mimeTypes.filter(o => o.code.includes(v))); - let res = v; + .map(v => { + const found = head(mimeTypes.filter(o => o.code.includes(v))); + let res = v; - if (found) { - res = found.code; - } + if (found) { + res = found.code; + } - return res; - }) : []; + return res; + }) : []; // eslint-disable-next-line no-useless-escape setAcceptFormats(properMime.join(',').replace(/\*/g, '.\*').replace(/,/g, '|')); setFormatsForInput(properMime.join(',')) diff --git a/src/pages/BandoApplication/index.js b/src/pages/BandoApplication/index.js index 16e1de7..e70bf24 100644 --- a/src/pages/BandoApplication/index.js +++ b/src/pages/BandoApplication/index.js @@ -603,21 +603,12 @@ const BandoApplication = () => { }, [formValues]); useEffect(() => { - console.log('applicationStatus', previousStatus.current, applicationStatus, - previousStatus.current === applicationStatus, (previousStatus.current !== applicationStatus && isEmpty(previousStatus.current))) - /*if (previousStatus.current === applicationStatus || (previousStatus.current !== applicationStatus && isEmpty(previousStatus.current))) { - previousStatus.current = applicationStatus; - return; - } else { - previousStatus.current = applicationStatus; - }*/ if (previousStatus.current === applicationStatus) { return } previousStatus.current = applicationStatus; - console.log('applicationStatus ...') if ('DRAFT' === applicationStatus && !isRequestForApplData) { const applId = getApplicationId(); diff --git a/src/pages/DashboardBeneficiario/index.js b/src/pages/DashboardBeneficiario/index.js index 7d1f625..bceb0ca 100644 --- a/src/pages/DashboardBeneficiario/index.js +++ b/src/pages/DashboardBeneficiario/index.js @@ -5,7 +5,7 @@ import { head, isEmpty, pathOr } from 'ramda'; import NumberFlow from '@number-flow/react'; // store -import { storeSet, useStore } from '../../store'; +import { useStore } from '../../store'; // api import DashboardService from '../../service/dashboard-service';