From 89bb3fbe26f6323d595e2867f1bbdb4a18328e59 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sat, 24 Feb 2024 02:14:39 -0600 Subject: [PATCH] more --- src/Components/Modals/UploadModal.js | 35 +++++++++++++++++++--------- src/pageElements/Radiogroup.js | 8 +++++++ src/styles/modals.scss | 17 ++++++++++++++ 3 files changed, 49 insertions(+), 11 deletions(-) diff --git a/src/Components/Modals/UploadModal.js b/src/Components/Modals/UploadModal.js index f257fb8..8d9e547 100644 --- a/src/Components/Modals/UploadModal.js +++ b/src/Components/Modals/UploadModal.js @@ -32,7 +32,8 @@ const UploadModal = (props) => { const [fileToUpload, setFileToUpload] = useState(); const [fileToParse, setFileToParse] = useState(""); const [fileChanged, setFileChanged] = useState(); - const [radioValue, setRadioValue] = useState(""); + const [radioValue, setRadioValue] = useState(null); + const [radioValueError, setRadioValueError] = useState(""); const [showFileDetails, setShowFileDetails] = useState(""); const [titleError, setShowTitleError] = useState(""); const [docError, setShowDocError] = useState(""); @@ -43,11 +44,12 @@ const UploadModal = (props) => { process.env.NODE_ENV === "development" ? process.env.REACT_APP_API_DEV : process.env.REACT_APP_API_PROD; + const radioOptions = [ { name: "Discovery request", label: "Discovery request", - value: "discoveryRequest", + value: "discovery-request", }, { name: "Complaint", label: "Complaint", value: "complaint" }, ]; @@ -84,15 +86,24 @@ const UploadModal = (props) => { setFileToParse(file); setFileChanged(true); } - console.log("full request url:", `${apiUrl}/parseNewDoc`); + async function uploadFile(file) { try { - const response = await fetch(`${apiUrl}/parseNewDoc`, { - method: "POST", - body: file, - }); - const res = response; - return res; + if (true) { + const response = await fetch(`${apiUrl}/parseNewDoc`, { + method: "POST", + body: file, + }); + const res = response; + return res; + } else { + const response = await fetch(`${apiUrl}/parseNewDoc`, { + method: "POST", + body: file, + }); + const res = response; + return res; + } } catch (error) { console.error("Error:", error); } @@ -127,9 +138,10 @@ const UploadModal = (props) => { } async function handleUpload() { - if (!docTitle && !fileToParse) { + if (!docTitle && !fileToParse && !radioValue) { setShowDocError("Please select a document to upload."); setShowTitleError("Please enter a document title"); + setRadioValueError("Please select document type"); return; } else if (!docTitle) { setShowTitleError("Please enter a document title"); @@ -255,6 +267,7 @@ const UploadModal = (props) => { title="Document type" options={radioOptions} value={radioValue} + radioError={radioValueError} onClick={(e) => handleSetRadioValue(e, "documentType")} /> @@ -295,7 +308,7 @@ const UploadModal = (props) => {