BFLOWS/bflows-bandi-fe
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- added companyId param to some requests;

Browse Source
This commit is contained in:
Vitalii Kiiko
2025-02-18 11:29:15 +01:00
parent 4773eff552
commit 1322d78f50
2 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/pages/BandoApplication/index.js
View File

@@ -263,6 +263,7 @@ const BandoApplication = () => {
storeSet.main.setAsyncRequest(); storeSet.main.setAsyncRequest();
ApplicationService.getApplicationForm(data.data.id, getApplFormCallback, errGetApplFormCallbacks, [ ApplicationService.getApplicationForm(data.data.id, getApplFormCallback, errGetApplFormCallbacks, [
['formId', formId], ['formId', formId],
['companyId', chosenCompanyId],
['action', saveAndMove] ['action', saveAndMove]
]); ]);
} else if (['VALIDATE'].includes(saveAndMove)) { } else if (['VALIDATE'].includes(saveAndMove)) {
@@ -273,7 +274,9 @@ const BandoApplication = () => {
ApplicationService.validateApplication(applId, {}, validateApplicationCallback, errValidateApplicationCallback); ApplicationService.validateApplication(applId, {}, validateApplicationCallback, errValidateApplicationCallback);
} }
} else { } else {
ApplicationService.getApplicationForm(data.data.id, getStatusCheckCallback, errGetStatusCheckCallbacks); ApplicationService.getApplicationForm(data.data.id, getStatusCheckCallback, errGetStatusCheckCallbacks, [
['companyId', chosenCompanyId]
]);
} }
} }
} }
@@ -580,7 +583,9 @@ const BandoApplication = () => {
if (applId) { if (applId) {
storeSet.main.setAsyncRequest(); storeSet.main.setAsyncRequest();
ApplicationService.getApplicationForm(applId, getApplFormCallback, errGetApplFormCallbacks); ApplicationService.getApplicationForm(applId, getApplFormCallback, errGetApplFormCallbacks, [
['companyId', chosenCompanyId]
]);
} }
} }
@@ -612,7 +617,9 @@ const BandoApplication = () => {
if (applId) { if (applId) {
storeSet.main.setAsyncRequest(); storeSet.main.setAsyncRequest();
setIsRequestForApplData(true); setIsRequestForApplData(true);
ApplicationService.getApplicationForm(applId, getApplFormCallback, errGetApplFormCallbacks); ApplicationService.getApplicationForm(applId, getApplFormCallback, errGetApplFormCallbacks, [
['companyId', chosenCompanyId]
]);
} }
}, [id, chosenCompanyId]); }, [id, chosenCompanyId]);

41
src/pages/BandoApplicationPreview/index.js
View File

@@ -50,6 +50,8 @@ const BandoApplicationPreview = () => {
const [totalSteps, setTotalSteps] = useState(0); const [totalSteps, setTotalSteps] = useState(0);
const [applicationStatus, setApplicationStatus] = useState(''); const [applicationStatus, setApplicationStatus] = useState('');
const [activeStep, setActiveStep] = useState(1); const [activeStep, setActiveStep] = useState(1);
const chosenCompanyId = useStore().main.chosenCompanyId();
const role = useStore().main.getRole();
const isAsyncRequest = useStore().main.isAsyncRequest(); const isAsyncRequest = useStore().main.isAsyncRequest();
const toast = useRef(null); const toast = useRef(null);
const formMsgs = useRef(null); const formMsgs = useRef(null);
@@ -130,18 +132,34 @@ const BandoApplicationPreview = () => {
const goBackward = () => { const goBackward = () => {
storeSet.main.setAsyncRequest(); storeSet.main.setAsyncRequest();
ApplicationService.getApplicationForm(id, getApplFormCallback, errGetApplFormCallbacks, [ const queryParams = 'ROLE_BENEFICIARY' === role
['formId', formId], ? [
['action', 'PREVIOUS'] ['formId', formId],
]); ['companyId', chosenCompanyId],
['action', 'PREVIOUS']
]
: [
['formId', formId],
['action', 'PREVIOUS']
];
ApplicationService.getApplicationForm(id, getApplFormCallback, errGetApplFormCallbacks, queryParams);
} }
const goForward = () => { const goForward = () => {
storeSet.main.setAsyncRequest(); storeSet.main.setAsyncRequest();
ApplicationService.getApplicationForm(id, getApplFormCallback, errGetApplFormCallbacks, [ const queryParams = 'ROLE_BENEFICIARY' === role
['formId', formId], ? [
['action', 'NEXT'] ['formId', formId],
]); ['companyId', chosenCompanyId],
['action', 'NEXT']
]
: [
['formId', formId],
['action', 'NEXT']
];
ApplicationService.getApplicationForm(id, getApplFormCallback, errGetApplFormCallbacks, queryParams);
} }
const getApplFormCallback = (data) => { const getApplFormCallback = (data) => {
@@ -310,7 +328,12 @@ const BandoApplicationPreview = () => {
if (applId) { if (applId) {
storeSet.main.setAsyncRequest(); storeSet.main.setAsyncRequest();
ApplicationService.getApplicationForm(applId, getApplFormCallback, errGetApplFormCallbacks); const queryParams = 'ROLE_BENEFICIARY' === role
? [
['companyId', chosenCompanyId]
]
: [];
ApplicationService.getApplicationForm(applId, getApplFormCallback, errGetApplFormCallbacks, queryParams);
} }
}, [id]); }, [id]);