QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-18 15:44:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return original state for query if query was stopped (#2164)

Browse Source
This commit is contained in:
vera-liu
2017-02-14 10:28:25 -08:00
committed by GitHub
parent a5a931a670
commit 527a8af060
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
superset/assets/javascripts/SqlLab/components/ResultSet.jsx
View File

@@ -141,6 +141,10 @@ class ResultSet extends React.PureComponent {
let sql;
if (query.state === 'stopped') {
return <Alert bsStyle="warning">Query was stopped</Alert>;
}
if (this.props.showSql) {
sql = <HighlightedSql sql={query.sql} />;
}

13
superset/assets/javascripts/SqlLab/reducers.js
View File

@@ -151,7 +151,7 @@ export const sqlLabReducer = function (state, action) {
return alterInArr(newState, 'queryEditors', sqlEditor, { latestQueryId: action.query.id });
},
[actions.STOP_QUERY]() {
return alterInObject(state, 'queries', action.query, { state: 'stopped' });
return alterInObject(state, 'queries', action.query, { state: 'stopped', results: [] });
},
[actions.CLEAR_QUERY_RESULTS]() {
const newResults = Object.assign({}, action.query.results);
@@ -162,6 +162,9 @@ export const sqlLabReducer = function (state, action) {
return alterInObject(state, 'queries', action.query, { state: 'fetching' });
},
[actions.QUERY_SUCCESS]() {
if (action.query.state === 'stopped') {
return state;
}
let rows;
if (action.results.data) {
rows = action.results.data.length;
@@ -178,6 +181,9 @@ export const sqlLabReducer = function (state, action) {
return alterInObject(state, 'queries', action.query, alts);
},
[actions.QUERY_FAILED]() {
if (action.query.state === 'stopped') {
return state;
}
const alts = { state: 'failed', errorMessage: action.msg, endDttm: now() };
return alterInObject(state, 'queries', action.query, alts);
},
@@ -237,8 +243,9 @@ export const sqlLabReducer = function (state, action) {
for (const id in action.alteredQueries) {
const changedQuery = action.alteredQueries[id];
if (
!state.queries.hasOwnProperty(id) ||
state.queries[id].changedOn !== changedQuery.changedOn) {
state.queries[id].state !== 'stopped' &&
(!state.queries.hasOwnProperty(id) ||
state.queries[id].changedOn !== changedQuery.changedOn)) {
newQueries[id] = Object.assign({}, state.queries[id], changedQuery);
change = true;
}