From d095f9399af9a492d1911a7891bffe68ef9c5e45 Mon Sep 17 00:00:00 2001
From: wayangalihpratama <wgprtm@gmail.com>
Date: Thu, 9 Nov 2023 19:10:20 +0800
Subject: [PATCH 1/2] [#83] Fix manual target value load

---
 frontend/src/pages/cases/components/IncomeDriverTarget.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/cases/components/IncomeDriverTarget.js b/frontend/src/pages/cases/components/IncomeDriverTarget.js
index 68e923cf..2cf6f834 100644
--- a/frontend/src/pages/cases/components/IncomeDriverTarget.js
+++ b/frontend/src/pages/cases/components/IncomeDriverTarget.js
@@ -116,7 +116,6 @@ const IncomeDriverTarget = ({
 
   const onValuesChange = (changedValues, allValues) => {
     const { target, region } = allValues;
-    const regionData = { region: region };
     const HHSize = calculateHouseholdSize(allValues);
     setHouseholdSize(HHSize);
     // eslint-disable-next-line no-undefined
@@ -135,9 +134,10 @@ const IncomeDriverTarget = ({
     }
     if (changedValues.target && !disableTarget) {
       setIncomeTarget(target);
-      updateFormValues({ ...regionData, target: target });
+      updateFormValues({ target: target });
     }
     if (changedValues.region && disableTarget) {
+      const regionData = { region: region };
       // get from API
       if (currentCase?.country && currentCase?.year && region) {
         let url = `country_region_benchmark?country_id=${currentCase.country}`;

From 0ae6c40a579b9428222cb36f2b88c8b2f45ced82 Mon Sep 17 00:00:00 2001
From: wayangalihpratama <wgprtm@gmail.com>
Date: Thu, 9 Nov 2023 19:21:56 +0800
Subject: [PATCH 2/2] [#83] Final fix manual target onchange event

---
 frontend/src/pages/cases/components/IncomeDriverTarget.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/pages/cases/components/IncomeDriverTarget.js b/frontend/src/pages/cases/components/IncomeDriverTarget.js
index 2cf6f834..fe43081f 100644
--- a/frontend/src/pages/cases/components/IncomeDriverTarget.js
+++ b/frontend/src/pages/cases/components/IncomeDriverTarget.js
@@ -120,6 +120,7 @@ const IncomeDriverTarget = ({
     setHouseholdSize(HHSize);
     // eslint-disable-next-line no-undefined
     if (changedValues.manual_target !== undefined) {
+      // manual target
       setDisableTarget(!changedValues.manual_target);
       if (changedValues.manual_target && target) {
         form.setFieldsValue({ region: null });
@@ -132,9 +133,10 @@ const IncomeDriverTarget = ({
         updateFormValues({ region: null, target: 0 });
       }
     }
+    // manual target
     if (changedValues.target && !disableTarget) {
       setIncomeTarget(target);
-      updateFormValues({ target: target });
+      updateFormValues({ region: null, target: target });
     }
     if (changedValues.region && disableTarget) {
       const regionData = { region: region };