Merge pull request #19 from Kitzanos/quickfix/issue-in-safari

Quickfix/issue in safari

src/pages/AddCompany/index.js

@@ -22,6 +22,8 @@ import CompanyService from '../../service/company-service';
 import { isPIVA, isEmail, isEmailPEC } from '../../helpers/validators';
 import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';
 
+const APP_EVALUATION_FLOW_ID = process.env.REACT_APP_EVALUATION_FLOW_ID;
+
 const AddCompany = () => {
     const navigate = useNavigate();
     const isAsyncRequest = useStore().main.isAsyncRequest();
@@ -33,12 +35,14 @@ const AddCompany = () => {
         handleSubmit,
         formState: { errors },
         setValue,
-        watch
+        watch,
+        getValues
     } = useForm({
         defaultValues: {},
         mode: 'onChange'
     });
     const isPiva = watch('vatNumber');
+    //const isPiva = watch('vatNumber');
 
     const setEmptyValues = () => {
         const formData = {
@@ -136,6 +140,11 @@ const AddCompany = () => {
         storeSet.main.unsetAsyncRequest();
     }
 
+    const shouldDisableFiscalCode = () => {
+        const formData = getValues();
+        return !formData.type || formData.type && formData.type === 'giuridica';
+    }
+
     useEffect(() => {
         setInputPiva(isPiva);
     }, [isPiva]);
@@ -143,7 +152,7 @@ const AddCompany = () => {
     useEffect(() => {
         checkVatNumber(debouncedPivaValue);
     }, [debouncedPivaValue])
-
+console.log('APP_EVALUATION_FLOW_ID', APP_EVALUATION_FLOW_ID)
     return (
         <div className="appPage">
             <div className="appPage__pageHeader">
@@ -174,6 +183,23 @@ const AddCompany = () => {
                         />
                     </div>
 
+                    {APP_EVALUATION_FLOW_ID === '2'
+                        ? <div className="appForm__cols">
+                            <FormField
+                                type="radio"
+                                fieldName="type"
+                                label={__('Type', 'gepafin')}
+                                control={control}
+                                errors={errors}
+                                config={{ required: __('È obbligatorio', 'gepafin') }}
+                                defaultValue="giuridica"
+                                options={[
+                                    { name: 'giuridica', label: 'Giuridica' },
+                                    { name: 'fisica', label: 'Fisica' },
+                                ]}
+                            />
+                        </div> : null}
+
                     <div className="appForm__cols">
                         <FormField
                             type="textinput"
@@ -184,15 +210,25 @@ const AddCompany = () => {
                             config={{ required: __('È obbligatorio', 'gepafin') }}
                         />
 
-                        <FormField
-                            type="textinput"
-                            disabled={true}
-                            fieldName="codiceFiscale"
-                            label={__('Codice fiscale', 'gepafin')}
-                            control={control}
-                            errors={errors}
-                            config={{ required: __('È obbligatorio', 'gepafin') }}
-                        />
+                        {APP_EVALUATION_FLOW_ID === '1'
+                            ? <FormField
+                                type="textinput"
+                                disabled
+                                fieldName="codiceFiscale"
+                                label={__('Codice fiscale', 'gepafin')}
+                                control={control}
+                                errors={errors}
+                                config={{ required: __('È obbligatorio', 'gepafin') }}
+                            />
+                            : <FormField
+                                type="textinput"
+                                disabled={shouldDisableFiscalCode()}
+                                fieldName="codiceFiscale"
+                                label={__('Codice fiscale', 'gepafin')}
+                                control={control}
+                                errors={errors}
+                                config={{ required: __('È obbligatorio', 'gepafin') }}
+                            />}
                     </div>
 
                     <div className="appForm__cols">

src/pages/Applications/index.js

@@ -5,6 +5,7 @@ import { useNavigate } from 'react-router-dom';
 // components
 import MyLatestSubmissionsTable from '../DashboardBeneficiario/components/MyLatestSubmissionsTable';
 import { Button } from 'primereact/button';
+import ErrorBoundary from '../../components/ErrorBoundary';
 
 const Applications = () => {
     const navigate = useNavigate();
@@ -22,7 +23,7 @@ const Applications = () => {
             <div className="appPage__spacer"></div>
 
             <div className="appPageSection">
-                <MyLatestSubmissionsTable/>
+                <ErrorBoundary><MyLatestSubmissionsTable/></ErrorBoundary>
             </div>
 
             <div className="appPage__spacer"></div>

src/pages/BandiBeneficiario/index.js

@@ -8,6 +8,7 @@ import { useStore } from '../../store';
 
 // components
 import AllBandiAccordion from './components/AllBandiAccordion';
+import ErrorBoundary from '../../components/ErrorBoundary';
 
 const BandiBeneficiario = () => {
     const chosenCompanyId = useStore().main.chosenCompanyId();
@@ -34,7 +35,7 @@ const BandiBeneficiario = () => {
                 </> : null}
 
             <div className="appPageSection">
-                <AllBandiAccordion/>
+                <ErrorBoundary><AllBandiAccordion/></ErrorBoundary>
             </div>
         </div>
     )

src/pages/DashboardBeneficiario/index.js

@@ -14,6 +14,7 @@ import DashboardService from '../../service/dashboard-service';
 import LatestBandiTable from './components/LatestBandiTable';
 import MyLatestSubmissionsTable from './components/MyLatestSubmissionsTable';
 import { Button } from 'primereact/button';
+import ErrorBoundary from '../../components/ErrorBoundary';
 
 const DashboardBeneficiario = () => {
     const navigate = useNavigate();
@@ -85,7 +86,7 @@ const DashboardBeneficiario = () => {
 
             <div className="appPageSection">
                 <h2>{__('Domande in lavorazione', 'gepafin')}</h2>
-                <MyLatestSubmissionsTable/>
+                <ErrorBoundary><MyLatestSubmissionsTable/></ErrorBoundary>
             </div>
 
             <div className="appPage__spacer"></div>
@@ -105,7 +106,7 @@ const DashboardBeneficiario = () => {
 
             <div className="appPageSection">
                 <h2>{__('Bandi disponibili', 'gepafin')}</h2>
-                <LatestBandiTable/>
+                <ErrorBoundary><LatestBandiTable/></ErrorBoundary>
             </div>
 
             <div className="appPage__spacer"></div>