From fb2341ab72a70c574a69b03331bbaf2058476214 Mon Sep 17 00:00:00 2001 From: Junda Yang Date: Sun, 13 Jan 2019 22:31:27 -0800 Subject: [PATCH] [bugfix] show results in query history & revert #5848 (#6436) * revert 848 * nit (cherry picked from commit b1dbd1cab64d0f18146026e49769f0dec073258a) --- 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 295c32f8bb657..1e9fe05e1b6c8 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 1e98aa0257809..b8d25cb1da721 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 ff881c327a3ee..71d3d7b0e204c 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, };