From 6ad82a71715bb1b0405b74511a8f60d2e8e288e2 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Mon, 11 Mar 2024 02:21:40 -0500 Subject: [PATCH 1/7] more --- src/Components/Document/DocEditPage.js | 69 ++++++++++++++++---------- 1 file changed, 42 insertions(+), 27 deletions(-) diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index 5b0795b..8662137 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -156,42 +156,46 @@ const DocEditPage = (props) => { } } - async function getParsedRequests(docId, zib) { + async function getParsedRequests(docId, docType) { try { - fetch(`${apiUrl}/v1/get-parsed-requests/${documentId}/${zib}`, { - method: "GET", - }) - .then(function (response) { - return response.json(); - }) - .then((data) => { - const respArray = data[0].responses; - const result = respArray?.map((item, index) => { - let obj = {}; - obj["showInputEle"] = false; - obj["resp"] = item.text; - obj["index"] = index; - return obj; - }); - setParsedRogs(result); - }); + const response = await fetch( + `${apiUrl}/getParsedRequests/${docId}/${docType}`, + { + method: "GET", + } + ); + const res = await response.json(); + return res; } catch (err) { console.log("Error occured:", err); } } + useEffect(() => { + if (!documentId) { + return; + } + getParsedRequests(documentId, docType) + .then((data) => { + console.log( + "-------------------------data in useEffect for getParsedRequests", + data + ); + }) + .catch((err) => console.log(err)); + }, [documentId]); + async function getCompletions(docId, docType) { if (!docId || !docType) { return; } const response = await fetch( - `${apiUrl}/v1/get-completions/${docId}/${docType}`, + `${apiUrl}/v1/get-parsed-requests/${docId}/${docType}`, { method: "GET", } ); const req = await response.json(); - console.log("req", req); return req; } @@ -218,21 +222,32 @@ const DocEditPage = (props) => { } getCompletions(documentId, docType) - .then((data) => {}) + .then((data) => { + console.log("data in getCompletions", data); + }) .catch((err) => console.log(err)); }, [documentId, docType]); - /* useEffect(() => { if (!documentId || !docType) { return; } - getParsedRequests(documentId, docType) - .then((data) => {}) - .catch((err) => console.log(err)); + .then((data) => { + const resp = data[0].responses.map((item, index) => { + // NEVER CHANGE THIS: + return { showInputEle: false, resp: item.text, index: index }; + }); + return resp; + }) + .then((resp) => { + setParsedRogs(resp); + }) + .catch((err) => { + console.log("Error getting parsed requestas:", err); + }); }, [documentId, docType]); -*/ + async function postEditedResponses(docId, docType) { let obj = {}; obj["type"] = docType; @@ -436,7 +451,7 @@ const DocEditPage = (props) => { const handleBack = () => { navigate(`/documents`); }; - + console.log("parsedrogs", parsedRogs); const editingContent = () => { return ( <> From e35aa459779b777656cff0619f6a2b7770deffd1 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Mon, 11 Mar 2024 02:57:12 -0500 Subject: [PATCH 2/7] more --- src/pageElements/Cards.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/pageElements/Cards.js b/src/pageElements/Cards.js index f9ecfbd..4ecb816 100644 --- a/src/pageElements/Cards.js +++ b/src/pageElements/Cards.js @@ -298,11 +298,8 @@ export const DocCard = (props) => { const isOutbound = docType === "interrogatories-out"; const buttonText = - docType === "interrogatories" && responseGenerations > 0 - ? "Edit Request" - : docType === "interrogatories-out" - ? "Edit Response" - : "Generate Response"; + docType === "interrogatories-out" ? "Edit Request" : "Edit Response"; + return (
From 437e5086331a0c3a0d06e527ee4043f3666e85bb Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Mon, 11 Mar 2024 03:21:39 -0500 Subject: [PATCH 3/7] more --- src/Components/Document/DocEditPage.js | 80 ++++++++++++++++---------- 1 file changed, 49 insertions(+), 31 deletions(-) diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index 8662137..ebf9c08 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -157,17 +157,23 @@ const DocEditPage = (props) => { } async function getParsedRequests(docId, docType) { + if (!docId || !docType) { + console.log("docId, docType", docId, docType); + return; + } try { const response = await fetch( - `${apiUrl}/getParsedRequests/${docId}/${docType}`, + `${apiUrl}/v1/get-parsed-requestss/${docId}/${docType}`, { method: "GET", } ); + console.log("response in get parsed ", response); const res = await response.json(); + return res; } catch (err) { - console.log("Error occured:", err); + console.log("getParsedRequests Error occured:", err); } } @@ -181,6 +187,11 @@ const DocEditPage = (props) => { "-------------------------data in useEffect for getParsedRequests", data ); + const resp = data[0].responses.map((item, index) => { + // NEVER CHANGE THIS: + return { showInputEle: false, resp: item.text, index: index }; + }); + setResponses(resp); }) .catch((err) => console.log(err)); }, [documentId]); @@ -190,23 +201,29 @@ const DocEditPage = (props) => { return; } const response = await fetch( - `${apiUrl}/v1/get-parsed-requests/${docId}/${docType}`, + `${apiUrl}/v1/get-completions/${docId}/${docType}`, { method: "GET", } ); - const req = await response.json(); - return req; + const resp = await response.json(); + console.log("req getCompletions", resp); + return resp; } useEffect(() => { if (!documentId) { return; } - getDocument(documentId).then((data) => { - setDocument(data); - setDocType(data.docType); - }); + getDocument(documentId) + .then((data) => { + setDocument(data); + const tempType = data.docType; + return tempType; + }) + .then((type) => { + setDocType(type); + }); }, [documentId]); useEffect(() => { @@ -223,31 +240,11 @@ const DocEditPage = (props) => { getCompletions(documentId, docType) .then((data) => { - console.log("data in getCompletions", data); + //console.log("data in getCompletions", data); }) .catch((err) => console.log(err)); }, [documentId, docType]); - useEffect(() => { - if (!documentId || !docType) { - return; - } - getParsedRequests(documentId, docType) - .then((data) => { - const resp = data[0].responses.map((item, index) => { - // NEVER CHANGE THIS: - return { showInputEle: false, resp: item.text, index: index }; - }); - return resp; - }) - .then((resp) => { - setParsedRogs(resp); - }) - .catch((err) => { - console.log("Error getting parsed requestas:", err); - }); - }, [documentId, docType]); - async function postEditedResponses(docId, docType) { let obj = {}; obj["type"] = docType; @@ -362,6 +359,27 @@ const DocEditPage = (props) => { } } + useEffect(() => { + if (!documentId || !docType) { + return; + } + getParsedRequests(documentId, docType) + .then((data) => { + const resp = data[0].responses.map((item, index) => { + // NEVER CHANGE THIS: + return { showInputEle: false, resp: item.text, index: index }; + }); + return resp; + }) + .then((resp) => { + console.log("knksdjfksdfn resp", resp); + setParsedRogs(resp); + }) + .catch((err) => { + console.log("Error getting parsed requestas:", err); + }); + }, [documentId, docType]); + const handleConfirmReport = () => { setShowSaveModal(true); setIsReport(true); @@ -451,7 +469,7 @@ const DocEditPage = (props) => { const handleBack = () => { navigate(`/documents`); }; - console.log("parsedrogs", parsedRogs); + const editingContent = () => { return ( <> From f3afab8b7ebead49829fde3b848f1bea439a7013 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Mon, 11 Mar 2024 07:01:06 -0500 Subject: [PATCH 4/7] more --- src/Components/Document/DocEditPage.js | 92 ++++++++++++++++++-------- 1 file changed, 65 insertions(+), 27 deletions(-) diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index ebf9c08..7543176 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -29,7 +29,7 @@ const DocEditPage = (props) => { const [docType, setDocType] = useState(null); const [fetchedCase, setFetchedCase] = useState(null); const [parsedRogs, setParsedRogs] = useState(null); - const [responses, setResponses] = useState(); + const [responses, setResponses] = useState([]); const [showInputEle, setShowInputEle] = useState(true); const { appState } = useContext(AppContext); const { group } = appState; @@ -168,9 +168,8 @@ const DocEditPage = (props) => { method: "GET", } ); - console.log("response in get parsed ", response); - const res = await response.json(); + const res = await response.json(); return res; } catch (err) { console.log("getParsedRequests Error occured:", err); @@ -178,16 +177,13 @@ const DocEditPage = (props) => { } useEffect(() => { - if (!documentId) { + if (!documentId || !docType) { return; } getParsedRequests(documentId, docType) .then((data) => { - console.log( - "-------------------------data in useEffect for getParsedRequests", - data - ); - const resp = data[0].responses.map((item, index) => { + const resp = data[0].responses ? data[0].responses : null; + const foo = resp?.map((item, index) => { // NEVER CHANGE THIS: return { showInputEle: false, resp: item.text, index: index }; }); @@ -196,21 +192,6 @@ const DocEditPage = (props) => { .catch((err) => console.log(err)); }, [documentId]); - async function getCompletions(docId, docType) { - if (!docId || !docType) { - return; - } - const response = await fetch( - `${apiUrl}/v1/get-completions/${docId}/${docType}`, - { - method: "GET", - } - ); - const resp = await response.json(); - console.log("req getCompletions", resp); - return resp; - } - useEffect(() => { if (!documentId) { return; @@ -233,18 +214,75 @@ const DocEditPage = (props) => { getCase(caseId); }, [caseId, documentId]); - useEffect(() => { - if (!documentId || !docType) { + async function getCompletions(docId, docType) { + if (!docId || !docType) { return; } + console.log("docId, docType", docId, docType); + const response = await fetch( + `${apiUrl}/v1/get-completions/${docId}/${docType}`, + { + method: "GET", + } + ); + const resp = await response.json(); + return resp; + } + useEffect(() => { getCompletions(documentId, docType) .then((data) => { - //console.log("data in getCompletions", data); + const respond = 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 }; + }); + setResponses(resp); }) .catch((err) => console.log(err)); }, [documentId, docType]); + console.log("responses", responses); + /* + async function getOutgoingRequests(documentId) { + console.log("getOutgoingRequests fired--------------------"); + if (!documentId) { + return; + } + const docType = String(documentType); + const docId = String(documentId); + const response = await fetch( + `${apiUrl}/v1/get-outgoing-requests/${docId}/${docType}`, + { + method: "GET", + } + ); + const req = await response.json(); + return req; + } + useEffect(() => { + if (!documentId) { + return; + } + getOutgoingRequests(documentId) + .then((data) => { + console.log( + "-------------------------data[0].requests", + data[0].requests + ); + const merged = [...foundationRogs, ...data[0].requests]; + const resp = merged?.map((item, index) => { + // NEVER CHANGE THIS: + return { showInputEle: false, text: item.text, index: index }; + }); + if (resp.length > 10) { + setRequests(resp); + setProdReq(standardProd); + } + }) + .catch((err) => console.log(err)); + }, [documentId]); +*/ async function postEditedResponses(docId, docType) { let obj = {}; obj["type"] = docType; From 38be5032b79ba78091379d217fba69d50632619e Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Mon, 11 Mar 2024 07:04:52 -0500 Subject: [PATCH 5/7] more --- src/Components/Document/DocEditPage.js | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index 7543176..6f33c43 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -187,7 +187,7 @@ const DocEditPage = (props) => { // NEVER CHANGE THIS: return { showInputEle: false, resp: item.text, index: index }; }); - setResponses(resp); + setParsedRogs(resp); }) .catch((err) => console.log(err)); }, [documentId]); @@ -218,7 +218,6 @@ const DocEditPage = (props) => { if (!docId || !docType) { return; } - console.log("docId, docType", docId, docType); const response = await fetch( `${apiUrl}/v1/get-completions/${docId}/${docType}`, { @@ -242,6 +241,7 @@ const DocEditPage = (props) => { .catch((err) => console.log(err)); }, [documentId, docType]); console.log("responses", responses); + /* async function getOutgoingRequests(documentId) { console.log("getOutgoingRequests fired--------------------"); @@ -397,27 +397,6 @@ const DocEditPage = (props) => { } } - useEffect(() => { - if (!documentId || !docType) { - return; - } - getParsedRequests(documentId, docType) - .then((data) => { - const resp = data[0].responses.map((item, index) => { - // NEVER CHANGE THIS: - return { showInputEle: false, resp: item.text, index: index }; - }); - return resp; - }) - .then((resp) => { - console.log("knksdjfksdfn resp", resp); - setParsedRogs(resp); - }) - .catch((err) => { - console.log("Error getting parsed requestas:", err); - }); - }, [documentId, docType]); - const handleConfirmReport = () => { setShowSaveModal(true); setIsReport(true); From e4fd766ef68a552ff3cd67bec84ac2b057e2a828 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Mon, 11 Mar 2024 07:10:39 -0500 Subject: [PATCH 6/7] more --- src/Components/Document/DocEditPage.js | 67 +++++++++++--------------- 1 file changed, 29 insertions(+), 38 deletions(-) diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index 6f33c43..75a5581 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -156,42 +156,6 @@ const DocEditPage = (props) => { } } - async function getParsedRequests(docId, docType) { - if (!docId || !docType) { - console.log("docId, docType", docId, docType); - return; - } - try { - const response = await fetch( - `${apiUrl}/v1/get-parsed-requestss/${docId}/${docType}`, - { - method: "GET", - } - ); - - const res = await response.json(); - return res; - } catch (err) { - console.log("getParsedRequests Error occured:", err); - } - } - - useEffect(() => { - if (!documentId || !docType) { - return; - } - getParsedRequests(documentId, docType) - .then((data) => { - const resp = data[0].responses ? data[0].responses : null; - const foo = resp?.map((item, index) => { - // NEVER CHANGE THIS: - return { showInputEle: false, resp: item.text, index: index }; - }); - setParsedRogs(resp); - }) - .catch((err) => console.log(err)); - }, [documentId]); - useEffect(() => { if (!documentId) { return; @@ -240,8 +204,34 @@ const DocEditPage = (props) => { }) .catch((err) => console.log(err)); }, [documentId, docType]); - console.log("responses", responses); + //_______________________________ + 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) => { + const respond = 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 }; + }); + setParsedRogs(resp); + }) + .catch((err) => console.log(err)); + }, [documentId, docType]); + //_______________________________ /* async function getOutgoingRequests(documentId) { console.log("getOutgoingRequests fired--------------------"); @@ -486,7 +476,8 @@ const DocEditPage = (props) => { const handleBack = () => { navigate(`/documents`); }; - + console.log("parsedRogs", parsedRogs); + console.log("responses", responses); const editingContent = () => { return ( <> From a31a5d440e09c3873783afaa6ac1cab835849d24 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Mon, 11 Mar 2024 07:12:34 -0500 Subject: [PATCH 7/7] more --- src/Components/Document/DocEditPage.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index 75a5581..f402ede 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -28,7 +28,7 @@ const DocEditPage = (props) => { const [document, setDocument] = useState(null); const [docType, setDocType] = useState(null); const [fetchedCase, setFetchedCase] = useState(null); - const [parsedRogs, setParsedRogs] = useState(null); + const [parsedRogs, setParsedRogs] = useState([]); const [responses, setResponses] = useState([]); const [showInputEle, setShowInputEle] = useState(true); const { appState } = useContext(AppContext); @@ -222,7 +222,8 @@ const DocEditPage = (props) => { useEffect(() => { getParsedRogs(documentId, docType) .then((data) => { - const respond = data[0].responses.length > 2 ? data[0].responses : null; + console.log("data in useeffect", data); + const respond = data[0].requests.length > 2 ? data[0].requests : null; const resp = respond?.map((item, index) => { // NEVER CHANGE THIS: return { showInputEle: false, resp: item.text, index: index };