From d27e5b8f6f3c83d652c8948f1ef23a8468154b14 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Mon, 4 Mar 2024 13:26:50 -0600 Subject: [PATCH] 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([]);