From 5cd1789473cf1e7ffe9c4edd6a4a48d4609954d3 Mon Sep 17 00:00:00 2001
From: Nate-Wessel <nate.wessel@toronto.ca>
Date: Fri, 12 Jul 2024 19:08:19 +0000
Subject: [PATCH] show simple progress bar

---
 frontend/src/Sidebar/ResultsContainer.jsx | 35 +++++++++++++++--------
 frontend/src/spatialData.js               |  1 +
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/frontend/src/Sidebar/ResultsContainer.jsx b/frontend/src/Sidebar/ResultsContainer.jsx
index e065c95..dc0af43 100644
--- a/frontend/src/Sidebar/ResultsContainer.jsx
+++ b/frontend/src/Sidebar/ResultsContainer.jsx
@@ -1,16 +1,21 @@
-import { useContext, useState } from 'react'
+import { useContext, useState, useEffect } from 'react'
 import { DataContext } from '../Layout'
 import BigButton from './BigButton'
 
-
 export default function ResultsContainer(){
     const [ results, setResults ] = useState(undefined)
     const [ isFetchingData, setIsFetchingData ] = useState(false)
+    const [ doneCount, setDoneCount ] = useState(-1)
     const { data } = useContext(DataContext)
     const numResults = data.travelTimeQueries.length
+    useEffect(()=>{
+        data.queue.on('active',()=>{
+            setDoneCount(count => count + 1)
+        })
+    },[])
     return (
         <div>
-            {numResults} travel time{numResults == 1 ? '' : 's'} to estimate currently
+            {numResults} travel time{numResults == 1 ? '' : 's'} to be queried
             {numResults > 0 && ! isFetchingData &&
                 <BigButton onClick={()=>{
                     setResults(undefined)
@@ -23,26 +28,32 @@ export default function ResultsContainer(){
                     Submit Query
                 </BigButton>
             }
-            {isFetchingData &&
-                <p>Please wait while your request is being processed</p>
-            }
+            {isFetchingData && <>
+                <p>Finished fetching {doneCount}/{numResults} results</p>
+                <ProgressBar percentDone={100*doneCount/numResults}/>
+            </>}
             {results && <>
                     <a download='results.json'
                         href={`data:text/plain;charset=utf-8,${encodeURIComponent(JSON.stringify(results.map(r=>r.resultsRecord('json'))))}`}
                     >
-                        <BigButton>
-                            Download results as JSON
-                        </BigButton>
+                        <BigButton>Download results as JSON</BigButton>
                     </a>
                     <a download='results.csv'
                         href={`data:text/plain;charset=utf-8,${encodeURIComponent([...results[0].resultsRecord('').keys()].join(',') + '\n' + results.map(r=>r.resultsRecord('csv')).join('\n'))}`}
                     >
-                        <BigButton>
-                            Download results as CSV 
-                        </BigButton>
+                        <BigButton>Download results as CSV </BigButton>
                     </a>
                 </>
             }
         </div>
     )
+}
+
+function ProgressBar({percentDone}){
+    return (
+        <svg viewBox='0 0 100 7'>
+            <rect height='100%' width='100%' fill='white' stroke='black' strokeWidth='1'/>
+            <rect height='100%' width={percentDone} fill='darkgreen' strokeWidth='1'/>
+        </svg>
+    )
 }
\ No newline at end of file
diff --git a/frontend/src/spatialData.js b/frontend/src/spatialData.js
index 2fbe65b..f17ad41 100644
--- a/frontend/src/spatialData.js
+++ b/frontend/src/spatialData.js
@@ -128,4 +128,5 @@ export class SpatialData {
                 .map( TTQ => () => TTQ.fetchData() )
         )
     }
+    get queue(){ return this.#queue }
 }