more

src/Components/Document/DocumentListPage.js

@@ -1,4 +1,11 @@
-import { useContext, useEffect, useState, useRef } from "react";
+import {
+  useContext,
+  useEffect,
+  useState,
+  useRef,
+  useFocusEffect,
+  useCallback,
+} from "react";
 import { useNavigate } from "react-router-dom";
 import { AppContext } from "../../Hooks/useContext/appContext";
 import SelectDropdown from "../../pageElements/SelectDropdown";
@@ -90,27 +97,19 @@ const DocumentListPage = ({ perPage }) => {
       }
       setTotalPages(pages);
       setAllDocs(data);
+      const temp = allDocs?.filter((doc) => {
+        return doc.docType != "interrogatories-out";
+      });
+      const temp2 = allDocs?.filter((doc) => {
+        return doc.docType === "interrogatories-out";
+      });
+      setRespDocs(temp);
+      setReqDocs(temp2);
     });
     return unsub;
   }
 
-  const seperateDocuments = () => {
-    if (!allDocs) {
-      return;
-    }
-    const temp = allDocs.filter((doc) => {
-      return doc.docType != "interrogatories-out";
-    });
-    const temp2 = allDocs.filter((doc) => {
-      return doc.docType === "interrogatories-out";
-    });
-    setRespDocs(temp);
-    setReqDocs(temp2);
-  };
-
-  useEffect(getDocuments, [appUserId, order]);
-
-  useEffect(seperateDocuments, [appUserId]);
+  useEffect(getDocuments, [appUserId, order, respDocs, reqDocs]);
 
   async function deleteFromDb(documentId) {
     if (isBusy) {