[incubator-superset] branch master updated: [bugfix] show results in query history & revert #5848 (#6436)

[graceguo]

This is an automated email from the ASF dual-hosted git repository.

graceguo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git


The following commit(s) were added to refs/heads/master by this push:
     new b1dbd1c  [bugfix] show results in query history & revert #5848 (#6436)
b1dbd1c is described below

commit b1dbd1cab64d0f18146026e49769f0dec073258a
Author: Junda Yang <young...@gmail.com>
AuthorDate: Sun Jan 13 22:31:27 2019 -0800

    [bugfix] show results in query history & revert #5848 (#6436)
    
    * revert 848
    
    * nit
---
 superset/assets/src/SqlLab/components/QueryAutoRefresh.jsx | 2 +-
 superset/assets/src/SqlLab/constants.js                    | 1 -
 superset/assets/src/SqlLab/reducers/sqlLab.js              | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/superset/assets/src/SqlLab/components/QueryAutoRefresh.jsx 
b/superset/assets/src/SqlLab/components/QueryAutoRefresh.jsx
index 295c32f..1e9fe05 100644
--- a/superset/assets/src/SqlLab/components/QueryAutoRefresh.jsx
+++ b/superset/assets/src/SqlLab/components/QueryAutoRefresh.jsx
@@ -26,7 +26,7 @@ class QueryAutoRefresh extends React.PureComponent {
     return (
       queriesLastUpdate > 0 &&
       Object.values(queries).some(
-        q => ['running', 'started', 'pending', 'fetching', 
'rendering'].indexOf(q.state) >= 0 &&
+        q => ['running', 'started', 'pending', 'fetching'].indexOf(q.state) >= 
0 &&
         now - q.startDttm < MAX_QUERY_AGE_TO_POLL,
       )
     );
diff --git a/superset/assets/src/SqlLab/constants.js 
b/superset/assets/src/SqlLab/constants.js
index 1e98aa0..b8d25cb 100644
--- a/superset/assets/src/SqlLab/constants.js
+++ b/superset/assets/src/SqlLab/constants.js
@@ -5,7 +5,6 @@ export const STATE_BSSTYLE_MAP = {
   fetching: 'info',
   running: 'warning',
   stopped: 'danger',
-  rendering: 'info',
   success: 'success',
 };
 
diff --git a/superset/assets/src/SqlLab/reducers/sqlLab.js 
b/superset/assets/src/SqlLab/reducers/sqlLab.js
index ff881c3..71d3d7b 100644
--- a/superset/assets/src/SqlLab/reducers/sqlLab.js
+++ b/superset/assets/src/SqlLab/reducers/sqlLab.js
@@ -164,7 +164,7 @@ export default function sqlLabReducer(state = {}, action) {
         progress: 100,
         results: action.results,
         rows,
-        state: 'rendering',
+        state: 'success',
         errorMessage: null,
         cached: false,
       };