- updated flow of appl submission;

- updated max file size across the app;

src/components/FileuploadApplicationSignedPdf/index.js

@@ -9,14 +9,14 @@ import { Button } from 'primereact/button';
 // api
 import ApplicationService from '../../service/application-service';
 
-import { mimeTypes } from '../../configData';
+import { defaultMaxFileSize, mimeTypes } from '../../configData';
 
 const FileuploadApplicationSignedPdf = ({
                                             fieldName,
                                             setDataFn,
                                             defaultValue = [],
                                             accept = [],
-                              maxSize = 100000000,
+                                            maxSize = defaultMaxFileSize,
                                             emptyText = __('Trascina qui il tuo file', 'gepafin'),
                                             chooseLabel = __('Aggiungi documento', 'gepafin'),
                                             uploadLabel = __('Salva documento', 'gepafin'),
@@ -157,7 +157,7 @@ const FileuploadApplicationSignedPdf = ({
                 }) : [];
         // eslint-disable-next-line no-useless-escape
         setAcceptFormats(properMime.join(',').replace(/\*/g, '.\*').replace(/,/g, '|'));
-        setFormatsForInput(properMime.join(','))
+        setFormatsForInput(properMime.join(','));
     }, [accept]);
 
     useEffect(() => {

src/components/FileuploadDelega/index.js

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

src/components/FormField/components/Fileupload/index.js

@@ -14,7 +14,8 @@ import { FileUpload } from 'primereact/fileupload';
 import { Tag } from 'primereact/tag';
 import { Button } from 'primereact/button';
 
-import { mimeTypes } from '../../../../configData';
+import { defaultMaxFileSize, mimeTypes } from '../../../../configData';
+import getFormatedFileSizeText from '../../../../helpers/getFormatedFileSizeText';
 
 const Fileupload = ({
                         fieldName,
@@ -27,7 +28,7 @@ const Fileupload = ({
                         infoText = null,
                         accept = ['image/*'],
                         doctype = 'document',
-                        maxSize = 100000000,
+                        maxSize = defaultMaxFileSize,
                         emptyText = __('Trascina qui il tuo file', 'gepafin'),
                         chooseLabel = __('Aggiungi file', 'gepafin'),
                         uploadLabel = __('Salva documento', 'gepafin'),
@@ -174,7 +175,7 @@ const Fileupload = ({
                 }) : [];
         // eslint-disable-next-line no-useless-escape
         setAcceptFormats(properMime.join(',').replace(/\*/g, '.\*').replace(/,/g, '|'));
-        setFormatsForInput(properMime.join(','))
+        setFormatsForInput(properMime.join(','));
     }, [accept]);
 
     return (
@@ -184,6 +185,7 @@ const Fileupload = ({
                     {label}{config.required || config.isRequired ?
                     <span className="appForm__field--required">*</span> : null}
                     {acceptFormats ? ' (' + getPropeMimeLabels(accept) + ')' : null}
+                    {` (max ${getFormatedFileSizeText(maxSize)})`}
                 </label>
                 <FileUpload
                     ref={inputRef}

src/components/FormField/components/FileuploadAsync/index.js

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

src/configData.js

@@ -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'
     }
 ];
+
+export const defaultMaxFileSize = 314572800; // 314572800 = 300 Mb

src/helpers/getFormatedFileSizeText.js

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

src/pages/BandoApplication/index.js

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

src/pages/BandoFormsPreview/index.js

@@ -131,7 +131,7 @@ const BandoFormsPreview = () => {
                                 let mimeValue = '';
 
                                 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) => {
@@ -153,8 +153,6 @@ const BandoFormsPreview = () => {
                                     return acc;
                                 }, {});
 
-                            //console.log('mime', mime)
-
                                 return ['paragraph'].includes(o.name) && text
                                     ? <div className="appForm__content" key={o.id}>{renderHtmlContent(text.value)}</div>
                                     : <FormField

src/pages/ProfileCompany/index.js

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