more

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 {
+      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")}
                 />
               </div>
@@ -295,7 +308,7 @@ const UploadModal = (props) => {
         <Button
           labelText="Upload"
           className="primary-button pr-1 pl-1"
-          onClick={handleUpload}
+          onClick={() => handleUpload(radioValue)}
         />
       </Modal.Footer>
     </Modal>

src/pageElements/Radiogroup.js

@@ -12,6 +12,7 @@ const Radiogroup = (props) => {
     value,
     options,
     disabled,
+    radioError,
   } = props;
   const classCheckbox = "checkbox";
   const classOption = "option";
@@ -81,6 +82,13 @@ const Radiogroup = (props) => {
             </div>
           ))}
       </div>
+      <div className="radio-error-box">
+        {radioError ? (
+          <div className="modal-document-error">{radioError}</div>
+        ) : (
+          <></>
+        )}
+      </div>
     </div>
   );
 };

src/styles/modals.scss

@@ -140,6 +140,23 @@
   width: 160px !important;
 }
 
+.radio-wrapper {
+  height: 110px;
+}
+
+.radio-option-container {
+  display: flex;
+  flex-direction: column;
+}
+
+.checkbox-option-div {
+  height: 20px;
+}
+.radio-error-box {
+  margin-top: 16px;
+  margin-left: -3px;
+}
+
 @media only screen and (max-width: 820px) {
   .modal-body {
     width: 580px !important;