Targets Merge Functionality Integration (#128)

Author: thegeektets

src/modules/SurveyInformation/Enumerators/EnumeratorsHome/EnumeratorsHome.tsx

@@ -254,7 +254,8 @@ function EnumeratorsHome() {
         for (const key in originalData[0]) {
           if (
             Object.prototype.hasOwnProperty.call(originalData[0], key) &&
-            key !== "custom_fields"
+            key !== "custom_fields" &&
+            !columnsToExclude.includes(key)
           ) {
             columnMapping[key] = key;
           }

src/modules/SurveyInformation/Enumerators/EnumeratorsRemap/EnumeratorsRemap.tsx

@@ -111,9 +111,9 @@ function EnumeratorsReupload({ setScreenMode }: IEnumeratorsReupload) {
         {enumeratorColumnMapping !== null &&
           Object.keys(enumeratorColumnMapping).length > 0 && (
             <ul>
-              {Object.keys(enumeratorColumnMapping).map((key) => (
-                <li key={key}>{key}</li>
-              ))}
+              {Object.keys(enumeratorColumnMapping).map(
+                (key) => key !== "custom_fields" && <li key={key}>{key}</li>
+              )}
             </ul>
           )}
       </DescriptionContainer>

src/modules/SurveyInformation/Enumerators/EnumeratorsReupload/EnumeratorsReupload.tsx

@@ -95,6 +95,7 @@ function SurveyLocationAdd() {
       }
     }
   };
+
   const renderLocationFields = () => {
     const fields = Array.from({ length: numLocationFields }, (_, index) => {
       const geoLevel: {

src/modules/SurveyInformation/SurveyLocationAdd/SurveyLocationAdd.tsx

@@ -17,7 +17,10 @@ import {
 import { useEffect, useState } from "react";
 import RowEditingModal from "./RowEditingModal";
 import TargetsCountBox from "../../../../components/TargetsCountBox";
-import { setLoading } from "../../../../redux/targets/targetSlice";
+import {
+  setLoading,
+  setTargetsColumnMapping,
+} from "../../../../redux/targets/targetSlice";
 import { useAppDispatch, useAppSelector } from "../../../../redux/hooks";
 import { RootState } from "../../../../redux/store";
 import { getSurveyCTOForm } from "../../../../redux/surveyCTOInformation/surveyCTOInformationActions";
@@ -26,6 +29,7 @@ import FullScreenLoader from "../../../../components/Loaders/FullScreenLoader";
 import { useCSVDownloader } from "react-papaparse";
 import TargetsReupload from "../TargetsReupload";
 import TargetsRemap from "../TargetsRemap";
+import { includes } from "cypress/types/lodash";
 
 function TargetsHome() {
   const navigate = useNavigate();
@@ -141,10 +145,6 @@ function TargetsHome() {
     setEditData(false);
   };
 
-  const moveToUpload = () => {
-    navigate(`/survey-information/targets/upload/${survey_uid}/${form_uid}`);
-  };
-
   const handleFormUID = async () => {
     if (form_uid == "" || form_uid == undefined || form_uid == "undefined") {
       try {
@@ -176,10 +176,47 @@ function TargetsHome() {
       setTargetsCount(originalData.length);
 
       if (originalData.length == 0) {
+        navigate(
+          `/survey-information/targets/upload/${survey_uid}/${form_uid}`
+        );
         return;
       }
 
-      const columnsToExclude = ["target_uid", "target_locations"];
+      const columnsToExclude = [
+        "target_uid",
+        "target_locations",
+        "completed_flag",
+        "last_attempt_survey_status",
+        "last_attempt_survey_status_label",
+        "num_attempts",
+        "refusal_flag",
+        "revisit_sections",
+        "target_assignable",
+        "webapp_tag_color",
+      ];
+      //set targets column mapping
+
+      if (originalData[0]?.custom_fields?.column_mapping) {
+        dispatch(
+          setTargetsColumnMapping(
+            originalData[0]?.custom_fields?.column_mapping
+          )
+        );
+      } else {
+        const columnMapping: any = {};
+
+        for (const key in originalData[0]) {
+          if (
+            Object.prototype.hasOwnProperty.call(originalData[0], key) &&
+            key !== "custom_fields" &&
+            !columnsToExclude.includes(key)
+          ) {
+            columnMapping[key] = key;
+          }
+        }
+
+        dispatch(setTargetsColumnMapping(columnMapping));
+      }
 
       // Define column mappings
       let columnMappings = Object.keys(originalData[0])

src/modules/SurveyInformation/Targets/TargetsHome/TargetsHome.tsx

@@ -273,9 +273,7 @@ function TargetsMap() {
 
           setHasError(false);
           //route to manage
-          navigate(
-            `/survey-information/targets/manage/${survey_uid}/${form_uid}`
-          );
+          navigate(`/survey-information/targets/${survey_uid}/${form_uid}`);
         } else {
           message.error("Failed to upload kindly check and try again");
           setHasError(true);
@@ -404,6 +402,8 @@ function TargetsMap() {
       }
     }
 
+    console.log("lowestGeoLevel", lowestGeoLevel);
+
     return lowestGeoLevel;
   };
 
@@ -427,6 +427,8 @@ function TargetsMap() {
 
           const locationData = locationRes?.payload;
 
+          console.log("locationData", locationData);
+
           const lowestGeoLevel = findLowestGeoLevel(locationData);
 
           if (lowestGeoLevel?.geo_level_name) {