- merged with develop;

src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js

@@ -1,10 +1,10 @@
 import React, { useState, useEffect } from 'react';
 import { __ } from '@wordpress/i18n';
-import { uniq, isNil } from 'ramda';
+import { uniq, isEmpty, isNil } from 'ramda';
 import { Link } from 'react-router-dom';
 
 // store
-import { storeGet } from '../../../../store';
+import { storeGet, useStore } from '../../../../store';
 
 // api
 import BandoService from '../../../../service/bando-service';
@@ -24,6 +24,7 @@ import set404FromErrorResponse from '../../../../helpers/set404FromErrorResponse
 
 
 const LatestBandiTable = () => {
+    const chosenCompanyId = useStore().main.chosenCompanyId();
     const [items, setItems] = useState(null);
     const [filters, setFilters] = useState(null);
     const [loading, setLoading] = useState(false);
@@ -192,16 +193,10 @@ const LatestBandiTable = () => {
                     onClick={() => addToFavourites(rowData.id, rowData.preferredCallId)}>
                 <i className="pi pi-heart" style={{ fontSize: '1rem' }}></i>
             </button>
-            {rowData.confidi
-                ? <Link to={`/bandi/${rowData.id}`}>
-                    <Button severity="info" label={__('Mostra', 'gepafin')} icon="pi pi-eye" size="small"
-                            iconPos="right"/>
-                </Link>
-                : <Link to={`/bandi/${rowData.id}`}>
-                    <Button severity="info" label={__('Partecipa', 'gepafin')} icon="pi pi-arrow-right" size="small"
-                            iconPos="right"/>
-                </Link>}
-        </div>
+            <Link to={`/bandi/${rowData.id}`}>
+                <Button severity="info" label={__('Partecipa', 'gepafin')} icon="pi pi-arrow-right" size="small"
+                        iconPos="right"/>
+            </Link></div>
     }
 
     const header = renderHeader();
@@ -224,9 +219,10 @@ const LatestBandiTable = () => {
                         style={{ minWidth: '8rem' }}
                         body={dateEndBodyTemplate} filter filterElement={dateFilterTemplate}/>
                 <Column field="status" header={__('Stato', 'gepafin')}
-                        style={{ minWidth: '7rem' }} body={statusBodyTemplate}/>
-                <Column header={__('Azioni', 'gepafin')}
-                        body={actionsBodyTemplate}/>
+                        style={{ minWidth: '7rem' }} body={statusBodyTemplate} />
+                {!isEmpty(chosenCompanyId) && chosenCompanyId !== 0
+                    ? <Column header={__('Azioni', 'gepafin')}
+                        body={actionsBodyTemplate}/> : null}
             </DataTable>
         </div>
     )

src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { __ } from '@wordpress/i18n';
-import { uniq, is } from 'ramda';
+import { uniq, is, isEmpty } from 'ramda';
 
 // tools
 import getBandoLabel from '../../../../helpers/getBandoLabel';
@@ -36,11 +36,13 @@ const MyLatestSubmissionsTable = () => {
     const [statuses, setStatuses] = useState([]);
 
     useEffect(() => {
-        setLocalAsyncRequest(true);
-        ApplicationService.getApplications(getApplCallback, errGetApplCallback, [
-            ['companyId', chosenCompanyId],
-            ['statuses', ['DRAFT', 'AWAITING', 'READY']]
-        ])
+        if (!isEmpty(chosenCompanyId) && chosenCompanyId !== 0) {
+            setLocalAsyncRequest(true);
+            ApplicationService.getApplications(getApplCallback, errGetApplCallback, [
+                ['companyId', chosenCompanyId],
+                ['statuses', ['DRAFT', 'AWAITING', 'READY']]
+            ]);
+        }
     }, [chosenCompanyId]);
 
     const getApplCallback = (data) => {