fixing build

CDCgov · Nov 30, 2023 · a2ffe9f · a2ffe9f
1 parent 5ae8dd1
commit a2ffe9f
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 42 deletions.
diff --git a/app/export/page.tsx b/app/export/page.tsx
@@ -32,7 +32,6 @@ export default function ExportPage() {
         <div className="margin-3">
             <h1>Export Page</h1>
             <Button type="button" onClick={downloadFile}>Export</Button>
-            <ECRTable ecrData={data}></ECRTable>
         </div>
     );
 }
diff --git a/app/upload_file/page.tsx b/app/upload_file/page.tsx
@@ -3,38 +3,38 @@ import { FileInput, FormGroup, Button } from '@trussworks/react-uswds'
 import { useState, useEffect } from 'react';
 import { useRouter } from 'next/navigation';
 import LinkAccordion from '@/components/LinkAccordion/LinkAccordion';
-import {formatData, ProgressData, createWebSocket, stepHtml, alertHtml} from './utils'
+import { formatData, ProgressData, createWebSocket, stepHtml, alertHtml } from './utils'
 import { useData } from '@/utils/DataContext';
 
 export default function UploadFile() {
   const { setData } = useData();
   const router = useRouter();
-  const url = process.env.NEXT_PUBLIC_PROCESS_URL
+  const url = process.env.NEXT_PUBLIC_PROCESS_URL!
   const [progress, setProgress] = useState<ProgressData | null>(null); // State for progress
   const [socket, setSocket] = useState<WebSocket | null>(null);
   const [file, setFile] = useState<File | null>(null);
 
   const handleSubmit = () => {
     // Send form data to the server via a WebSocket
-    if(!file || !socket){
+    if (!file || !socket) {
       return 'false';
     }
     const formData = new FormData();
     formData.append("file", file);
     socket.send(file)
   };
   const addFile = (event: React.ChangeEvent<HTMLInputElement>) => {
-      const selectedFile = event.target.files?.item(0);
-      if(selectedFile){
-        setFile(selectedFile);
-      }
+    const selectedFile = event.target.files?.item(0);
+    if (selectedFile) {
+      setFile(selectedFile);
+    }
   };
 
   useEffect(() => {
     const ws = createWebSocket(url);
     ws.onmessage = (event) => {
       let data = formatData(event.data)
-      if(data.complete && data["processed_values"]){
+      if (data.complete && data["processed_values"]) {
         setData(data)
       } else {
         setProgress(formatData(event.data));
@@ -52,10 +52,10 @@ export default function UploadFile() {
     };
   }, []);
 
-
 
-  const progressHtml = () =>{
-    if(!progress || !file){
+
+  const progressHtml = () => {
+    if (!progress || !file) {
       return (<></>)
     }
     return (
@@ -66,7 +66,7 @@ export default function UploadFile() {
             View the progress of your eCR through our pipeline
           </p>
           {alertHtml(progress, file)}
-          <div 
+          <div
             className="usa-step-indicator usa-step-indicator--counters margin-top-4"
             aria-label="progress"
           >
@@ -75,11 +75,11 @@ export default function UploadFile() {
             </ol>
           </div>
           <div className='margin-top-5'>
-            <button type="button" className="usa-button--outline usa-button" onClick={()=>location.reload()}>Cancel</button>
+            <button type="button" className="usa-button--outline usa-button" onClick={() => location.reload()}>Cancel</button>
             <button
               type="button"
               className="usa-button"
-              onClick={()=>router.push('/export')}
+              onClick={() => router.push('/export')}
               disabled={progress.complete ? false : true}
             >
               Continue
@@ -89,32 +89,32 @@ export default function UploadFile() {
       </div>
     )
   }
-    if(progress){
-      return progressHtml()
-    } else {
-      return (
-        <div className="display-flex flex-justify-center margin-top-5">
-            <div className="max-611">
-                <h1 className='font-sans-xl text-bold margin-top'>Upload your eCR</h1>
-                <p className="font-sans-lg text-light">Select an eCR .zip file to process</p>
-                <div className="usa-alert usa-alert--info usa-alert--no-icon maxw-tablet">
-                    <div className="usa-alert__body padding-0">
-                        <p className="usa-alert__text font-sans-xs text-bold">
-                            This tool is only for test data. Please do not upload patient data to this site.
-                        </p>
-                    </div>
-                </div>
-                <FormGroup>
-                    <FileInput id="file-input-single"
-                        name="file-input-single" onChange={addFile}
-                    />
-                    <div className="margin-top-205">
-                        <LinkAccordion></LinkAccordion>
-                    </div>
-                    <Button className="margin-top-3" disabled={!file} type="button" onClick={handleSubmit}>Continue</Button>
-                </FormGroup>
+  if (progress) {
+    return progressHtml()
+  } else {
+    return (
+      <div className="display-flex flex-justify-center margin-top-5">
+        <div className="max-611">
+          <h1 className='font-sans-xl text-bold margin-top'>Upload your eCR</h1>
+          <p className="font-sans-lg text-light">Select an eCR .zip file to process</p>
+          <div className="usa-alert usa-alert--info usa-alert--no-icon maxw-tablet">
+            <div className="usa-alert__body padding-0">
+              <p className="usa-alert__text font-sans-xs text-bold">
+                This tool is only for test data. Please do not upload patient data to this site.
+              </p>
             </div>
+          </div>
+          <FormGroup>
+            <FileInput id="file-input-single"
+              name="file-input-single" onChange={addFile}
+            />
+            <div className="margin-top-205">
+              <LinkAccordion></LinkAccordion>
+            </div>
+            <Button className="margin-top-3" disabled={!file} type="button" onClick={handleSubmit}>Continue</Button>
+          </FormGroup>
         </div>
-      )
-    }
+      </div>
+    )
+  }
 }
diff --git a/components/ECRTable.tsx b/components/ECRTable.tsx
@@ -3,7 +3,7 @@ import {
 } from '@trussworks/react-uswds'
 import _ from 'lodash';
 
-export default function ECRTable({ ecrData }) {
+export default function ECRTable({ ecrData }: any) {
     const options = ['patient_id', 'first_name', 'last_name', 'gender', 'birth_date']