From 198311543e20f52e7cbbd53ced9e2ba8df3bde3d Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Wed, 13 Mar 2024 08:14:04 -0500 Subject: [PATCH 1/6] more --- src/Components/Document/DocEditPage.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index 27536dc..87812f1 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -248,7 +248,7 @@ const DocEditPage = (props) => { } useEffect(() => { - if (!docType || docType != "combined-numbered") { + if (!docType) { return; } if (responsesCreated < 1) { @@ -258,7 +258,6 @@ const DocEditPage = (props) => { }, [documentId, docType, docType]); useEffect(() => { - console.log("docType in second useEffect", docType); if (!docType) { return; } @@ -296,6 +295,7 @@ const DocEditPage = (props) => { useEffect(() => { getParsedRogs(documentId, docType) .then((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: @@ -349,7 +349,9 @@ const DocEditPage = (props) => { } else { setShowErrorModal(true); } - setIsBusy(false); + window.scrollTo(0, 0); + setTimeout(setIsBusy, 4000, false); + //setIsBusy(false); } async function getDocx() { From 13ba4035e181d44fe4b40a5b070beae38228e550 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Wed, 13 Mar 2024 23:28:49 -0500 Subject: [PATCH 2/6] More --- src/Components/Document/DocEditPage.js | 74 +++++++++++++------------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index 87812f1..ff8181b 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -141,7 +141,7 @@ const DocEditPage = (props) => { const docRef = doc(db, "documents", `${docId}`); const docSnap = await getDoc(docRef); if (docSnap.exists()) { - const data = docSnap.data(); + const data = docSnap?.data(); return data; } else { console.log("DB item does not exist"); @@ -156,7 +156,7 @@ const DocEditPage = (props) => { const docRef = doc(db, "cases", `${caseId}`); const docSnap = await getDoc(docRef); if (docSnap.exists()) { - const _case = docSnap.data(); + const _case = docSnap?.data(); _case.id = docSnap._key.path.segments[1]; setFetchedCase(_case); } else { @@ -167,6 +167,21 @@ const DocEditPage = (props) => { } } + async function getParsedRogs(docId, docType) { + if (!docId || !docType) { + return; + } + console.log("getparsedrogs fired"); + const response = await fetch( + `${apiUrl}/v1/get-parsed-requests/${docId}/${docType}`, + { + method: "GET", + } + ); + const resp = await response.json(); + return resp; + } + useEffect(() => { if (!documentId) { return; @@ -174,7 +189,7 @@ const DocEditPage = (props) => { getDocument(documentId) .then((data) => { setDocument(data); - const tempType = data.docType; + const tempType = data?.docType; return tempType; }) .then((type) => { @@ -189,6 +204,20 @@ const DocEditPage = (props) => { getCase(caseId); }, [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)); + }, [documentId, docType]); + async function getCompletions(docId, docType) { if (!docId || !docType) { return; @@ -221,12 +250,12 @@ const DocEditPage = (props) => { return response.json(); }) .then((data) => { - console.log("data in generateRespIncominIrregDiscReq", data); + data && console.log("data in generateRespIncominIrregDiscReq", data); const respArray = data[0].responses; const result = respArray?.map((item, index) => { let obj = {}; obj["showInputEle"] = false; - obj["resp"] = item.text; + obj["resp"] = item?.text; obj["index"] = index; return obj; }); @@ -247,6 +276,7 @@ const DocEditPage = (props) => { setResponsesCreated((responsesCreated) => responsesCreated + 1); } + /* useEffect(() => { if (!docType) { return; @@ -256,7 +286,7 @@ const DocEditPage = (props) => { generateRespIncominIrregDiscReq(documentId, clientPosition); } }, [documentId, docType, docType]); - +*/ useEffect(() => { if (!docType) { return; @@ -269,41 +299,13 @@ const DocEditPage = (props) => { data[0].responses.length > 2 ? data[0].responses : null; const resp = respond?.map((item, index) => { // NEVER CHANGE THIS: - return { showInputEle: false, resp: item.text, index: index }; + return { showInputEle: false, resp: item?.text, index: index }; }); setResponses(resp); setIsLoading(false); }) .catch((err) => console.log(err)); } - }, [documentId, docType, responseGenerations]); - - async function getParsedRogs(docId, docType) { - if (!docId || !docType) { - return; - } - const response = await fetch( - `${apiUrl}/v1/get-parsed-requests/${docId}/${docType}`, - { - method: "GET", - } - ); - const resp = await response.json(); - return resp; - } - - useEffect(() => { - getParsedRogs(documentId, docType) - .then((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)); }, [documentId, docType]); async function postEditedResponses(docId, docType) { @@ -436,7 +438,7 @@ const DocEditPage = (props) => { }, } ); - console.log("++=================================resp", resp); + return resp; } } catch (err) { From 0c871e1b445479cad7e0f3fe5260ee0ca2bc3440 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Wed, 13 Mar 2024 23:33:42 -0500 Subject: [PATCH 3/6] more --- src/Components/Document/DocEditPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index ff8181b..c132631 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -291,7 +291,7 @@ const DocEditPage = (props) => { if (!docType) { return; } - if (responseGenerations > 1) { + if (docType != "combined-numbered") { setIsLoading(true); getCompletions(documentId, docType) .then((data) => { From 36cae8556a286eb50cbcba1693b7aa853f5a8e8e Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Thu, 14 Mar 2024 00:04:08 -0500 Subject: [PATCH 4/6] more --- src/Components/Case/CaseDetailsPage.js | 8 ++++++-- src/Components/Document/DocEditPage.js | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Components/Case/CaseDetailsPage.js b/src/Components/Case/CaseDetailsPage.js index f10bf96..d5fc4d7 100644 --- a/src/Components/Case/CaseDetailsPage.js +++ b/src/Components/Case/CaseDetailsPage.js @@ -46,6 +46,9 @@ const CaseDetailsPage = () => { if (doc.exists) { const data = doc.data(); if (data.docType != undefined) { + console.log( + "getDocument has returned a docType---------------------------------------------------------------" + ); const caseId = data.parentCaseId; const docType = data.docType; const clientPosition = data.clientPosition; @@ -63,13 +66,14 @@ const CaseDetailsPage = () => { } function handleIncomingDiscoveryRequest(docId, isComplaint, clientPosition) { - generateRespIncomingDiscReq(docId, clientPosition); + //DONT WANT< RIGHT - ONLY TRIGGER FROM THIS SIDE IF IT IS COMBINED NUMBERED + //generateRespIncomingDiscReq(docId, clientPosition); const res = getDocument(docId); if (res === "combined-numbered") { const documentId = docId; } } - // isComplaint = true - NEVER CHANGE THESE ARGS + // isComplaint = true - NEVER CHANGE THIS/THESE ARGS async function generateOutgoingDiscReq(docId, clientPosition) { try { const response = await fetch( diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index c132631..4a092b6 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -287,6 +287,7 @@ const DocEditPage = (props) => { } }, [documentId, docType, docType]); */ + useEffect(() => { if (!docType) { return; From 5275735f74e096a14f30e0e65c618f3333ba7b80 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Thu, 14 Mar 2024 01:34:35 -0500 Subject: [PATCH 5/6] more --- src/styles/howTo-page.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/howTo-page.scss b/src/styles/howTo-page.scss index 718d933..49605b1 100644 --- a/src/styles/howTo-page.scss +++ b/src/styles/howTo-page.scss @@ -60,6 +60,7 @@ .image-right-one { display: flex; flex-direction: row; + margin-bottom: 16px; } .image-jhon { From 15bccf4844de6ddf2fb1deab45d8632efb01abbd Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Thu, 14 Mar 2024 02:07:37 -0500 Subject: [PATCH 6/6] more --- src/Components/Case/CaseDetailsPage.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Components/Case/CaseDetailsPage.js b/src/Components/Case/CaseDetailsPage.js index d5fc4d7..24b7767 100644 --- a/src/Components/Case/CaseDetailsPage.js +++ b/src/Components/Case/CaseDetailsPage.js @@ -66,8 +66,8 @@ const CaseDetailsPage = () => { } function handleIncomingDiscoveryRequest(docId, isComplaint, clientPosition) { - //DONT WANT< RIGHT - ONLY TRIGGER FROM THIS SIDE IF IT IS COMBINED NUMBERED - //generateRespIncomingDiscReq(docId, clientPosition); + //ONLY TRIGGER FROM THIS SIDE (next page) IF IT IS COMBINED NUMBERED + setTimeout(generateRespIncomingDiscReq, 30000, docId, clientPosition); const res = getDocument(docId); if (res === "combined-numbered") { const documentId = docId; @@ -90,6 +90,9 @@ const CaseDetailsPage = () => { } // isComplaint = false - NEVER CHANGE THESE ARGS async function generateRespIncomingDiscReq(docId, clientPosition) { + console.log( + "generateRespIncomingDiscReq ------------------------fired----------------->" + ); try { const response = await fetch( `${apiUrl}/v1/generate-disc-responses/${docId}/${clientPosition}`,