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

- updated flow of appl submission;

Browse Source 
- updated max file size across the app;
This commit is contained in:
Vitalii Kiiko
2024-10-19 11:42:47 +02:00
parent d659687ea6
commit 9607207a37
9 changed files with 127 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,22 +9,22 @@ import { Button } from 'primereact/button';
// api // api
import ApplicationService from '../../service/application-service'; import ApplicationService from '../../service/application-service';
import { mimeTypes } from '../../configData'; import { defaultMaxFileSize, mimeTypes } from '../../configData';
const FileuploadApplicationSignedPdf = ({ const FileuploadApplicationSignedPdf = ({
fieldName, fieldName,
setDataFn, setDataFn,
defaultValue = [], defaultValue = [],
accept = [], accept = [],
maxSize = 100000000, maxSize = defaultMaxFileSize,
emptyText = __('Trascina qui il tuo file', 'gepafin'), emptyText = __('Trascina qui il tuo file', 'gepafin'),
chooseLabel = __('Aggiungi documento', 'gepafin'), chooseLabel = __('Aggiungi documento', 'gepafin'),
uploadLabel = __('Salva documento', 'gepafin'), uploadLabel = __('Salva documento', 'gepafin'),
cancelLabel = __('Cancella documento', 'gepafin'), cancelLabel = __('Cancella documento', 'gepafin'),
multiple = false, multiple = false,
applicationId = 0, applicationId = 0,
disabled = false disabled = false
}) => { }) => {
const [stateFieldData, setStateFieldData] = useState([]); const [stateFieldData, setStateFieldData] = useState([]);
const [acceptFormats, setAcceptFormats] = useState(''); const [acceptFormats, setAcceptFormats] = useState('');
const [formatsForInput, setFormatsForInput] = useState(''); const [formatsForInput, setFormatsForInput] = useState('');
@@ -145,19 +145,19 @@ const FileuploadApplicationSignedPdf = ({
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(','));
}, [accept]); }, [accept]);
useEffect(() => { useEffect(() => {

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

@@ -8,14 +8,14 @@ import { Button } from 'primereact/button';
// api // api
import CompanyService from '../../service/company-service'; import CompanyService from '../../service/company-service';
import { mimeTypes } from '../../configData'; import { defaultMaxFileSize, mimeTypes } from '../../configData';
const FileuploadDelega = ({ const FileuploadDelega = ({
fieldName, fieldName,
setDataFn, setDataFn,
defaultValue = [], defaultValue = [],
accept = [], accept = [],
maxSize = 100000000, maxSize = defaultMaxFileSize,
emptyText = __('Trascina qui il tuo file', 'gepafin'), emptyText = __('Trascina qui il tuo file', 'gepafin'),
chooseLabel = __('Aggiungi delega', 'gepafin'), chooseLabel = __('Aggiungi delega', 'gepafin'),
uploadLabel = __('Salva documento', 'gepafin'), uploadLabel = __('Salva documento', 'gepafin'),

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

@@ -14,7 +14,8 @@ import { FileUpload } from 'primereact/fileupload';
import { Tag } from 'primereact/tag'; import { Tag } from 'primereact/tag';
import { Button } from 'primereact/button'; import { Button } from 'primereact/button';
import { mimeTypes } from '../../../../configData'; import { defaultMaxFileSize, mimeTypes } from '../../../../configData';
import getFormatedFileSizeText from '../../../../helpers/getFormatedFileSizeText';
const Fileupload = ({ const Fileupload = ({
fieldName, fieldName,
@@ -27,7 +28,7 @@ const Fileupload = ({
infoText = null, infoText = null,
accept = ['image/*'], accept = ['image/*'],
doctype = 'document', doctype = 'document',
maxSize = 100000000, maxSize = defaultMaxFileSize,
emptyText = __('Trascina qui il tuo file', 'gepafin'), emptyText = __('Trascina qui il tuo file', 'gepafin'),
chooseLabel = __('Aggiungi file', 'gepafin'), chooseLabel = __('Aggiungi file', 'gepafin'),
uploadLabel = __('Salva documento', 'gepafin'), uploadLabel = __('Salva documento', 'gepafin'),
@@ -162,19 +163,19 @@ const Fileupload = ({
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(','));
}, [accept]); }, [accept]);
return ( return (
@@ -184,6 +185,7 @@ const Fileupload = ({
{label}{config.required || config.isRequired ? {label}{config.required || config.isRequired ?
<span className="appForm__field--required">*</span> : null} <span className="appForm__field--required">*</span> : null}
{acceptFormats ? ' (' + getPropeMimeLabels(accept) + ')' : null} {acceptFormats ? ' (' + getPropeMimeLabels(accept) + ')' : null}
{` (max ${getFormatedFileSizeText(maxSize)})`}
</label> </label>
<FileUpload <FileUpload
ref={inputRef} ref={inputRef}

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

@@ -14,7 +14,8 @@ import { Tag } from 'primereact/tag';
import { Button } from 'primereact/button'; import { Button } from 'primereact/button';
import { head, isEmpty } from 'ramda'; import { head, isEmpty } from 'ramda';
import { mimeTypes } from '../../../../configData'; import { defaultMaxFileSize, mimeTypes } from '../../../../configData';
import getFormatedFileSizeText from '../../../../helpers/getFormatedFileSizeText';
const FileuploadAsync = ({ const FileuploadAsync = ({
fieldName, fieldName,
@@ -27,7 +28,7 @@ const FileuploadAsync = ({
infoText = null, infoText = null,
accept = ['image/*'], accept = ['image/*'],
doctype = 'images', doctype = 'images',
maxSize = 100000000, maxSize = defaultMaxFileSize,
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,
@@ -184,6 +185,7 @@ const FileuploadAsync = ({
<label htmlFor={fieldName} className={classNames({ 'p-error': errors[fieldName] })}> <label htmlFor={fieldName} className={classNames({ 'p-error': errors[fieldName] })}>
{label}{config.required ? '*' : null} {label}{config.required ? '*' : null}
{acceptFormats ? ' (' + getPropeMimeLabels(accept) + ')' : null} {acceptFormats ? ' (' + getPropeMimeLabels(accept) + ')' : null}
{` (max ${getFormatedFileSizeText(maxSize)})`}
</label> </label>
<FileUpload <FileUpload
ref={inputRef} ref={inputRef}

2
src/configData.js
View File

@@ -12,3 +12,5 @@ export const mimeTypes = [
code: '.xls,.xlsx,.ods,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.oasis.opendocument.spreadsheet' code: '.xls,.xlsx,.ods,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.oasis.opendocument.spreadsheet'
} }
]; ];
export const defaultMaxFileSize = 314572800; // 314572800 = 300 Mb

13
src/helpers/getFormatedFileSizeText.js Normal file
View File

@@ -0,0 +1,13 @@
const getFormatedFileSizeText = (bytes, decimals = 2) => {
if (!+bytes) return '0 B'
const k = 1024
const dm = decimals < 0 ? 0 : decimals
const sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']
const i = Math.floor(Math.log(bytes) / Math.log(k))
return `${parseFloat((bytes / Math.pow(k, i)).toFixed(dm))} ${sizes[i]}`
}
export default getFormatedFileSizeText;

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

@@ -35,6 +35,8 @@ import ApplicationSteps from './ApplicationSteps';
import BlockingOverlay from '../../components/BlockingOverlay'; import BlockingOverlay from '../../components/BlockingOverlay';
import { Dialog } from 'primereact/dialog'; import { Dialog } from 'primereact/dialog';
import FileuploadApplicationSignedPdf from '../../components/FileuploadApplicationSignedPdf'; import FileuploadApplicationSignedPdf from '../../components/FileuploadApplicationSignedPdf';
import getFormatedFileSizeText from '../../helpers/getFormatedFileSizeText';
import { defaultMaxFileSize } from '../../configData';
const BandoApplication = () => { const BandoApplication = () => {
const { id } = useParams(); const { id } = useParams();
@@ -94,17 +96,9 @@ const BandoApplication = () => {
const submitApplicationCallback = (data) => { const submitApplicationCallback = (data) => {
if (data.status === 'SUCCESS') { if (data.status === 'SUCCESS') {
/*if (toast.current) {
toast.current.show({
severity: 'success',
summary: '',
detail: __('La domanda è stata presentata!', 'gepafin')
});
}*/
if (data.data.applicationStatus) { if (data.data.applicationStatus) {
setApplicationStatus(data.data.status); setApplicationStatus(data.data.status); // ask why not 'applicationStatus'?
} }
setVisibleConfirmation(true);
} }
storeSet.main.unsetAsyncRequest(); storeSet.main.unsetAsyncRequest();
} }
@@ -380,6 +374,13 @@ const BandoApplication = () => {
storeSet.main.unsetAsyncRequest(); storeSet.main.unsetAsyncRequest();
} }
const handleSetSignedDocumentFromFileupload = (fieldName, stateFieldData) => {
setSignedPdfFile(stateFieldData);
if (!isEmpty(stateFieldData)) {
setVisibleConfirmation(true);
}
}
useEffect(() => { useEffect(() => {
if ('SUBMIT' === applicationStatus) { if ('SUBMIT' === applicationStatus) {
const applId = getApplicationId(); const applId = getApplicationId();
@@ -389,7 +390,7 @@ const BandoApplication = () => {
ApplicationService.getApplicationSignedPdf(applId, getSignedPdfCallback, errSignedPdfCallbacks); ApplicationService.getApplicationSignedPdf(applId, getSignedPdfCallback, errSignedPdfCallbacks);
} }
} }
}, [applicationStatus]) }, [applicationStatus]);
useEffect(() => { useEffect(() => {
if (formInitialData) { if (formInitialData) {
@@ -483,14 +484,6 @@ const BandoApplication = () => {
return acc; return acc;
}, {}); }, {});
/*if (o.name === 'table') {
validations.required = true;
validations.validate = {
nonEmptyTables: (v) => nonEmptyTables(v)
};
}*/
//console.log('validations', validations, o.name)
return ['paragraph'].includes(o.name) && text return ['paragraph'].includes(o.name) && text
? <div className="appForm__content" key={o.id}>{renderHtmlContent(text.value)}</div> ? <div className="appForm__content" key={o.id}>{renderHtmlContent(text.value)}</div>
: <FormField : <FormField
@@ -537,13 +530,15 @@ const BandoApplication = () => {
<div className="appForm__field"> <div className="appForm__field">
<label htmlFor="signedPdfFile"> <label htmlFor="signedPdfFile">
{__('Carica documento della domanda firmato', 'gepafin')} {__('Carica documento della domanda firmato', 'gepafin')}
(.p7m) {' (.p7m) '}
{`(max ${getFormatedFileSizeText(defaultMaxFileSize)})`}
</label> </label>
<FileuploadApplicationSignedPdf <FileuploadApplicationSignedPdf
setDataFn={setSignedPdfFile} setDataFn={handleSetSignedDocumentFromFileupload}
fieldName="signedPdfFile" fieldName="signedPdfFile"
disabled={is(Array, signedPdfFile) ? !isEmpty(signedPdfFile) : false}
defaultValue={is(Array, signedPdfFile) ? signedPdfFile : []} defaultValue={is(Array, signedPdfFile) ? signedPdfFile : []}
accept={['.p7m,application/pkcs7-mime,application/x-pkcs7-mime']} accept={['.p7m,application/pkcs7-mime,application/x-pkcs7-mime,.zip']}
chooseLabel={__('Aggiungi documento', 'gepafin')} chooseLabel={__('Aggiungi documento', 'gepafin')}
multiple={false} multiple={false}
doctype="document" doctype="document"

100
src/pages/BandoFormsPreview/index.js
View File

@@ -121,62 +121,60 @@ const BandoFormsPreview = () => {
<form className="appForm" onSubmit={handleSubmit(onSubmit)}> <form className="appForm" onSubmit={handleSubmit(onSubmit)}>
{!isNil(formName) {!isNil(formName)
? formData.map(o => { ? formData.map(o => {
const label = head(o.settings.filter(o => o.name === 'label')); const label = head(o.settings.filter(o => o.name === 'label'));
const text = head(o.settings.filter(o => o.name === 'text')); const text = head(o.settings.filter(o => o.name === 'text'));
const placeholder = head(o.settings.filter(o => o.name === 'placeholder')); const placeholder = head(o.settings.filter(o => o.name === 'placeholder'));
const options = head(o.settings.filter(o => o.name === 'options')); const options = head(o.settings.filter(o => o.name === 'options'));
const tableColumns = head(o.settings.filter(o => o.name === 'table_columns')); const tableColumns = head(o.settings.filter(o => o.name === 'table_columns'));
const step = head(o.settings.filter(o => o.name === 'step')); const step = head(o.settings.filter(o => o.name === 'step'));
const mime = head(o.settings.filter(o => o.name === 'mime')); const mime = head(o.settings.filter(o => o.name === 'mime'));
let mimeValue = ''; let mimeValue = '';
if (mime) { if (mime) {
mimeValue = mime.value.map(o => o.code).join(','); mimeValue = mime.value.map(o => o.code ? o.code : o.ext);
}
const validations = Object.keys(o.validators).reduce((acc, cur) => {
if (o.validators[cur]) {
if (['min', 'max', 'minLength', 'maxLength', 'maxSize'].includes(cur)) {
acc[cur] = parseInt(o.validators[cur]);
} else if ('pattern' === cur) {
acc[cur] = new RegExp(o.validators[cur])
} else if ('isRequired' === cur) {
acc[cur] = o.validators[cur]
} else if ('custom' === cur && validationFns[o.validators[cur]]) {
if (!acc.validate) {
acc.validate = {}
}
acc.validate[cur] = validationFns[o.validators[cur]]
}
} }
return acc; const validations = Object.keys(o.validators).reduce((acc, cur) => {
}, {}); if (o.validators[cur]) {
if (['min', 'max', 'minLength', 'maxLength', 'maxSize'].includes(cur)) {
acc[cur] = parseInt(o.validators[cur]);
} else if ('pattern' === cur) {
acc[cur] = new RegExp(o.validators[cur])
} else if ('isRequired' === cur) {
acc[cur] = o.validators[cur]
} else if ('custom' === cur && validationFns[o.validators[cur]]) {
if (!acc.validate) {
acc.validate = {}
}
acc.validate[cur] = validationFns[o.validators[cur]]
}
}
//console.log('mime', mime) return acc;
}, {});
return ['paragraph'].includes(o.name) && text return ['paragraph'].includes(o.name) && text
? <div className="appForm__content" key={o.id}>{renderHtmlContent(text.value)}</div> ? <div className="appForm__content" key={o.id}>{renderHtmlContent(text.value)}</div>
: <FormField : <FormField
key={o.id} key={o.id}
type={o.name} type={o.name}
fieldName={o.id} fieldName={o.id}
label={label ? label.value : ''} label={label ? label.value : ''}
placeholder={placeholder ? placeholder.value : ''} placeholder={placeholder ? placeholder.value : ''}
control={control} control={control}
register={register} register={register}
errors={errors} errors={errors}
defaultValue={values[o.id] ? values[o.id] : ''} defaultValue={values[o.id] ? values[o.id] : ''}
maxFractionDigits={step ? step.value : 0} maxFractionDigits={step ? step.value : 0}
accept={mimeValue} accept={mimeValue}
config={validations} config={validations}
options={options ? options.value : []} options={options ? options.value : []}
setDataFn={setValue} setDataFn={setValue}
sourceId={0} sourceId={0}
useGrouping={false} useGrouping={false}
tableColumns={tableColumns ? tableColumns.value : {}} tableColumns={tableColumns ? tableColumns.value : {}}
/> />
}) : null} }) : null}
</form> </form>
<div className="appPageSection__preview"> <div className="appPageSection__preview">

5
src/pages/ProfileCompany/index.js
View File

@@ -23,6 +23,8 @@ import BlockingOverlay from '../../components/BlockingOverlay';
import { InputText } from 'primereact/inputtext'; import { InputText } from 'primereact/inputtext';
import FileuploadDelega from '../../components/FileuploadDelega'; import FileuploadDelega from '../../components/FileuploadDelega';
import { Toast } from 'primereact/toast'; import { Toast } from 'primereact/toast';
import getFormatedFileSizeText from '../../helpers/getFormatedFileSizeText';
import { defaultMaxFileSize } from '../../configData';
const ProfileCompany = () => { const ProfileCompany = () => {
const isAsyncRequest = useStore().main.isAsyncRequest(); const isAsyncRequest = useStore().main.isAsyncRequest();
@@ -461,7 +463,8 @@ const ProfileCompany = () => {
<label htmlFor="delega"> <label htmlFor="delega">
{__('Carica documento Delega Firmato', 'gepafin')} {__('Carica documento Delega Firmato', 'gepafin')}
<span className="appForm__field--required">*</span> <span className="appForm__field--required">*</span>
(.p7m) {' (.p7m) '}
{`(max ${getFormatedFileSizeText(defaultMaxFileSize)})`}
</label> </label>
<FileuploadDelega <FileuploadDelega
setDataFn={setDelegaFile} setDataFn={setDelegaFile}