diff --git a/src/pages/DomandaEditInstructorManager/index.js b/src/pages/DomandaEditInstructorManager/index.js index 0bf167c..39b08c4 100644 --- a/src/pages/DomandaEditInstructorManager/index.js +++ b/src/pages/DomandaEditInstructorManager/index.js @@ -392,7 +392,7 @@ const DomandaEditInstructorManager = () => { storeSet.main.unsetAsyncRequest(); } - const doApprove = () => { + const doApprove = useCallback(() => { if (data.evaluationVersion === 'V1') { const submitData = { applicationStatus: 'APPROVED', @@ -438,9 +438,10 @@ const DomandaEditInstructorManager = () => { errApproveRejectCallback ); } - } + }, [data]); - const doReject = () => { + const doReject = useCallback(() => { + console.log('doReject', data.evaluationVersion) if (data.evaluationVersion === 'V1') { const submitData = { applicationStatus: 'REJECTED', @@ -450,7 +451,7 @@ const DomandaEditInstructorManager = () => { note: data.note, motivation } - + console.log('doReject2', data.assignedApplicationId) setLoading(true); setIsVisibleCompleteDialog(false); ApplicationEvaluationService.updateEvaluation( @@ -484,7 +485,7 @@ const DomandaEditInstructorManager = () => { errApproveRejectCallback ); } - } + }, [data]); const approveRejectCallback = (data) => { if (data.status === 'SUCCESS') { @@ -615,7 +616,7 @@ const DomandaEditInstructorManager = () => { disabled={loading || ('approve' === operationType && (!amountAccepted || isEmpty(amountAccepted) || amountAccepted === 0))} label={__('Invia', 'gepafin')} onClick={'approve' === operationType ? doApprove : doReject}/> - }, [amountAccepted]) + }, [amountAccepted, data]); const initiateApproving = () => { setOperationType('approve'); diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js index 68138e9..4db81ea 100644 --- a/src/pages/DomandaEditPreInstructor/index.js +++ b/src/pages/DomandaEditPreInstructor/index.js @@ -392,7 +392,7 @@ const DomandaEditPreInstructor = () => { storeSet.main.unsetAsyncRequest(); } - const doApprove = () => { + const doApprove = useCallback(() => { if (data.evaluationVersion === 'V1') { const submitData = { applicationStatus: 'APPROVED', @@ -438,9 +438,9 @@ const DomandaEditPreInstructor = () => { errApproveRejectCallback ); } - } + }, [data]); - const doReject = () => { + const doReject = useCallback(() => { if (data.evaluationVersion === 'V1') { const submitData = { applicationStatus: 'REJECTED', @@ -484,7 +484,7 @@ const DomandaEditPreInstructor = () => { errApproveRejectCallback ); } - } + }, [data]); const approveRejectCallback = (data) => { if (data.status === 'SUCCESS') { @@ -615,7 +615,7 @@ const DomandaEditPreInstructor = () => { disabled={loading || ('approve' === operationType && (!amountAccepted || isEmpty(amountAccepted) || amountAccepted === 0))} label={__('Invia', 'gepafin')} onClick={'approve' === operationType ? doApprove : doReject}/> - }, [amountAccepted]) + }, [amountAccepted, data]); const initiateApproving = () => { setOperationType('approve');