[#1152] Fix yellow background in datapoint when reset in diff questio…

…n group
akvo · Feb 12, 2024 · b47212f · b47212f
1 parent 9fe7317
commit b47212f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/frontend/src/pages/manage-data/DataDetail.jsx b/frontend/src/pages/manage-data/DataDetail.jsx
@@ -61,7 +61,7 @@ const DataDetail = ({
     const hasNewValue = prev
       .find((p) => p.id === parentId)
       ?.question?.some((q) => typeof q.newValue !== "undefined");
-    setEditedRecord({ [record.id]: hasNewValue });
+    setEditedRecord({ ...editedRecord, [record.id]: hasNewValue });
     setDataset(prev);
   };
 
@@ -80,7 +80,14 @@ const DataDetail = ({
           }
         : qg
     );
-    setEditedRecord({ [record.id]: false });
+    /**
+     * Check whether it still has newValue or not
+     * in all groups of questions
+     */
+    const hasNewValue = prev
+      ?.flatMap((p) => p?.question)
+      ?.find((q) => q?.newValue);
+    setEditedRecord({ ...editedRecord, [record.id]: hasNewValue });
     setDataset(prev);
   };
 

diff --git a/frontend/src/pages/submissions/BatchDetail.jsx b/frontend/src/pages/submissions/BatchDetail.jsx
@@ -151,7 +151,7 @@ const BatchDetail = ({
         return typeof q.newValue !== "undefined";
       });
     });
-    setEditedRecord({ [expanded.id]: hasNewValue });
+    setEditedRecord({ ...editedRecord, [expanded.id]: hasNewValue });
     setRawValue({
       ...rawValue,
       data,
@@ -179,7 +179,14 @@ const BatchDetail = ({
         return rq;
       }),
     }));
-    setEditedRecord({ [expanded.id]: false });
+    /**
+     * Check whether it still has newValue or not
+     * in all groups of questions
+     */
+    const hasNewValue = data
+      ?.flatMap((d) => d?.question)
+      ?.find((q) => q?.newValue);
+    setEditedRecord({ ...editedRecord, [expanded.id]: hasNewValue });
     setRawValue({
       ...prev,
       data,