From 6aba1f66cbb8eb5caaf1f997adf31bd8af5c00f8 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Thu, 14 Mar 2024 02:31:33 -0500 Subject: [PATCH 1/3] more --- src/Components/Case/CaseDetailsPage.js | 20 ++++++++++++++------ src/Components/Document/DocEditPage.js | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/Components/Case/CaseDetailsPage.js b/src/Components/Case/CaseDetailsPage.js index 24b7767..a8f8ad3 100644 --- a/src/Components/Case/CaseDetailsPage.js +++ b/src/Components/Case/CaseDetailsPage.js @@ -47,15 +47,23 @@ const CaseDetailsPage = () => { const data = doc.data(); if (data.docType != undefined) { console.log( - "getDocument has returned a docType---------------------------------------------------------------" + "getDocument has returned docType---------------------------------------------------------------", + data.docType ); const caseId = data.parentCaseId; const docType = data.docType; const clientPosition = data.clientPosition; - const responseGenerations = 0; - navigate( - `/docedit/${docId}/${caseId}/${docType}/${clientPosition}/${responseGenerations}` - ); + if (docType != "combined-numbered") { + const responseGenerations = 1; + navigate( + `/docedit/${docId}/${caseId}/${docType}/${clientPosition}/${responseGenerations}` + ); + } else if (docType == "combined-numbered") { + const responseGenerations = 0; + navigate( + `/docedit/${docId}/${caseId}/${docType}/${clientPosition}/${responseGenerations}` + ); + } } else { setTimeout(getDocument, 30000, docId, caseId); } @@ -67,7 +75,7 @@ const CaseDetailsPage = () => { function handleIncomingDiscoveryRequest(docId, isComplaint, clientPosition) { //ONLY TRIGGER FROM THIS SIDE (next page) IF IT IS COMBINED NUMBERED - setTimeout(generateRespIncomingDiscReq, 30000, docId, clientPosition); + setTimeout(generateRespIncomingDiscReq, 20000, docId, clientPosition); const res = getDocument(docId); if (res === "combined-numbered") { const documentId = docId; diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index 4a092b6..d5ab6cd 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -281,7 +281,7 @@ const DocEditPage = (props) => { if (!docType) { return; } - if (responsesCreated < 1) { + if (docType == "combined-numbered") { setIsLoading(true); generateRespIncominIrregDiscReq(documentId, clientPosition); } From a205e950d7eb6f6b1553b834b86ae09221f3c6c3 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Thu, 14 Mar 2024 03:35:39 -0500 Subject: [PATCH 2/3] more --- src/Components/Case/CaseDetailsPage.js | 13 +++++--- src/Components/Document/DocEditPage.js | 46 ++++++++++++-------------- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/Components/Case/CaseDetailsPage.js b/src/Components/Case/CaseDetailsPage.js index a8f8ad3..285c20f 100644 --- a/src/Components/Case/CaseDetailsPage.js +++ b/src/Components/Case/CaseDetailsPage.js @@ -54,11 +54,17 @@ const CaseDetailsPage = () => { const docType = data.docType; const clientPosition = data.clientPosition; if (docType != "combined-numbered") { + console.log( + "docType != combined-numbered~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + ); const responseGenerations = 1; navigate( `/docedit/${docId}/${caseId}/${docType}/${clientPosition}/${responseGenerations}` ); } else if (docType == "combined-numbered") { + console.log( + "docType is equal to combined-numbered~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + ); const responseGenerations = 0; navigate( `/docedit/${docId}/${caseId}/${docType}/${clientPosition}/${responseGenerations}` @@ -75,11 +81,8 @@ const CaseDetailsPage = () => { function handleIncomingDiscoveryRequest(docId, isComplaint, clientPosition) { //ONLY TRIGGER FROM THIS SIDE (next page) IF IT IS COMBINED NUMBERED - setTimeout(generateRespIncomingDiscReq, 20000, docId, clientPosition); - const res = getDocument(docId); - if (res === "combined-numbered") { - const documentId = docId; - } + setTimeout(generateRespIncomingDiscReq, 10000, docId, clientPosition); + setTimeout(getDocument, 50000, docId); } // isComplaint = true - NEVER CHANGE THIS/THESE ARGS async function generateOutgoingDiscReq(docId, clientPosition) { diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index d5ab6cd..4f99ab6 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -167,19 +167,26 @@ const DocEditPage = (props) => { } } - async function getParsedRogs(docId, docType) { - if (!docId || !docType) { + async function getParsedRequests(documentId, docType) { + if (!documentId || !docType) { return; } - console.log("getparsedrogs fired"); - const response = await fetch( - `${apiUrl}/v1/get-parsed-requests/${docId}/${docType}`, - { - method: "GET", + try { + const response = await fetch( + `${apiUrl}/v1/get-parsed-requests/${documentId}/${docType}`, + { + method: "GET", + } + ); + const res = await response.json(); + + const req = res[0].requests; + if (req.length > 1) { + setParsedRogs(req); } - ); - const resp = await response.json(); - return resp; + } catch (err) { + console.log("Error occured:", err); + } } useEffect(() => { @@ -205,23 +212,16 @@ const DocEditPage = (props) => { }, [caseId, documentId]); useEffect(() => { - getParsedRogs(documentId, docType) - .then((data) => { - data && console.log("data in useEffect for getParsedRogs", data); - const respond = data[0].requests?.length > 2 ? data[0].requests : null; - const resp = respond?.map((item, index) => { - // NEVER CHANGE THIS: - return { showInputEle: false, text: item?.text, index: index }; - }); - setParsedRogs(resp); - }) - .catch((err) => console.log(err)); + getParsedRequests(documentId, docType); }, [documentId, docType]); async function getCompletions(docId, docType) { if (!docId || !docType) { return; } + console.log( + "--_~_~_~_~_~_~_~_~__--- - - - f -- - - - -- -- -getCompletions in decedit" + ); const response = await fetch( `${apiUrl}/v1/get-completions/${docId}/${docType}`, { @@ -296,9 +296,7 @@ const DocEditPage = (props) => { setIsLoading(true); getCompletions(documentId, docType) .then((data) => { - const respond = - data[0].responses.length > 2 ? data[0].responses : null; - const resp = respond?.map((item, index) => { + const resp = data[0].responses.map((item, index) => { // NEVER CHANGE THIS: return { showInputEle: false, resp: item?.text, index: index }; }); From 75fa6c004be4b9cd4a1e801182825ee9f274c17c Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Thu, 14 Mar 2024 03:36:38 -0500 Subject: [PATCH 3/3] more --- src/Components/Case/CaseDetailsPage.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Components/Case/CaseDetailsPage.js b/src/Components/Case/CaseDetailsPage.js index 285c20f..a5adff7 100644 --- a/src/Components/Case/CaseDetailsPage.js +++ b/src/Components/Case/CaseDetailsPage.js @@ -55,7 +55,7 @@ const CaseDetailsPage = () => { const clientPosition = data.clientPosition; if (docType != "combined-numbered") { console.log( - "docType != combined-numbered~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + "docType != combined-numbered~~~~~~~~~~~~~~~~~~~~~~>>>~~~~~~~~~~~~" ); const responseGenerations = 1; navigate( @@ -63,7 +63,7 @@ const CaseDetailsPage = () => { ); } else if (docType == "combined-numbered") { console.log( - "docType is equal to combined-numbered~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + "docType is equal to combined-numbered~~~~~~~>>>~~~~~~~~~~~~~~~~~~~~~~" ); const responseGenerations = 0; navigate(