From 66ae43ef81fea918fb1c15227ab0ad51ab124f5d Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sun, 3 Mar 2024 23:59:33 -0600 Subject: [PATCH 1/6] more --- src/Components/Case/CaseDetailsPage.js | 10 ++++++---- src/Components/Document/DocEditPage.js | 10 +++++++++- src/Components/Document/DocumentListPage.js | 4 ++-- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/Components/Case/CaseDetailsPage.js b/src/Components/Case/CaseDetailsPage.js index 6c37722..8fd78cc 100644 --- a/src/Components/Case/CaseDetailsPage.js +++ b/src/Components/Case/CaseDetailsPage.js @@ -35,8 +35,10 @@ const CaseDetailsPage = () => { const message = "Parsing document. Please be patient, this may take several minutes."; - const handleNavigate = () => { - navigate("/documents"); + const handleNavigate = (docId, caseId) => { + //documentId, responseGenerations, caseId, documentType + let responseGenerations = 1; + navigate(`/docedit/${docId}/${responseGenerations}/${caseId}`); }; const handleNavEdit = (documentId, reqType, caseId) => { @@ -114,7 +116,7 @@ const CaseDetailsPage = () => { if (docType === "interrogatories-out") { setTimeout(handleNavEdit, 40000, docId, caseId); } else { - setTimeout(handleNavigate, 40000); + setTimeout(handleNavigate, 40000, docId, caseId); } }; @@ -149,7 +151,7 @@ const CaseDetailsPage = () => { if (!group) { return null; } - console.log("-----------------------------------------subCase", subCase); + const HeadingContent = () => { return (
diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index 08a440f..6216cdf 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -25,6 +25,7 @@ import "../../styles/docedit-page.scss"; const DocEditPage = () => { const { documentId, responseGenerations, caseId, documentType } = useParams(); const navigate = useNavigate(); + const [docType, setDocType] = useState(documentType); const [parsedRogs, setParsedRogs] = useState(); const [responses, setResponses] = useState([1]); const [fetchedCase, setFetchedCase] = useState(); @@ -127,7 +128,8 @@ const DocEditPage = () => { ]; /* - * GET docuement data from Firebase + * GET document data from Firebase + * * */ useEffect(() => { @@ -213,6 +215,12 @@ const DocEditPage = () => { const unsub = onSnapshot(docRef, (snapshot) => { if (snapshot.exists() && snapshot.data().ownerId === appUserId) { setDocument({ ...snapshot.data(), documentId: snapshot.id }); + if ( + docType === undefined || + (docType === null && document.length > 1) + ) { + setDocType(document.docType); + } } else { setDocument(null); } diff --git a/src/Components/Document/DocumentListPage.js b/src/Components/Document/DocumentListPage.js index 28cf26f..3a6ca8d 100644 --- a/src/Components/Document/DocumentListPage.js +++ b/src/Components/Document/DocumentListPage.js @@ -242,7 +242,7 @@ const DocumentListPage = ({ perPage }) => {
- {allRequestDocs.length > 0 ? ( + {allRequestDocs?.length > 0 ? ( allRequestDocs .slice((page - 1) * perPage, page * perPage) .map((doc, i) => ( @@ -279,7 +279,7 @@ const DocumentListPage = ({ perPage }) => {
- {allResponseDocs.length > 0 ? ( + {allResponseDocs?.length > 0 ? ( allResponseDocs .slice((page - 1) * perPage, page * perPage) .map((doc, i) => ( From 2ca944fa067551a481999a31283d843fb9daf597 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Mon, 4 Mar 2024 13:00:07 -0600 Subject: [PATCH 2/6] more --- src/App.js | 2 +- src/Components/Case/CaseDetailsPage.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/App.js b/src/App.js index a534005..dbdd5a1 100644 --- a/src/App.js +++ b/src/App.js @@ -101,7 +101,7 @@ function App() { /> diff --git a/src/Components/Case/CaseDetailsPage.js b/src/Components/Case/CaseDetailsPage.js index 8fd78cc..5fe5668 100644 --- a/src/Components/Case/CaseDetailsPage.js +++ b/src/Components/Case/CaseDetailsPage.js @@ -37,8 +37,8 @@ const CaseDetailsPage = () => { const handleNavigate = (docId, caseId) => { //documentId, responseGenerations, caseId, documentType - let responseGenerations = 1; - navigate(`/docedit/${docId}/${responseGenerations}/${caseId}`); + let docType = "interrogatories"; + navigate(`/documents/${docId}/${docType}/${caseId}`); }; const handleNavEdit = (documentId, reqType, caseId) => { From d27e5b8f6f3c83d652c8948f1ef23a8468154b14 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Mon, 4 Mar 2024 13:26:50 -0600 Subject: [PATCH 3/6] more --- src/App.js | 2 +- src/Components/Case/CaseDetailsPage.js | 5 +- src/Components/Document/DocEditPage.js | 10 +-- src/Components/Document/DocumentListPage.js | 69 +++++++++++++++++++++ 4 files changed, 79 insertions(+), 7 deletions(-) diff --git a/src/App.js b/src/App.js index dbdd5a1..1ad6448 100644 --- a/src/App.js +++ b/src/App.js @@ -101,7 +101,7 @@ function App() { /> diff --git a/src/Components/Case/CaseDetailsPage.js b/src/Components/Case/CaseDetailsPage.js index 5fe5668..b84d836 100644 --- a/src/Components/Case/CaseDetailsPage.js +++ b/src/Components/Case/CaseDetailsPage.js @@ -37,8 +37,9 @@ const CaseDetailsPage = () => { const handleNavigate = (docId, caseId) => { //documentId, responseGenerations, caseId, documentType - let docType = "interrogatories"; - navigate(`/documents/${docId}/${docType}/${caseId}`); + let documentType = "interrogatories"; + const documentId = docId; + navigate(`/documents/${documentId}/${documentType}/${caseId}`); }; const handleNavEdit = (documentId, reqType, caseId) => { diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index 6216cdf..a20adba 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -156,7 +156,7 @@ const DocEditPage = () => { } // TODO: possible *BUG* sometimes sends network req to gen repsonses after first (maybe state is not updating?) getParsedRequests(documentId, documentType); - if (responsesCreated > 0) { + if (responsesCreated > 2) { getCompletions(documentId) .then((data) => { const resp = data[0].responses.map((item, index) => { @@ -174,10 +174,12 @@ const DocEditPage = () => { */ useEffect(() => { + /* if (responsesCreated > 0) { return; } - if (responsesCreated < 1) { + */ + if (responsesCreated == 1) { if (documentType == "combined-numbered") { try { const res = generateResponsesCombined(documentId); @@ -300,12 +302,12 @@ const DocEditPage = () => { } async function generateResponses(documentId) { + /* if (responsesCreated > 0) { return; } - +*/ const docType = String(documentType); - let mode; //TODO: remove isRequests var const isRequests = false; diff --git a/src/Components/Document/DocumentListPage.js b/src/Components/Document/DocumentListPage.js index 3a6ca8d..951b52d 100644 --- a/src/Components/Document/DocumentListPage.js +++ b/src/Components/Document/DocumentListPage.js @@ -2,6 +2,7 @@ import { useContext, useEffect, useState, useRef } from "react"; import { useNavigate } from "react-router-dom"; import { AppContext } from "../../Hooks/useContext/appContext"; import SelectDropdown from "../../pageElements/SelectDropdown"; +import { useParams } from "react-router-dom"; import { DocCard } from "../../pageElements/Cards"; import { db } from "../../firebase"; import MobileContent from "../MobileContent"; @@ -21,6 +22,7 @@ import "../../styles/doclist-page.scss"; const DocumentListPage = ({ perPage }) => { const size = window.innerWidth < 440; + const { documentId, documentType, caseId } = useParams(); const [isMobile, setIsMobile] = useState(size); const { appState } = useContext(AppContext); const count = useRef(null); @@ -31,6 +33,7 @@ const DocumentListPage = ({ perPage }) => { const [allResponseDocs, setAllResponseDocs] = useState(null); const [allRequestDocs, setAllRequestDocs] = useState(null); const [totalPages, setTotalPages] = useState(1); + const [docId, setDocId] = useState(documentId); const { group } = appState; const [page, setPage] = useState(1); const [order, setOrder] = useState("parentCaseName"); @@ -58,6 +61,72 @@ const DocumentListPage = ({ perPage }) => { }; }, []); + async function generateResponsesCombined() { + if (!docId) { + return; + } + const docType = String(documentType); + const isRequests = false; + + try { + fetch( + `${apiUrl}/genResponseFromArrayCombined/${docId}/${docType}/${isRequests}`, + { + method: "GET", + } + ) + .then(function (response) { + return response.json(); + }) + .catch((err) => console.log(err)); + } catch (err) { + console.log("err", err); + } + } + + async function generateResponses() { + if (!docId) { + return; + } + const docId = String(documentId); + const docType = String(documentType); + const isRequests = false; + try { + fetch( + `${apiUrl}/genResponseFromArray/${docId}/${docType}/${isRequests}`, + { + method: "GET", + } + ) + .then(function (response) { + return response.json(); + }) + + .catch((err) => console.log(err)); + } catch (err) { + console.log("err", err); + } + } + + useEffect(() => { + if (!documentId || !documentType) { + return; + } + if (documentType == "combined-numbered") { + try { + const res = generateResponsesCombined(documentId, documentType); + } catch (err) { + console.log(err); + } + } else { + try { + const res = generateResponses(documentId, documentType); + } catch (err) { + console.log(err); + } + } + }, [documentId]); + function getRequests() { if (!appUserId) { setAllRequestDocs([]); From 15ee9bf1ef3b1b6692b1b70b51d760056d4b0290 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Mon, 4 Mar 2024 14:49:27 -0600 Subject: [PATCH 4/6] more --- src/App.js | 2 +- src/Components/Case/CaseDetailsPage.js | 4 +- src/Components/Document/DocumentListPage.js | 116 ++++++++------------ 3 files changed, 46 insertions(+), 76 deletions(-) diff --git a/src/App.js b/src/App.js index 1ad6448..af8a886 100644 --- a/src/App.js +++ b/src/App.js @@ -101,7 +101,7 @@ function App() { /> diff --git a/src/Components/Case/CaseDetailsPage.js b/src/Components/Case/CaseDetailsPage.js index b84d836..1072cac 100644 --- a/src/Components/Case/CaseDetailsPage.js +++ b/src/Components/Case/CaseDetailsPage.js @@ -38,8 +38,8 @@ const CaseDetailsPage = () => { const handleNavigate = (docId, caseId) => { //documentId, responseGenerations, caseId, documentType let documentType = "interrogatories"; - const documentId = docId; - navigate(`/documents/${documentId}/${documentType}/${caseId}`); + + navigate(`/documents/${docId}/${documentType}/${caseId}`); }; const handleNavEdit = (documentId, reqType, caseId) => { diff --git a/src/Components/Document/DocumentListPage.js b/src/Components/Document/DocumentListPage.js index 951b52d..4ecc5ba 100644 --- a/src/Components/Document/DocumentListPage.js +++ b/src/Components/Document/DocumentListPage.js @@ -22,7 +22,7 @@ import "../../styles/doclist-page.scss"; const DocumentListPage = ({ perPage }) => { const size = window.innerWidth < 440; - const { documentId, documentType, caseId } = useParams(); + const { docId, documentType, caseId } = useParams(); const [isMobile, setIsMobile] = useState(size); const { appState } = useContext(AppContext); const count = useRef(null); @@ -33,7 +33,6 @@ const DocumentListPage = ({ perPage }) => { const [allResponseDocs, setAllResponseDocs] = useState(null); const [allRequestDocs, setAllRequestDocs] = useState(null); const [totalPages, setTotalPages] = useState(1); - const [docId, setDocId] = useState(documentId); const { group } = appState; const [page, setPage] = useState(1); const [order, setOrder] = useState("parentCaseName"); @@ -43,6 +42,7 @@ const DocumentListPage = ({ perPage }) => { const [selectedDocumentType, setSelectedDocumentType] = useState(); const [showModal, setShowModal] = useState(false); const [verbValue, setVerbValue] = useState(1); + const apiUrl = process.env.NODE_ENV === "development" ? process.env.REACT_APP_API_DEV @@ -61,36 +61,17 @@ const DocumentListPage = ({ perPage }) => { }; }, []); - async function generateResponsesCombined() { - if (!docId) { + async function generateResponses(docId) { + /* + if (responsesCreated > 0) { return; } - const docType = String(documentType); - const isRequests = false; - - try { - fetch( - `${apiUrl}/genResponseFromArrayCombined/${docId}/${docType}/${isRequests}`, - { - method: "GET", - } - ) - .then(function (response) { - return response.json(); - }) - .catch((err) => console.log(err)); - } catch (err) { - console.log("err", err); - } - } - - async function generateResponses() { - if (!docId) { - return; - } - const docId = String(documentId); - const docType = String(documentType); +*/ + console.log("docId in generate responses", docId); + //const docType = String(documentType); + //TODO: remove isRequests var const isRequests = false; + const docType = "interrogatories"; try { fetch( `${apiUrl}/genResponseFromArray/${docId}/${docType}/${isRequests}`, @@ -101,7 +82,6 @@ const DocumentListPage = ({ perPage }) => { .then(function (response) { return response.json(); }) - .catch((err) => console.log(err)); } catch (err) { console.log("err", err); @@ -109,22 +89,13 @@ const DocumentListPage = ({ perPage }) => { } useEffect(() => { - if (!documentId || !documentType) { + if (!documentId) { return; } - if (documentType == "combined-numbered") { - try { - const res = generateResponsesCombined(documentId, documentType); - } catch (err) { - console.log(err); - } - } else { - try { - const res = generateResponses(documentId, documentType); - } catch (err) { - console.log(err); - } - } + console.log("useEffect fired in doc list to gen responses"); + generateResponses(documentId).then((response) => { + console.log("response", response); + }); }, [documentId]); function getRequests() { @@ -298,18 +269,22 @@ const DocumentListPage = ({ perPage }) => { {allResponseDocs === null && allRequestDocs === null ? (
Loading...
) : null} -
-
Discovery Request Documents
-
-
- + {allRequestDocs != null && allRequestDocs.length > 0 ? ( +
+
Discovery Request Documents
+
+
+ +
-
+ ) : ( + <> + )}
{allRequestDocs?.length > 0 ? ( allRequestDocs @@ -335,18 +310,22 @@ const DocumentListPage = ({ perPage }) => { <> )}
-
-
Discovery Response Documents
-
-
- + {allResponseDocs != null && allResponseDocs.length > 0 ? ( +
+
Discovery Response Documents
+
+
+ +
-
+ ) : ( + <> + )}
{allResponseDocs?.length > 0 ? ( allResponseDocs @@ -474,15 +453,6 @@ export default DocumentListPage;
) : null} - - - - - - - - -
Response Verbosity
From 9a3c69099e94ca952836e9243c5ac2d854a7c652 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Mon, 4 Mar 2024 14:55:42 -0600 Subject: [PATCH 5/6] more --- src/App.js | 2 +- src/Components/Case/CaseDetailsPage.js | 5 +++-- src/Components/Document/DocumentListPage.js | 3 --- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/App.js b/src/App.js index af8a886..aef5426 100644 --- a/src/App.js +++ b/src/App.js @@ -101,7 +101,7 @@ function App() { /> diff --git a/src/Components/Case/CaseDetailsPage.js b/src/Components/Case/CaseDetailsPage.js index 1072cac..b5bd953 100644 --- a/src/Components/Case/CaseDetailsPage.js +++ b/src/Components/Case/CaseDetailsPage.js @@ -37,9 +37,10 @@ const CaseDetailsPage = () => { const handleNavigate = (docId, caseId) => { //documentId, responseGenerations, caseId, documentType - let documentType = "interrogatories"; + console.log("handle navigate fired docId", docId); + let docType = "interrogatories"; - navigate(`/documents/${docId}/${documentType}/${caseId}`); + navigate(`/documents/${docId}/${docType}/${caseId}`); }; const handleNavEdit = (documentId, reqType, caseId) => { diff --git a/src/Components/Document/DocumentListPage.js b/src/Components/Document/DocumentListPage.js index 4ecc5ba..b6cbdac 100644 --- a/src/Components/Document/DocumentListPage.js +++ b/src/Components/Document/DocumentListPage.js @@ -89,9 +89,6 @@ const DocumentListPage = ({ perPage }) => { } useEffect(() => { - if (!documentId) { - return; - } console.log("useEffect fired in doc list to gen responses"); generateResponses(documentId).then((response) => { console.log("response", response); From 8a9b8359f410e22178cfc92eab1137d312a584a5 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Mon, 4 Mar 2024 15:21:24 -0600 Subject: [PATCH 6/6] more --- src/Components/Document/DocumentListPage.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Components/Document/DocumentListPage.js b/src/Components/Document/DocumentListPage.js index b6cbdac..710f4f8 100644 --- a/src/Components/Document/DocumentListPage.js +++ b/src/Components/Document/DocumentListPage.js @@ -89,8 +89,11 @@ const DocumentListPage = ({ perPage }) => { } useEffect(() => { - console.log("useEffect fired in doc list to gen responses"); - generateResponses(documentId).then((response) => { + console.log( + "useEffect fired in doc list to gen response here's docId", + docId + ); + generateResponses(docId).then((response) => { console.log("response", response); }); }, [documentId]);