From 5b824abc39adacbe67f1f4c23e0be5f99aa782dd Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Tue, 16 Jan 2024 23:32:14 -0600 Subject: [PATCH 1/7] more --- src/Components/Document/DocEditPage.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index d5dc72d..c7a2d6d 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -246,7 +246,11 @@ const DocEditPage = () => { let mode; //TODO: remove isRequests var const isRequests = false; - + console.log( + "generateResponsesCombined docmentId docType", + documentId, + docType + ); try { setIsLoading(true); fetch( From f697539fc038554909f8bc9f898da5a39aeda67f Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Wed, 17 Jan 2024 11:11:15 -0600 Subject: [PATCH 2/7] more --- package-lock.json | 16 ++++++++-------- src/Components/Document/DocEditPage.js | 25 ++++++++++++++----------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index f9505c1..c8c7cbc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7849,14 +7849,6 @@ "tslib": "^2.0.3" } }, - "node_modules/dotenv": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", - "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", - "engines": { - "node": ">=10" - } - }, "node_modules/dotenv-expand": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz", @@ -15972,6 +15964,14 @@ } } }, + "node_modules/react-scripts/node_modules/dotenv": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", + "engines": { + "node": ">=10" + } + }, "node_modules/react-spinners": { "version": "0.13.8", "resolved": "https://registry.npmjs.org/react-spinners/-/react-spinners-0.13.8.tgz", diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index c7a2d6d..98c1756 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -54,6 +54,11 @@ const DocEditPage = () => { const zipCode = group ? group.zipCode : null; const telephone = group ? group.telephone : null; + const apiUrl = + process.env.NODE_ENV === "development" + ? process.env.REACT_APP_API_DEV + : process.env.REACT_APP_API_PROD; + const displayCopy = state === "New York" ? docEditCopy.NewYork @@ -90,8 +95,6 @@ const DocEditPage = () => { } }; - const baseUrl = "http://localhost:4000"; - const headerString = documentType === "interrogatories" ? ( "Response to Interrogatories" @@ -212,7 +215,7 @@ const DocEditPage = () => { const docType = String(documentType); try { const response = await fetch( - `${baseUrl}/getParsedRequests/${documentId}/${docType}`, + `${apiUrl}/getParsedRequests/${documentId}/${docType}`, { method: "GET", } @@ -231,7 +234,7 @@ const DocEditPage = () => { async function getCompletions(docId) { const docType = String(documentType); - const response = await fetch(`${baseUrl}/completions/${docId}/${docType}`, { + const response = await fetch(`${apiUrl}/completions/${docId}/${docType}`, { method: "GET", }); const req = await response.json(); @@ -254,7 +257,7 @@ const DocEditPage = () => { try { setIsLoading(true); fetch( - `${baseUrl}/genResponseFromArrayCombined/${documentId}/${docType}/${isRequests}`, + `${apiUrl}/genResponseFromArrayCombined/${documentId}/${docType}/${isRequests}`, { method: "GET", } @@ -293,7 +296,7 @@ const DocEditPage = () => { try { setIsLoading(true); fetch( - `${baseUrl}/genResponseFromArray/${documentId}/${docType}/${isRequests}`, + `${apiUrl}/genResponseFromArray/${documentId}/${docType}/${isRequests}`, { method: "GET", } @@ -327,7 +330,7 @@ const DocEditPage = () => { obj["requests"] = responses; const data = JSON.stringify(obj); try { - const response = await fetch(`${baseUrl}/storecompletions`, { + const response = await fetch(`${apiUrl}/storecompletions`, { method: "POST", headers: { "Content-Type": "application/json" }, json: true, @@ -351,7 +354,7 @@ const DocEditPage = () => { async function cleanUpDocx() { const docId = documentId; const reqType = documentType; - fetch(`${baseUrl}/cleanUpDocx/${docId}/${reqType}`, { + fetch(`${apiUrl}/cleanUpDocx/${docId}/${reqType}`, { method: "GET", }) .then((response) => { @@ -365,7 +368,7 @@ const DocEditPage = () => { async function getDocx() { const docId = documentId; const reqType = documentType; - fetch(`${baseUrl}/getDocx/${docId}/${reqType}`, { + fetch(`${apiUrl}/getDocx/${docId}/${reqType}`, { method: "GET", }).then((response) => { response.blob().then((blob) => { @@ -398,7 +401,7 @@ const DocEditPage = () => { : null; try { - const response = await fetch(`${baseUrl}/genDocx/${docId}/${reqType}`, { + const response = await fetch(`${apiUrl}/genDocx/${docId}/${reqType}`, { method: "POST", headers: { Accept: "application/json", @@ -450,7 +453,7 @@ const DocEditPage = () => { obj["requests"] = responses; const data = JSON.stringify(obj); try { - const response = await fetch(`${baseUrl}/storeeditedcompletions`, { + const response = await fetch(`${apiUrl}/storeeditedcompletions`, { method: "POST", headers: { "Content-Type": "application/json" }, json: true, From e4fdf1586d925e09873561f3370f284a8aad100f Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Wed, 17 Jan 2024 11:14:18 -0600 Subject: [PATCH 3/7] more --- src/Components/Modals/UploadModal.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Components/Modals/UploadModal.js b/src/Components/Modals/UploadModal.js index 8b5c3a9..63e80b2 100644 --- a/src/Components/Modals/UploadModal.js +++ b/src/Components/Modals/UploadModal.js @@ -35,7 +35,10 @@ const UploadModal = (props) => { const [docError, setShowDocError] = useState(""); const fileTypes = ["PDF"]; const fileName = fileToParse ? fileToParse.name : undefined; - const baseUrl = "http://localhost:4000"; + const apiUrl = + process.env.NODE_ENV === "development" + ? process.env.REACT_APP_API_DEV + : process.env.REACT_APP_API_PROD; const navigate = useNavigate(); async function saveToDb(uuidName) { @@ -67,7 +70,7 @@ const UploadModal = (props) => { async function uploadFile(file) { try { - const response = await fetch(`${baseUrl}/parseNewDoc`, { + const response = await fetch(`${apiUrl}/parseNewDoc`, { method: "POST", body: file, }); From 90ffc4d6aa3d7c474be3e6b3e11b4ff007197289 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Wed, 17 Jan 2024 11:21:37 -0600 Subject: [PATCH 4/7] more --- src/App.js | 6 +++++- src/Components/Document/DocEditPage.js | 1 + src/Components/Modals/UploadModal.js | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index 71c1f8f..072936d 100644 --- a/src/App.js +++ b/src/App.js @@ -37,7 +37,11 @@ function App() { if (typeof currentUserEmail === "undefined") { return null; } - + const apiUrl = + process.env.NODE_ENV === "development" + ? process.env.REACT_APP_API_DEV + : process.env.REACT_APP_API_PROD; + console.log("apiUlr in app.js", apiUrl); return ( <> diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index 98c1756..ea630b1 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -58,6 +58,7 @@ const DocEditPage = () => { process.env.NODE_ENV === "development" ? process.env.REACT_APP_API_DEV : process.env.REACT_APP_API_PROD; + console.log("apiUlr in dc edit", apiUrl); const displayCopy = state === "New York" diff --git a/src/Components/Modals/UploadModal.js b/src/Components/Modals/UploadModal.js index 63e80b2..f2fa45e 100644 --- a/src/Components/Modals/UploadModal.js +++ b/src/Components/Modals/UploadModal.js @@ -35,10 +35,12 @@ const UploadModal = (props) => { const [docError, setShowDocError] = useState(""); const fileTypes = ["PDF"]; const fileName = fileToParse ? fileToParse.name : undefined; + //const baseUrl = "http://localhost:4000"; const apiUrl = process.env.NODE_ENV === "development" ? process.env.REACT_APP_API_DEV : process.env.REACT_APP_API_PROD; + console.log("apiUlr in upload modal", apiUrl); const navigate = useNavigate(); async function saveToDb(uuidName) { From 4b4b28216fe193ad84fefda8f0c0ea9f2baac80b Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Wed, 17 Jan 2024 11:22:24 -0600 Subject: [PATCH 5/7] more --- src/App.js | 6 +----- src/Components/Document/DocEditPage.js | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/App.js b/src/App.js index 072936d..71c1f8f 100644 --- a/src/App.js +++ b/src/App.js @@ -37,11 +37,7 @@ function App() { if (typeof currentUserEmail === "undefined") { return null; } - const apiUrl = - process.env.NODE_ENV === "development" - ? process.env.REACT_APP_API_DEV - : process.env.REACT_APP_API_PROD; - console.log("apiUlr in app.js", apiUrl); + return ( <> diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index ea630b1..98c1756 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -58,7 +58,6 @@ const DocEditPage = () => { process.env.NODE_ENV === "development" ? process.env.REACT_APP_API_DEV : process.env.REACT_APP_API_PROD; - console.log("apiUlr in dc edit", apiUrl); const displayCopy = state === "New York" From b0a10387b965896ec04dbc180426c6a645a96a45 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Wed, 17 Jan 2024 11:29:42 -0600 Subject: [PATCH 6/7] more --- src/Components/Modals/UploadModal.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Components/Modals/UploadModal.js b/src/Components/Modals/UploadModal.js index f2fa45e..d8c6b18 100644 --- a/src/Components/Modals/UploadModal.js +++ b/src/Components/Modals/UploadModal.js @@ -35,7 +35,7 @@ const UploadModal = (props) => { const [docError, setShowDocError] = useState(""); const fileTypes = ["PDF"]; const fileName = fileToParse ? fileToParse.name : undefined; - //const baseUrl = "http://localhost:4000"; + const apiUrl = process.env.NODE_ENV === "development" ? process.env.REACT_APP_API_DEV @@ -228,6 +228,7 @@ const UploadModal = (props) => { multiple={true} handleChange={handleFileChange} name="file" + types={fileTypes} >
{fileToParse From a7150e1f8b9bba3daf3f5a06a73fe1dca19dd6e9 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Wed, 17 Jan 2024 11:35:39 -0600 Subject: [PATCH 7/7] more --- src/Components/Document/DocumentListPage.js | 10 ++++++++-- src/Components/Modals/UploadModal.js | 2 -- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Components/Document/DocumentListPage.js b/src/Components/Document/DocumentListPage.js index e0f618a..68fe57f 100644 --- a/src/Components/Document/DocumentListPage.js +++ b/src/Components/Document/DocumentListPage.js @@ -32,11 +32,17 @@ const DocumentListPage = ({ perPage }) => { const [page, setPage] = useState(1); const [order, setOrder] = useState("parentCaseName"); const appUserId = group ? group.appUserId : null; - const baseUrl = "http://localhost:4000"; + const [isBusy, setIsBusy] = useState(false); const [selectedDocumentType, setSelectedDocumentType] = useState(); const [showModal, setShowModal] = useState(false); + const apiUrl = + process.env.NODE_ENV === "development" + ? process.env.REACT_APP_API_DEV + : process.env.REACT_APP_API_PROD; + + console.log("apiUrl", apiUrl); useEffect(() => { if (count.current == null) { setIsMobile(window.innerWidth < 440); @@ -117,7 +123,7 @@ const DocumentListPage = ({ perPage }) => { try { const response = await fetch( - `${baseUrl}/deleteDoc/${selectedDocumentId}/${selectedDocumentType}/${respGens}`, + `${apiUrl}/deleteDoc/${selectedDocumentId}/${selectedDocumentType}/${respGens}`, { method: "POST", } diff --git a/src/Components/Modals/UploadModal.js b/src/Components/Modals/UploadModal.js index d8c6b18..916c4c1 100644 --- a/src/Components/Modals/UploadModal.js +++ b/src/Components/Modals/UploadModal.js @@ -40,8 +40,6 @@ const UploadModal = (props) => { process.env.NODE_ENV === "development" ? process.env.REACT_APP_API_DEV : process.env.REACT_APP_API_PROD; - console.log("apiUlr in upload modal", apiUrl); - const navigate = useNavigate(); async function saveToDb(uuidName) { const data = {