diff --git a/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js b/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js index 8d167f8..a4cdef6 100644 --- a/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js +++ b/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js @@ -1,6 +1,6 @@ import React, { useState, useEffect} from 'react'; import { __ } from '@wordpress/i18n'; -import { is, uniq, isNil } from 'ramda'; +import { is, uniq, isNil, isEmpty } from 'ramda'; import { wrap } from 'object-path-immutable'; // store @@ -28,6 +28,7 @@ import set404FromErrorResponse from '../../../../helpers/set404FromErrorResponse const AllBandiAccordion = () => { + const chosenCompanyId = useStore().main.chosenCompanyId(); const isAsyncRequest = useStore().main.isAsyncRequest(); const [items, setItems] = useState(null); const [filters, setFilters] = useState(null); @@ -113,11 +114,11 @@ const AllBandiAccordion = () => {
{__('Scadenza', 'gepafin')}: {getDateFromISOstring(data.dates[1])}
- {!data.confidi + {!isEmpty(chosenCompanyId) && chosenCompanyId !== 0 && !data.confidi ? : null} - {data.confidi + {!isEmpty(chosenCompanyId) && chosenCompanyId !== 0 && data.confidi ? : null} diff --git a/src/pages/BandoViewBeneficiario/index.js b/src/pages/BandoViewBeneficiario/index.js index c452129..3496c13 100644 --- a/src/pages/BandoViewBeneficiario/index.js +++ b/src/pages/BandoViewBeneficiario/index.js @@ -247,13 +247,15 @@ const BandoViewBeneficiario = () => { const header = renderHeader(); useEffect(() => { - const bandoId = getBandoId(); - storeSet.main.setAsyncRequest(); - BandoService.getBando(bandoId, getBandoCallback, errGetBandoCallback); - ApplicationService.getApplications(getApplCallback, errGetApplCallback, [ - ['callId', bandoId], - ['companyId', chosenCompanyId] - ]) + if (!isEmpty(chosenCompanyId) && chosenCompanyId !== 0) { + const bandoId = getBandoId(); + storeSet.main.setAsyncRequest(); + BandoService.getBando(bandoId, getBandoCallback, errGetBandoCallback); + ApplicationService.getApplications(getApplCallback, errGetApplCallback, [ + ['callId', bandoId], + ['companyId', chosenCompanyId] + ]); + } }, [id, chosenCompanyId]); return ( diff --git a/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js b/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js index 5e381d9..a5dd246 100644 --- a/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js +++ b/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js @@ -1,10 +1,10 @@ import React, { useState, useEffect } from 'react'; import { __ } from '@wordpress/i18n'; -import { uniq } from 'ramda'; +import { isEmpty, uniq } from 'ramda'; import { Link } from 'react-router-dom'; // store -import { storeSet } from '../../../../store'; +import { storeSet, useStore } from '../../../../store'; // api import BandoService from '../../../../service/bando-service'; @@ -22,6 +22,7 @@ import ProperBandoLabel from '../../../../components/ProperBandoLabel'; const LatestBandiTable = () => { + const chosenCompanyId = useStore().main.chosenCompanyId(); const [items, setItems] = useState(null); const [filters, setFilters] = useState(null); const [loading, setLoading] = useState(false); @@ -145,8 +146,9 @@ const LatestBandiTable = () => { body={dateEndBodyTemplate} filter filterElement={dateFilterTemplate}/>