From cf5f04d6c2e64e117963288cb72a692e9c2ba849 Mon Sep 17 00:00:00 2001 From: Vitalii Kiiko Date: Thu, 14 Nov 2024 14:40:51 +0100 Subject: [PATCH] - fixed issue of making calls with empty company id or it equal to 0; --- .../components/AllBandiAccordion/index.js | 7 ++++--- src/pages/BandoViewBeneficiario/index.js | 16 +++++++++------- .../components/LatestBandiTable/index.js | 10 ++++++---- .../components/MyLatestSubmissionsTable/index.js | 14 ++++++++------ .../components/BeneficiarioDomandeTable/index.js | 14 ++++++++------ 5 files changed, 35 insertions(+), 26 deletions(-) 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 = () => {
{renderHtmlContent(data.descriptionShort)}

{__('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}/> - + {!isEmpty(chosenCompanyId) && chosenCompanyId !== 0 + ? : null}
) diff --git a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js b/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js index 608b2ba..ce3f987 100644 --- a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js +++ b/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) => { diff --git a/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js b/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js index d97fd2e..22ac157 100644 --- a/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js +++ b/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js @@ -1,6 +1,6 @@ import React, { useState, useEffect } from 'react'; import { __ } from '@wordpress/i18n'; -import { is, uniq } from 'ramda'; +import { is, isEmpty, uniq } from 'ramda'; import { Link } from 'react-router-dom'; // store @@ -36,11 +36,13 @@ const BeneficiarioDomandeTable = () => { const [statuses, setStatuses] = useState([]); useEffect(() => { - setLocalAsyncRequest(true); - ApplicationService.getApplications(getApplCallback, errGetApplCallback, [ - ['companyId', chosenCompanyId], - ['statuses', ['SOCCORSO', 'APPROVED', 'REJECTED', 'EVALUATION']] - ]) + if (!isEmpty(chosenCompanyId) && chosenCompanyId !== 0) { + setLocalAsyncRequest(true); + ApplicationService.getApplications(getApplCallback, errGetApplCallback, [ + ['companyId', chosenCompanyId], + ['statuses', ['SOCCORSO', 'APPROVED', 'REJECTED', 'EVALUATION']] + ]); + } }, [chosenCompanyId]); const getApplCallback = (data) => {