From 89aae714e73dd99ed7b55c625f133f6daa9541cd Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Tue, 5 Mar 2024 22:00:18 -0600 Subject: [PATCH 1/5] more --- src/Components/Document/ReqEditPage.js | 79 +++++++++++++++++--------- src/Components/Modals/UploadModal.js | 1 - 2 files changed, 53 insertions(+), 27 deletions(-) diff --git a/src/Components/Document/ReqEditPage.js b/src/Components/Document/ReqEditPage.js index 533a15e..c549e3e 100644 --- a/src/Components/Document/ReqEditPage.js +++ b/src/Components/Document/ReqEditPage.js @@ -174,8 +174,32 @@ const RequestEditPage = () => { } }; + async function postEditedResponses() { + const mergedRequests = [...requests, ...prodReq]; + let obj = {}; + obj["type"] = "interrogatories-out"; + obj["id"] = docId; + obj["requests"] = mergedRequests; + const data = JSON.stringify(obj); + try { + const response = await fetch(`${apiUrl}/v1/store-edited-completions`, { + method: "POST", + headers: { "Content-Type": "application/json" }, + json: true, + body: data, + }); + const res = response; + return res; + } catch (error) { + console.error("Error sending responses to the server:", error); + } + } + async function handleCreateDocx() { // TODO: compare to see if any changes made before gen, save those + + const res = await postEditedResponses(); + const docId = documentId; const leadAttorneys = fetchedCase?.leadAttorneys ? fetchedCase?.leadAttorneys @@ -194,32 +218,35 @@ const RequestEditPage = () => { : null; try { - const response = await fetch(`${apiUrl}/genDocx/${docId}/${reqType}`, { - method: "POST", - headers: { - Accept: "application/json", - "Content-Type": "application/json", - }, - body: JSON.stringify({ - caseCaption1: captionOne, - caseCaption2: captionTwo, - caseNumber: caseNum, - clientPosition: clientPosition, - defendant: defendants, - firm: lawFirm, - firmCity: city, - firmState: usState.code, - firmStreetAddress: streetAdd, - firmZip: zipCode, - judge: judge, - jurisdiction: juris, - leadAttorneys: leadAttorneys, - plaintiff: plaintiffs, - state: state, - tel: telephone, - venue: venued, - }), - }); + const response = await fetch( + `${apiUrl}/generate-request-docx/${docId}/${reqType}`, + { + method: "POST", + headers: { + Accept: "application/json", + "Content-Type": "application/json", + }, + body: JSON.stringify({ + caseCaption1: captionOne, + caseCaption2: captionTwo, + caseNumber: caseNum, + clientPosition: clientPosition, + defendant: defendants, + firm: lawFirm, + firmCity: city, + firmState: usState.code, + firmStreetAddress: streetAdd, + firmZip: zipCode, + judge: judge, + jurisdiction: juris, + leadAttorneys: leadAttorneys, + plaintiff: plaintiffs, + state: state, + tel: telephone, + venue: venued, + }), + } + ); return response; } catch (error) { console.error("Error sending requests to the server:", error); diff --git a/src/Components/Modals/UploadModal.js b/src/Components/Modals/UploadModal.js index 117f883..37475f2 100644 --- a/src/Components/Modals/UploadModal.js +++ b/src/Components/Modals/UploadModal.js @@ -103,7 +103,6 @@ const UploadModal = (props) => { try { if (radioValue === "complaint") { if (clientPositiion === "Plaintiff") { - console.log("sending POST to: ", `${apiUrl}/v1/gen-disc-request-pl`); const response = await fetch(`${apiUrl}/v1/gen-disc-request-pl`, { method: "POST", body: file, From 4821b655c5f0acd0adc2055fd77ef189f72002e9 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Tue, 5 Mar 2024 22:01:30 -0600 Subject: [PATCH 2/5] 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 8d52fc4..f27656d 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -341,7 +341,7 @@ const DocEditPage = () => { obj["requests"] = responses; const data = JSON.stringify(obj); try { - const response = await fetch(`${apiUrl}/storecompletions`, { + const response = await fetch(`${apiUrl}/v1/store-edited-completions`, { method: "POST", headers: { "Content-Type": "application/json" }, json: true, From 15707da326c9b82b05f1455d3f639d93515ebfe0 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Tue, 5 Mar 2024 22:25:21 -0600 Subject: [PATCH 3/5] more --- src/Components/Document/DocumentListPage.js | 1 + src/Components/Document/ReqEditPage.js | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Components/Document/DocumentListPage.js b/src/Components/Document/DocumentListPage.js index f52f1fb..7547c76 100644 --- a/src/Components/Document/DocumentListPage.js +++ b/src/Components/Document/DocumentListPage.js @@ -116,6 +116,7 @@ const DocumentListPage = ({ perPage }) => { }; const handleToggle = (val) => setVerbValue(val); + async function deleteFromStorage() { const selectedDoc = allDocs.filter((doc) => { return doc.documentId == selectedDocumentId; diff --git a/src/Components/Document/ReqEditPage.js b/src/Components/Document/ReqEditPage.js index c549e3e..cdaf249 100644 --- a/src/Components/Document/ReqEditPage.js +++ b/src/Components/Document/ReqEditPage.js @@ -152,9 +152,9 @@ const RequestEditPage = () => { async function createAndReturnDocx() { window.scrollTo({ top: 0 }); - setIsBusy(true); + //setIsBusy(true); const response = await handleCreateDocx(); - if (response.status === 200) { + if (response && response?.status === 200) { setTimeout(getDocx, 5000); setTimeout(cleanUpDocx, 10000); } else { @@ -188,8 +188,8 @@ const RequestEditPage = () => { json: true, body: data, }); - const res = response; - return res; + + return response; } catch (error) { console.error("Error sending responses to the server:", error); } @@ -219,7 +219,7 @@ const RequestEditPage = () => { try { const response = await fetch( - `${apiUrl}/generate-request-docx/${docId}/${reqType}`, + `${apiUrl}/v1/generate-request-docx/${docId}/${reqType}`, { method: "POST", headers: { From f53bdea10872fa871c3e6a316b0eec2236b773f8 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Tue, 5 Mar 2024 23:19:43 -0600 Subject: [PATCH 4/5] more --- src/Components/Document/ReqEditPage.js | 106 +++++++++++++------------ 1 file changed, 54 insertions(+), 52 deletions(-) diff --git a/src/Components/Document/ReqEditPage.js b/src/Components/Document/ReqEditPage.js index cdaf249..4c31f81 100644 --- a/src/Components/Document/ReqEditPage.js +++ b/src/Components/Document/ReqEditPage.js @@ -176,29 +176,6 @@ const RequestEditPage = () => { async function postEditedResponses() { const mergedRequests = [...requests, ...prodReq]; - let obj = {}; - obj["type"] = "interrogatories-out"; - obj["id"] = docId; - obj["requests"] = mergedRequests; - const data = JSON.stringify(obj); - try { - const response = await fetch(`${apiUrl}/v1/store-edited-completions`, { - method: "POST", - headers: { "Content-Type": "application/json" }, - json: true, - body: data, - }); - - return response; - } catch (error) { - console.error("Error sending responses to the server:", error); - } - } - - async function handleCreateDocx() { - // TODO: compare to see if any changes made before gen, save those - - const res = await postEditedResponses(); const docId = documentId; const leadAttorneys = fetchedCase?.leadAttorneys @@ -216,37 +193,62 @@ const RequestEditPage = () => { const clientPosition = fetchedCase?.clientPosition ? fetchedCase?.clientPosition : null; + const caseInfo = { + caseCaption1: captionOne, + caseCaption2: captionTwo, + caseNumber: caseNum, + clientPosition: clientPosition, + defendant: defendants, + firm: lawFirm, + firmCity: city, + firmState: usState.code, + firmStreetAddress: streetAdd, + firmZip: zipCode, + judge: judge, + jurisdiction: juris, + leadAttorneys: leadAttorneys, + plaintiff: plaintiffs, + state: state, + tel: telephone, + venue: venued, + }; + + let obj = {}; + obj["type"] = "interrogatories-out"; + obj["id"] = docId; + obj["requests"] = mergedRequests; + obj["caseInfo"] = caseInfo; + + const data = JSON.stringify(obj); + try { + const response = await fetch(`${apiUrl}/v1/store-edited-completions`, { + method: "POST", + headers: { "Content-Type": "application/json" }, + json: true, + body: data, + }); + return response; + } catch (error) { + console.error("Error sending responses to the server:", error); + } + } + + async function handleCreateDocx() { + // TODO: compare to see if any changes made before gen, save those + + const res = await postEditedResponses(); try { - const response = await fetch( - `${apiUrl}/v1/generate-request-docx/${docId}/${reqType}`, - { - method: "POST", - headers: { - Accept: "application/json", - "Content-Type": "application/json", - }, - body: JSON.stringify({ - caseCaption1: captionOne, - caseCaption2: captionTwo, - caseNumber: caseNum, - clientPosition: clientPosition, - defendant: defendants, - firm: lawFirm, - firmCity: city, - firmState: usState.code, - firmStreetAddress: streetAdd, - firmZip: zipCode, - judge: judge, - jurisdiction: juris, - leadAttorneys: leadAttorneys, - plaintiff: plaintiffs, - state: state, - tel: telephone, - venue: venued, - }), - } - ); + const response = await fetch(`${apiUrl}/v1/generate-request-docx/`, { + method: "POST", + headers: { + Accept: "application/json", + "Content-Type": "application/json", + }, + body: JSON.stringify({ + docId: docId, + }), + }); return response; } catch (error) { console.error("Error sending requests to the server:", error); From d12c12a501ee3bf85ceffb0c0e94057aab581f40 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Wed, 6 Mar 2024 00:24:03 -0600 Subject: [PATCH 5/5] more --- src/Components/Document/ReqEditPage.js | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/Components/Document/ReqEditPage.js b/src/Components/Document/ReqEditPage.js index 4c31f81..3586f51 100644 --- a/src/Components/Document/ReqEditPage.js +++ b/src/Components/Document/ReqEditPage.js @@ -239,16 +239,19 @@ const RequestEditPage = () => { const res = await postEditedResponses(); try { - const response = await fetch(`${apiUrl}/v1/generate-request-docx/`, { - method: "POST", - headers: { - Accept: "application/json", - "Content-Type": "application/json", - }, - body: JSON.stringify({ - docId: docId, - }), - }); + const response = await fetch( + `${apiUrl}/v1/generate-request-docx/${docId}`, + { + method: "POST", + headers: { + Accept: "application/json", + "Content-Type": "application/json", + }, + body: JSON.stringify({ + docId: docId, + }), + } + ); return response; } catch (error) { console.error("Error sending requests to the server:", error);