BFLOWS/bflows-bandi-fe
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Vitalii Kiiko
2025-04-01 11:35:39 +02:00
parent cca392151e 972e624266
commit 16392b81c6
5 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/FileuploadApplicationSignedPdf/index.js
View File

@@ -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));
});
}

5
src/components/FileuploadDelega/index.js
View File

@@ -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));
});
}

6
src/components/FormField/components/Fileupload/index.js
View File

@@ -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));
});
}

22
src/components/FormField/components/FileuploadAsync/index.js
View File

@@ -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(','))

9
src/pages/BandoApplication/index.js
View File

@@ -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();