From f312e6cb1b0b4970ec0a8a33230515dea0c540da Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sat, 2 Mar 2024 21:16:11 -0600
Subject: [PATCH 1/6] more

---
 src/Components/Document/DocumentListPage.js | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Components/Document/DocumentListPage.js b/src/Components/Document/DocumentListPage.js
index a73618f..fe77231 100644
--- a/src/Components/Document/DocumentListPage.js
+++ b/src/Components/Document/DocumentListPage.js
@@ -27,6 +27,7 @@ const DocumentListPage = ({ perPage }) => {
   const [showDeleteModal, setShowDeleteModal] = useState(false);
   const [selectedDocumentId, setSelectedDocumentId] = useState(null);
   const [allDocs, setAllDocs] = useState(null);
+  const [respDocs, setRespDocs] = useState(null);
   const { appState } = useContext(AppContext);
   const [totalPages, setTotalPages] = useState(1);
   const { group } = appState;
@@ -92,8 +93,21 @@ const DocumentListPage = ({ perPage }) => {
     return unsub;
   }
 
+  const seperateDocuments = () => {
+    if (!allDocs) {
+      return;
+    }
+    const temp = allDocs.filter((doc) => {
+      return doc.docType != "interrogatories-out";
+    });
+    console.log("temp", temp);
+    setRespDocs(temp);
+  };
+
   useEffect(getDocuments, [appUserId, order]);
 
+  useEffect(seperateDocuments, [appUserId]);
+
   async function deleteFromDb(documentId) {
     if (isBusy) {
       return;
@@ -209,8 +223,8 @@ const DocumentListPage = ({ perPage }) => {
               <></>
             )}
             <div className="document-list-lower-wrapper">
-              {allDocs.length > 0 ? (
-                allDocs
+              {respDocs.length > 0 ? (
+                respDocs
                   .slice((page - 1) * perPage, page * perPage)
                   .map((doc, i) => (
                     <DocCard

From e9186aca01b8f56d18e64ecfa55c67c3bc3bf67a Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sat, 2 Mar 2024 21:21:55 -0600
Subject: [PATCH 2/6] more

---
 src/Components/Document/DocumentListPage.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Components/Document/DocumentListPage.js b/src/Components/Document/DocumentListPage.js
index fe77231..9acd6f9 100644
--- a/src/Components/Document/DocumentListPage.js
+++ b/src/Components/Document/DocumentListPage.js
@@ -100,7 +100,7 @@ const DocumentListPage = ({ perPage }) => {
     const temp = allDocs.filter((doc) => {
       return doc.docType != "interrogatories-out";
     });
-    console.log("temp", temp);
+
     setRespDocs(temp);
   };
 
@@ -206,7 +206,7 @@ const DocumentListPage = ({ perPage }) => {
               <div className="document-list-upper-wrapper">
                 <div className="list-upper-left">
                   <div className="doc-list-subhead-container">
-                    <div className="doc-list-subhead">Discovery Requests</div>
+                    <div className="doc-list-subhead">Discovery Responses</div>
                   </div>
                 </div>
                 <div className="list-upper-right">
@@ -223,7 +223,7 @@ const DocumentListPage = ({ perPage }) => {
               <></>
             )}
             <div className="document-list-lower-wrapper">
-              {respDocs.length > 0 ? (
+              {respDocs && respDocs.length > 0 ? (
                 respDocs
                   .slice((page - 1) * perPage, page * perPage)
                   .map((doc, i) => (

From 531470d62931e07eddd594cebb38a4ec48bd1515 Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sat, 2 Mar 2024 21:32:30 -0600
Subject: [PATCH 3/6] more

---
 src/Components/Document/DocumentListPage.js | 124 +++++++++++++++++---
 1 file changed, 106 insertions(+), 18 deletions(-)

diff --git a/src/Components/Document/DocumentListPage.js b/src/Components/Document/DocumentListPage.js
index 9acd6f9..6314b34 100644
--- a/src/Components/Document/DocumentListPage.js
+++ b/src/Components/Document/DocumentListPage.js
@@ -28,6 +28,7 @@ const DocumentListPage = ({ perPage }) => {
   const [selectedDocumentId, setSelectedDocumentId] = useState(null);
   const [allDocs, setAllDocs] = useState(null);
   const [respDocs, setRespDocs] = useState(null);
+  const [reqDocs, setReqDocs] = useState(null);
   const { appState } = useContext(AppContext);
   const [totalPages, setTotalPages] = useState(1);
   const { group } = appState;
@@ -100,8 +101,11 @@ const DocumentListPage = ({ perPage }) => {
     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]);
@@ -200,6 +204,107 @@ const DocumentListPage = ({ perPage }) => {
           <div className="user-name-container">{group.firm}</div>
         </div>
         {allDocs === null ? <div>Loading...</div> : null}
+        <div className="content-container">
+          <div className="document-list-upper-wrapper">
+            <div className="list-upper-left">
+              <div className="doc-list-subhead-container">
+                <div className="doc-list-subhead">Discovery Responses</div>
+              </div>
+            </div>
+            <div className="list-upper-right">
+              <div className="d-flex justify-content-end mb-3">
+                <SelectDropdown
+                  dropDownOptions={dropDownOptions}
+                  titleText="Sort documents"
+                  handleSelect={setOrder}
+                />
+              </div>
+            </div>
+          </div>
+          <div className="document-list-lower-wrapper">
+            {respDocs && respDocs.length > 0 ? (
+              respDocs.map((doc, i) => (
+                <DocCard
+                  key={`doccard-${i}`}
+                  title={doc.docTitle}
+                  parentCaseNumber={doc.parentCaseNumber}
+                  parentCaseName={doc.parentCaseName}
+                  parentCaseId={doc.parentCaseId}
+                  createdAt={doc.createdAt}
+                  docType={doc.docType}
+                  documentId={doc.documentId}
+                  dateServed={doc.dateServed}
+                  confirmDelete={confirmDelete}
+                  handleNavigate={handleNavigate}
+                  displayDeleteButton={true}
+                  responseGenerations={doc.responseGenerations}
+                />
+              ))
+            ) : (
+              <></>
+            )}
+          </div>
+        </div>
+        <div className="content-container">
+          <div className="document-list-upper-wrapper">
+            <div className="list-upper-left">
+              <div className="doc-list-subhead-container">
+                <div className="doc-list-subhead">Discovery Responses</div>
+              </div>
+            </div>
+            <div className="list-upper-right">
+              <div className="d-flex justify-content-end mb-3">
+                <SelectDropdown
+                  dropDownOptions={dropDownOptions}
+                  titleText="Sort documents"
+                  handleSelect={setOrder}
+                />
+              </div>
+            </div>
+          </div>
+          <div className="document-list-lower-wrapper">
+            {reqDocs && reqDocs.length > 0 ? (
+              reqDocs.map((doc, i) => (
+                <DocCard
+                  key={`doccard-${i}`}
+                  title={doc.docTitle}
+                  parentCaseNumber={doc.parentCaseNumber}
+                  parentCaseName={doc.parentCaseName}
+                  parentCaseId={doc.parentCaseId}
+                  createdAt={doc.createdAt}
+                  docType={doc.docType}
+                  documentId={doc.documentId}
+                  dateServed={doc.dateServed}
+                  confirmDelete={confirmDelete}
+                  handleNavigate={handleNavigate}
+                  displayDeleteButton={true}
+                  responseGenerations={doc.responseGenerations}
+                />
+              ))
+            ) : (
+              <></>
+            )}
+          </div>
+        </div>
+        {showDeleteModal && selectedDocumentId !== null ? (
+          <ConfirmModal
+            onCancel={handleCancelDelete}
+            onConfirm={handleDeleteDocument}
+            buttonLabelText="Delete"
+            modalText="Confirm that you want to permanently delete this document."
+          />
+        ) : null}
+      </>
+    );
+  };
+  return isMobile ? <MobileContent /> : <DesktopContent />;
+};
+
+export default DocumentListPage;
+
+/*
+
+
         {allDocs !== null ? (
           <div className="content-container">
             {allDocs.length > 0 ? (
@@ -288,23 +393,6 @@ const DocumentListPage = ({ perPage }) => {
             ) : null}
           </div>
         ) : null}
-        {showDeleteModal && selectedDocumentId !== null ? (
-          <ConfirmModal
-            onCancel={handleCancelDelete}
-            onConfirm={handleDeleteDocument}
-            buttonLabelText="Delete"
-            modalText="Confirm that you want to permanently delete this document."
-          />
-        ) : null}
-      </>
-    );
-  };
-  return isMobile ? <MobileContent /> : <DesktopContent />;
-};
-
-export default DocumentListPage;
-
-/*
                   <div className="toggle-outer">
                     <div className="toggle-header">
                       {" "}

From bdfdffb634997d1804dadc630ba0b5a3f8b2447f Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sat, 2 Mar 2024 21:37:25 -0600
Subject: [PATCH 4/6] more

---
 src/Components/Document/DocumentListPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/Document/DocumentListPage.js b/src/Components/Document/DocumentListPage.js
index 6314b34..9339495 100644
--- a/src/Components/Document/DocumentListPage.js
+++ b/src/Components/Document/DocumentListPage.js
@@ -249,7 +249,7 @@ const DocumentListPage = ({ perPage }) => {
           <div className="document-list-upper-wrapper">
             <div className="list-upper-left">
               <div className="doc-list-subhead-container">
-                <div className="doc-list-subhead">Discovery Responses</div>
+                <div className="doc-list-subhead">Discovery Requests</div>
               </div>
             </div>
             <div className="list-upper-right">

From 00346d42fb4e3d301155a808062907178d5fc0a7 Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sat, 2 Mar 2024 21:53:49 -0600
Subject: [PATCH 5/6] more

---
 src/Components/Document/DocumentListPage.js | 35 ++++++++++-----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/Components/Document/DocumentListPage.js b/src/Components/Document/DocumentListPage.js
index 9339495..d2168d1 100644
--- a/src/Components/Document/DocumentListPage.js
+++ b/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) {

From a547c7a7f411a2e9aad3997eaaec5e2e9186b031 Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sat, 2 Mar 2024 21:59:40 -0600
Subject: [PATCH 6/6] more

---
 src/Components/Document/DocumentListPage.js | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/Components/Document/DocumentListPage.js b/src/Components/Document/DocumentListPage.js
index d2168d1..3cc5290 100644
--- a/src/Components/Document/DocumentListPage.js
+++ b/src/Components/Document/DocumentListPage.js
@@ -41,6 +41,8 @@ const DocumentListPage = ({ perPage }) => {
   const { group } = appState;
   const [page, setPage] = useState(1);
   const [order, setOrder] = useState("parentCaseName");
+  const [lowerOrder, setLowerOrder] = useState("parentCaseName");
+  const [upperOrder, setUpperOrder] = useState("parentCaseName");
   const appUserId = group ? group.appUserId : null;
   const [isBusy, setIsBusy] = useState(false);
   const [selectedDocumentType, setSelectedDocumentType] = useState();
@@ -78,19 +80,7 @@ const DocumentListPage = ({ perPage }) => {
         ...doc.data(),
         documentId: doc.id,
       }));
-      if (order === "parentCaseName") {
-        data.sort((a, b) => {
-          return a.parentCaseName.toLowerCase() > b.parentCaseName.toLowerCase()
-            ? 1
-            : -1;
-        });
-      } else if (order === "parentCaseName2") {
-        data.sort((a, b) => {
-          return a.parentCaseName.toLowerCase() < b.parentCaseName.toLowerCase()
-            ? 1
-            : -1;
-        });
-      }
+
       const pages = Math.ceil(data.length / perPage);
       if (page > pages) {
         setPage(pages);
@@ -215,7 +205,7 @@ const DocumentListPage = ({ perPage }) => {
                 <SelectDropdown
                   dropDownOptions={dropDownOptions}
                   titleText="Sort documents"
-                  handleSelect={setOrder}
+                  handleSelect={setUpperOrder}
                 />
               </div>
             </div>
@@ -256,7 +246,7 @@ const DocumentListPage = ({ perPage }) => {
                 <SelectDropdown
                   dropDownOptions={dropDownOptions}
                   titleText="Sort documents"
-                  handleSelect={setOrder}
+                  handleSelect={setLowerOrder}
                 />
               </div>
             </div>