From f6942e287933163fb683bbc3c3532ea6abac0bfe Mon Sep 17 00:00:00 2001
From: Dan Esparza <esparza.dan@gmail.com>
Date: Mon, 6 Jan 2020 09:10:03 -0500
Subject: [PATCH] Bugfix: Correctly track elapsed time

---
 src/components/Main.js            | 4 +++-
 src/components/QueryResultList.js | 4 +++-
 src/components/QuerySeries.js     | 3 ++-
 src/components/QuerySeriesList.js | 4 +++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/components/Main.js b/src/components/Main.js
index d7ea00b..3a3be42 100644
--- a/src/components/Main.js
+++ b/src/components/Main.js
@@ -61,6 +61,7 @@ class Main extends Component {
       queryText: props.currentExpression || "",
       QueryHasError: false,
       QueryResults: QueryDataStore.getQueryResults(),
+      QueryTime: QueryDataStore.getQueryElapsedTime(),
       QueryError: QueryDataStore.getQueryError(),      
     };
   }
@@ -167,7 +168,7 @@ class Main extends Component {
             
           <div id="queryresults">
             <QueryErrorDisplay haserror={this.state.QueryHasError} error={this.state.QueryError} />
-            <QueryResultList results={this.state.QueryResults} />
+            <QueryResultList results={this.state.QueryResults} resulttime={this.state.QueryTime} />
           </div>
 
         </main>        
@@ -404,6 +405,7 @@ class Main extends Component {
     this.setState({
       QueryHasError: false,
       QueryResults: QueryDataStore.getQueryResults(),
+      QueryTime: QueryDataStore.getQueryElapsedTime(),
       QueryError: QueryDataStore.getQueryError(),          
     });
   }
diff --git a/src/components/QueryResultList.js b/src/components/QueryResultList.js
index 618e184..1d77f2d 100644
--- a/src/components/QueryResultList.js
+++ b/src/components/QueryResultList.js
@@ -12,11 +12,13 @@ class QueryResultList extends Component {
         return null;
     }
 
+    let resulttime = this.props.resulttime;
+
     //  Otherwise, loop through our results and show them:
     return (
         <React.Fragment>
             {this.props.results.map(function(resultItem) {
-                return <QuerySeriesList key={resultItem.statement_id} serieslist={resultItem.series}/>;
+                return <QuerySeriesList key={resultItem.statement_id} serieslist={resultItem.series} resulttime={resulttime}/>;
             })}
         </React.Fragment>
     );
diff --git a/src/components/QuerySeries.js b/src/components/QuerySeries.js
index 84bff64..58860d5 100644
--- a/src/components/QuerySeries.js
+++ b/src/components/QuerySeries.js
@@ -28,6 +28,7 @@ class QuerySeries extends Component {
     const { classes} = this.props;
 
     let seriesName = this.props.series.name;
+    let elapsedTime = this.props.resulttime;
 
     //  Set column information if we have it:
     let columns = this.props.series.columns;
@@ -71,7 +72,7 @@ class QuerySeries extends Component {
     return (
         <React.Fragment>
             <h2 className={classes.resultHeading}>{seriesName} </h2>            
-            <div className={classes.resultMeta}> {datarows.length} results in 2.3s</div>
+            <div className={classes.resultMeta}> {datarows.length} results in {elapsedTime}</div>
 
             <MuiVirtualizedTable 
                 rowCount={datarows.length}
diff --git a/src/components/QuerySeriesList.js b/src/components/QuerySeriesList.js
index 9202f9f..8daa343 100644
--- a/src/components/QuerySeriesList.js
+++ b/src/components/QuerySeriesList.js
@@ -13,11 +13,13 @@ class QuerySeriesList extends Component {
       return null;
     }
 
+    let resulttime = this.props.resulttime;
+
     //  Otherwise, loop through our series and show them:
     return (
         <React.Fragment>
             {this.props.serieslist.map(function(seriesItem, index) {
-                return <QuerySeries key={index} series={seriesItem}/>;
+                return <QuerySeries key={index} series={seriesItem} resulttime={resulttime}/>;
             })}
         </React.Fragment>
     );