Ddsspb 80 (#127)

Author: thegeektets

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

@@ -186,6 +186,10 @@ function EnumeratorsHome() {
       const originalData = enumeratorRes.payload.data.data;
 
       if (originalData.length == 0) {
+        //move to upload if it is a fresh upload
+        navigate(
+          `/survey-information/enumerators/upload/${survey_uid}/${form_uid}`
+        );
         return;
       }
 
@@ -377,13 +381,18 @@ function EnumeratorsHome() {
   };
 
   useEffect(() => {
-    //redirect to upload if missing csvHeaders and cannot perform mapping
-    //TODO: update this for configured surveys already
-    handleFormUID();
-    if (form_uid) {
-      getEnumeratorsList(form_uid);
-    }
-  }, []);
+    const fetchData = async () => {
+      // redirect to upload if missing csvHeaders and cannot perform mapping
+      // TODO: update this for configured surveys already
+      await handleFormUID();
+
+      if (form_uid) {
+        getEnumeratorsList(form_uid);
+      }
+    };
+
+    fetchData();
+  }, [form_uid]);
 
   return (
     <>

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

@@ -64,6 +64,17 @@ function TargetsHome() {
   // Row selection state and handler
   const [selectedRows, setSelectedRows] = useState<any>([]);
 
+  /*
+   * New design configs
+   */
+  const [screenMode, setScreenMode] = useState<string>("manage");
+  const [newTargetModal, setNewTargetModal] = useState<boolean>(false);
+
+  // Mode: overwrite or merge
+  const [newTargetMode, setNewTargetMode] = useState<string>("");
+
+  const [isTargetInUse, setIsTargetInUse] = useState<boolean>(false);
+
   const onSelectChange = (selectedRowKeys: React.Key[], selectedRows: any) => {
     const selectedTargetIds = selectedRows.map((row: any) => row.target_id);
 
@@ -246,26 +257,6 @@ function TargetsHome() {
     }
   };
 
-  useEffect(() => {
-    //redirect to upload if missing csvHeaders and cannot perform mapping
-    //TODO: update this for configured surveys already
-    handleFormUID();
-    if (form_uid) {
-      getTargetsList(form_uid);
-    }
-  }, []);
-
-  /*
-   * New design configs
-   */
-  const [screenMode, setScreenMode] = useState<string>("manage");
-  const [newTargetModal, setNewTargetModal] = useState<boolean>(false);
-
-  // Mode: overwrite or merge
-  const [newTargetMode, setNewTargetMode] = useState<string>("");
-
-  const [isTargetInUse, setIsTargetInUse] = useState<boolean>(false);
-
   const handleNewTargetMode = () => {
     // Emit error if no new targets mode is selected
     if (newTargetMode === "") {
@@ -292,6 +283,20 @@ function TargetsHome() {
     }
   };
 
+  useEffect(() => {
+    const fetchData = async () => {
+      // redirect to upload if missing csvHeaders and cannot perform mapping
+      // TODO: update this for configured surveys already
+      await handleFormUID();
+
+      if (form_uid) {
+        getTargetsList(form_uid);
+      }
+    };
+
+    fetchData();
+  }, [form_uid]);
+
   return (
     <>
       <Header />