From 830e731a4ec05d10da8b0524b5fab489e8bc3185 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Tue, 12 Mar 2024 01:28:51 -0500 Subject: [PATCH 1/4] more --- src/Components/Document/DocEditPage.js | 70 +++++++++++++------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index 7efc596..c5dd93d 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -6,15 +6,7 @@ import { useParams } from "react-router-dom"; import { Link, useNavigate } from "react-router-dom"; import EditElement from "../../pageElements/EditElement"; import { db } from "../../firebase"; -import { - collection, - updateDoc, - onSnapshot, - doc, - getDoc, - setDoc, - increment, -} from "firebase/firestore"; +import { doc, getDoc } from "firebase/firestore"; import { AppContext } from "../../Hooks/useContext/appContext"; import Button from "../../pageElements/Button"; import ConfirmModal from "../Modals/ConfirmModal"; @@ -296,6 +288,7 @@ const DocEditPage = (props) => { } async function handleCreateDocx() { + console.log("handleCreateDocx FIRED ------------------------------->"); // TODO: compare to see if any changes made before gen, save those const docId = documentId; const leadAttorneys = fetchedCase?.leadAttorneys @@ -315,32 +308,39 @@ const DocEditPage = (props) => { : 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, - }), - }); + console.log( + "--------------------------------->try block, apiURL", + apiUrl + ); + const response = await fetch( + `${apiUrl}/v1/generate-request-docx/${docId}`, + { + 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 responses to the server:", error); From 5f9df675eed25ea4f9f9b6eaee9a24c36af43c0d Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Tue, 12 Mar 2024 02:36:55 -0500 Subject: [PATCH 2/4] more --- src/Components/Document/DocEditPage.js | 64 ++++++++++++++++---------- 1 file changed, 40 insertions(+), 24 deletions(-) diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index c5dd93d..62c9c24 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -262,7 +262,7 @@ const DocEditPage = (props) => { async function createAndReturnDocx() { setIsBusy(true); const response = await handleCreateDocx(); - if (response.status === 200) { + if (response?.status === 200) { setTimeout(getDocx, 5000); setTimeout(cleanUpDocx, 10000); } else { @@ -287,6 +287,16 @@ const DocEditPage = (props) => { }); } + async function postDocxData(obj) { + const docId = documentId; + const response = await fetch(`${apiUrl}/v1/store-docx-data/${docId}`, { + method: "POST", + body: JSON.stringify(obj), + }); + console.log("res~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", response); + //return res; + } + async function handleCreateDocx() { console.log("handleCreateDocx FIRED ------------------------------->"); // TODO: compare to see if any changes made before gen, save those @@ -307,11 +317,35 @@ const DocEditPage = (props) => { ? fetchedCase?.clientPosition : null; + const obj = { + 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, + }; + + try { + const res = postDocxData(obj); + console.log("res to first post", res); + } catch (err) { + console.log("err inpostDocxData", err); + } + + /* try { - console.log( - "--------------------------------->try block, apiURL", - apiUrl - ); const response = await fetch( `${apiUrl}/v1/generate-request-docx/${docId}`, { @@ -320,31 +354,13 @@ const DocEditPage = (props) => { 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 responses to the server:", error); } + */ } const handleConfirmReport = () => { From 091394f1846dba56e252530e497f8db5ddde3122 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Tue, 12 Mar 2024 03:27:05 -0500 Subject: [PATCH 3/4] more --- src/Components/Document/DocEditPage.js | 46 ++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index 62c9c24..594afed 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -289,6 +289,7 @@ const DocEditPage = (props) => { async function postDocxData(obj) { const docId = documentId; + console.log("obj", obj); const response = await fetch(`${apiUrl}/v1/store-docx-data/${docId}`, { method: "POST", body: JSON.stringify(obj), @@ -338,8 +339,44 @@ const DocEditPage = (props) => { }; try { - const res = postDocxData(obj); - console.log("res to first post", res); + const response = await fetch(`${apiUrl}/v1/store-docx-data/${docId}`, { + method: "POST", + headers: { + "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, + }), + }); + if (response.status === 200) { + const response = await fetch( + `${apiUrl}/v1/generate-request-docx/${docId}`, + { + method: "POST", + headers: { + Accept: "application/json", + "Content-Type": "application/json", + }, + } + ); + return response; + } } catch (err) { console.log("err inpostDocxData", err); } @@ -453,8 +490,6 @@ const DocEditPage = (props) => { navigate(`/documents`); }; - console.log("parsedRogs", parsedRogs); - console.log("responses", responses); const editingContent = () => { return ( <> @@ -568,8 +603,7 @@ const DocEditPage = (props) => { }; const readyToEdit = fetchedCase && responses.length > 1; - console.log("readyToEdit", readyToEdit); - console.log("fetchedCase", fetchedCase); + return isLoading ? ( ) : isBusy ? ( From b15c6001068ef828e21f57a31551a6690323f725 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Tue, 12 Mar 2024 08:29:19 -0500 Subject: [PATCH 4/4] more --- src/Components/Document/DocEditPage.js | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index 594afed..7a4062f 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -317,27 +317,7 @@ const DocEditPage = (props) => { const clientPosition = fetchedCase?.clientPosition ? fetchedCase?.clientPosition : null; - - const obj = { - 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 currentRequestType = docType; try { const response = await fetch(`${apiUrl}/v1/store-docx-data/${docId}`, { method: "POST", @@ -349,6 +329,7 @@ const DocEditPage = (props) => { caseCaption2: captionTwo, caseNumber: caseNum, clientPosition: clientPosition, + currentRequestType: currentRequestType, defendant: defendants, firm: lawFirm, firmCity: city,