From 5e075553381ac9ae60476d83535e9fa30a79480d Mon Sep 17 00:00:00 2001 From: Vitalii Kiiko Date: Mon, 23 Dec 2024 11:37:10 +0100 Subject: [PATCH] : --- .env | 2 +- README.md | 4 ++ src/pages/BandoViewBeneficiario/index.js | 48 +++++++++++++++++------- 3 files changed, 39 insertions(+), 15 deletions(-) diff --git a/.env b/.env index ef5dcea..fc25010 100644 --- a/.env +++ b/.env @@ -5,4 +5,4 @@ REACT_APP_LOGO_FILENAME=gepafin-logo.svg REACT_APP_FAVICON_FILENAME=gepafin-favicon.ico REACT_APP_HUB_ID=p4lk3bcx1RStqTaIVVbXs REACT_APP_EVALUATION_FLOW_ID=1 -REACT_APP_LOCAL_DEVELOPMENT=1 \ No newline at end of file +REACT_APP_LOCAL_DEVELOPMENT=1 diff --git a/README.md b/README.md index 86475cf..6e5298b 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,7 @@ Gepafin Front End `npm run start` - start development server `npm run build:dev` - make build based on 'dev' env variables `npm run build:prod` - make build based on 'prod' env variables + +# HUB IDs +`p4lk3bcx1RStqTaIVVbXs` - gepafin +`t7jh5wfg9QXylNaTZkPoE` - sviluppumbria diff --git a/src/pages/BandoViewBeneficiario/index.js b/src/pages/BandoViewBeneficiario/index.js index bcb7bc0..f717c67 100644 --- a/src/pages/BandoViewBeneficiario/index.js +++ b/src/pages/BandoViewBeneficiario/index.js @@ -30,6 +30,8 @@ import { Editor } from 'primereact/editor'; import { Dialog } from 'primereact/dialog'; import PreferredBandoService from '../../service/preferred-bando-service'; +const REACT_APP_HUB_ID = process.env.REACT_APP_HUB_ID; + const BandoViewBeneficiario = () => { const isAsyncRequest = useStore().main.isAsyncRequest(); const chosenCompanyId = useStore().main.chosenCompanyId(); @@ -89,18 +91,26 @@ const BandoViewBeneficiario = () => { } const submitBtnLabel = () => { - if (applicationObj && applicationObj.id) { - return __('Vai alla domanda', 'gepafin'); - } else { + if (REACT_APP_HUB_ID === 't7jh5wfg9QXylNaTZkPoE') { return __('Presenta domanda', 'gepafin'); + } else { + if (applicationObj && applicationObj.id) { + return __('Vai alla domanda', 'gepafin'); + } else { + return __('Presenta domanda', 'gepafin'); + } } } const submitBtnIcon = () => { - if (applicationObj && applicationObj.id) { - return 'pi pi-arrow-right'; - } else { + if (REACT_APP_HUB_ID === 't7jh5wfg9QXylNaTZkPoE') { return 'pi pi-save'; + } else { + if (applicationObj && applicationObj.id) { + return 'pi pi-arrow-right'; + } else { + return 'pi pi-save'; + } } } @@ -108,11 +118,16 @@ const BandoViewBeneficiario = () => { if (data.confidi) { displayConfidiPopup(); } else { - if (applicationObj && applicationObj.id) { - navigate(`/imieibandi/${applicationObj.id}`); - } else { + if (REACT_APP_HUB_ID === 't7jh5wfg9QXylNaTZkPoE') { const bandoId = getBandoId(); ApplicationService.createApplication(bandoId, {}, createApplCallback, errCreateApplCallback, [['companyId', chosenCompanyId]]); + } else { + if (applicationObj && applicationObj.id) { + navigate(`/imieibandi/${applicationObj.id}`); + } else { + const bandoId = getBandoId(); + ApplicationService.createApplication(bandoId, {}, createApplCallback, errCreateApplCallback, [['companyId', chosenCompanyId]]); + } } } } @@ -195,6 +210,7 @@ const BandoViewBeneficiario = () => { if (data.status === 'SUCCESS') { setData(getFormattedBandiData(data.data)); } + storeSet.main.unsetAsyncRequest(); } const errGetBandoCallback = (data) => { @@ -206,6 +222,7 @@ const BandoViewBeneficiario = () => { }); } set404FromErrorResponse(data); + storeSet.main.unsetAsyncRequest(); } const getFormattedBandiData = (data) => { @@ -291,10 +308,13 @@ const BandoViewBeneficiario = () => { BandoService.getBando(bandoId, getBandoCallback, errGetBandoCallback, [ ['companyId', chosenCompanyId] ]); - ApplicationService.getApplications(getApplCallback, errGetApplCallback, [ - ['callId', bandoId], - ['companyId', chosenCompanyId] - ]); + if (REACT_APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE') { + storeSet.main.setAsyncRequest(); + ApplicationService.getApplications(getApplCallback, errGetApplCallback, [ + ['callId', bandoId], + ['companyId', chosenCompanyId] + ]); + } } }, [id, chosenCompanyId]); @@ -521,4 +541,4 @@ const BandoViewBeneficiario = () => { } -export default BandoViewBeneficiario; \ No newline at end of file +export default BandoViewBeneficiario;