- fix for file with 0 bytes;

This commit is contained in:
Vitalii Kiiko
2025-04-01 11:35:05 +02:00
parent 2e0c54bfd2
commit 972e624266
6 changed files with 26 additions and 23 deletions

View File

@@ -128,7 +128,10 @@ const FileuploadApplicationSignedPdf = ({
return Array.prototype.every.call(files, function passesAcceptedFormat(file) { return Array.prototype.every.call(files, function passesAcceptedFormat(file) {
const fileExtension = `.${file.name.split('.').pop().toLowerCase()}`; const fileExtension = `.${file.name.split('.').pop().toLowerCase()}`;
const fileType = file.type; 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));
}); });
} }

View File

@@ -128,7 +128,10 @@ const FileuploadDelega = ({
return Array.prototype.every.call(files, function passesAcceptedFormat(file) { return Array.prototype.every.call(files, function passesAcceptedFormat(file) {
const fileExtension = `.${file.name.split('.').pop().toLowerCase()}`; const fileExtension = `.${file.name.split('.').pop().toLowerCase()}`;
const fileType = file.type; 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));
}); });
} }

View File

@@ -74,7 +74,6 @@ const Fileupload = ({
} }
const confirmDelete = (event, file) => { const confirmDelete = (event, file) => {
console.log('confirmDelete', file)
confirmPopup({ confirmPopup({
target: event.currentTarget, target: event.currentTarget,
message: __('Sei sicuro di cancellare il file?', 'gepafin'), message: __('Sei sicuro di cancellare il file?', 'gepafin'),
@@ -165,7 +164,10 @@ const Fileupload = ({
return Array.prototype.every.call(files, function passesAcceptedFormat(file) { return Array.prototype.every.call(files, function passesAcceptedFormat(file) {
const fileExtension = `.${file.name.split('.').pop().toLowerCase()}`; const fileExtension = `.${file.name.split('.').pop().toLowerCase()}`;
const fileType = file.type; 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));
}); });
} }

View File

@@ -29,6 +29,7 @@ const FileuploadAsync = ({
accept = ['image/*'], accept = ['image/*'],
doctype = 'images', doctype = 'images',
maxSize = defaultMaxFileSize, maxSize = defaultMaxFileSize,
minSize = 1,
emptyText = __('Trascina qui il tuo file', 'gepafin'), emptyText = __('Trascina qui il tuo file', 'gepafin'),
chooseLabel = __('Aggiungi immagine', 'gepafin'), chooseLabel = __('Aggiungi immagine', 'gepafin'),
multiple = false, multiple = false,
@@ -145,7 +146,10 @@ const FileuploadAsync = ({
return Array.prototype.every.call(files, function passesAcceptedFormat(file) { return Array.prototype.every.call(files, function passesAcceptedFormat(file) {
const fileExtension = `.${file.name.split('.').pop().toLowerCase()}`; const fileExtension = `.${file.name.split('.').pop().toLowerCase()}`;
const fileType = file.type; 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(() => { useEffect(() => {
const properMime = accept.map const properMime = accept.map
? accept ? accept
.map(v => { .map(v => {
const found = head(mimeTypes.filter(o => o.code.includes(v))); const found = head(mimeTypes.filter(o => o.code.includes(v)));
let res = v; let res = v;
if (found) { if (found) {
res = found.code; res = found.code;
} }
return res; return res;
}) : []; }) : [];
// eslint-disable-next-line no-useless-escape // eslint-disable-next-line no-useless-escape
setAcceptFormats(properMime.join(',').replace(/\*/g, '.\*').replace(/,/g, '|')); setAcceptFormats(properMime.join(',').replace(/\*/g, '.\*').replace(/,/g, '|'));
setFormatsForInput(properMime.join(',')) setFormatsForInput(properMime.join(','))

View File

@@ -603,21 +603,12 @@ const BandoApplication = () => {
}, [formValues]); }, [formValues]);
useEffect(() => { 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) { if (previousStatus.current === applicationStatus) {
return return
} }
previousStatus.current = applicationStatus; previousStatus.current = applicationStatus;
console.log('applicationStatus ...')
if ('DRAFT' === applicationStatus && !isRequestForApplData) { if ('DRAFT' === applicationStatus && !isRequestForApplData) {
const applId = getApplicationId(); const applId = getApplicationId();

View File

@@ -5,7 +5,7 @@ import { head, isEmpty, pathOr } from 'ramda';
import NumberFlow from '@number-flow/react'; import NumberFlow from '@number-flow/react';
// store // store
import { storeSet, useStore } from '../../store'; import { useStore } from '../../store';
// api // api
import DashboardService from '../../service/dashboard-service'; import DashboardService from '../../service/dashboard-service';