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

- removed abort signal from fetch requests;

Browse Source 
- fixed sending motivation text when accepting/rejecting;
This commit is contained in:
Vitalii Kiiko
2025-03-28 10:02:21 +01:00
parent c09091f7d2
commit d32926cde8
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pages/DomandaEditInstructorManager/index.js
View File

@@ -439,7 +439,7 @@ const DomandaEditInstructorManager = () => {
errApproveRejectCallback errApproveRejectCallback
); );
} }
}, [data]); }, [data, motivation]);
const doReject = useCallback(() => { const doReject = useCallback(() => {
if (data.evaluationVersion === 'V1') { if (data.evaluationVersion === 'V1') {
@@ -486,7 +486,7 @@ const DomandaEditInstructorManager = () => {
errApproveRejectCallback errApproveRejectCallback
); );
} }
}, [data]); }, [data, motivation]);
const approveRejectCallback = (data) => { const approveRejectCallback = (data) => {
if (data.status === 'SUCCESS') { if (data.status === 'SUCCESS') {
@@ -617,7 +617,7 @@ const DomandaEditInstructorManager = () => {
disabled={loading || ('approve' === operationType && (!amountAccepted || isEmpty(amountAccepted) || amountAccepted === 0))} disabled={loading || ('approve' === operationType && (!amountAccepted || isEmpty(amountAccepted) || amountAccepted === 0))}
label={__('Invia', 'gepafin')} onClick={'approve' === operationType ? doApprove : doReject}/> label={__('Invia', 'gepafin')} onClick={'approve' === operationType ? doApprove : doReject}/>
</div> </div>
}, [amountAccepted, data]); }, [amountAccepted, data, motivation]);
const initiateApproving = () => { const initiateApproving = () => {
setOperationType('approve'); setOperationType('approve');

6
src/pages/DomandaEditPreInstructor/index.js
View File

@@ -438,7 +438,7 @@ const DomandaEditPreInstructor = () => {
errApproveRejectCallback errApproveRejectCallback
); );
} }
}, [data]); }, [data, motivation]);
const doReject = useCallback(() => { const doReject = useCallback(() => {
if (data.evaluationVersion === 'V1') { if (data.evaluationVersion === 'V1') {
@@ -485,7 +485,7 @@ const DomandaEditPreInstructor = () => {
errApproveRejectCallback errApproveRejectCallback
); );
} }
}, [data]); }, [data, motivation]);
const approveRejectCallback = (data) => { const approveRejectCallback = (data) => {
if (data.status === 'SUCCESS') { if (data.status === 'SUCCESS') {
@@ -616,7 +616,7 @@ const DomandaEditPreInstructor = () => {
disabled={loading || ('approve' === operationType && (!amountAccepted || isEmpty(amountAccepted) || amountAccepted === 0))} disabled={loading || ('approve' === operationType && (!amountAccepted || isEmpty(amountAccepted) || amountAccepted === 0))}
label={__('Invia', 'gepafin')} onClick={'approve' === operationType ? doApprove : doReject}/> label={__('Invia', 'gepafin')} onClick={'approve' === operationType ? doApprove : doReject}/>
</div> </div>
}, [amountAccepted, data]); }, [amountAccepted, data, motivation]);
const initiateApproving = () => { const initiateApproving = () => {
setOperationType('approve'); setOperationType('approve');

2
src/service/network-service.js
View File

@@ -264,7 +264,7 @@ export class NetworkService {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Authorization': 'Bearer ' + storeGet.main.getToken(), 'Authorization': 'Bearer ' + storeGet.main.getToken(),
}, },
signal: AbortSignal.timeout(5000) //signal: AbortSignal.timeout(5000)
}) })
.then(async response => { .then(async response => {
let status = response.status; let status = response.status;