Skip to content

Commit dbc7fef

Browse files
authoredMay 17, 2017
[sql lab] fix user timestamp is off (#2774)
1 parent cbfe3cb commit dbc7fef

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed
 

‎superset/assets/javascripts/SqlLab/components/QueryAutoRefresh.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class QueryAutoRefresh extends React.PureComponent {
3636
stopwatch() {
3737
// only poll /superset/queries/ if there are started or running queries
3838
if (this.shouldCheckForQueries()) {
39-
const url = '/superset/queries/' + (this.props.queriesLastUpdate - QUERY_UPDATE_BUFFER_MS);
39+
const url = `/superset/queries/${this.props.queriesLastUpdate - QUERY_UPDATE_BUFFER_MS}`;
4040
$.getJSON(url, (data) => {
4141
if (Object.keys(data).length > 0) {
4242
this.props.actions.refreshQueries(data);

‎superset/assets/javascripts/SqlLab/reducers.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -233,19 +233,22 @@ export const sqlLabReducer = function (state, action) {
233233
let newQueries = Object.assign({}, state.queries);
234234
// Fetch the updates to the queries present in the store.
235235
let change = false;
236+
let queriesLastUpdate = state.queriesLastUpdate;
236237
for (const id in action.alteredQueries) {
237238
const changedQuery = action.alteredQueries[id];
238239
if (!state.queries.hasOwnProperty(id) ||
239240
(state.queries[id].changedOn !== changedQuery.changedOn &&
240241
state.queries[id].state !== 'stopped')) {
242+
if (changedQuery.changedOn > queriesLastUpdate) {
243+
queriesLastUpdate = changedQuery.changedOn;
244+
}
241245
newQueries[id] = Object.assign({}, state.queries[id], changedQuery);
242246
change = true;
243247
}
244248
}
245249
if (!change) {
246250
newQueries = state.queries;
247251
}
248-
const queriesLastUpdate = now();
249252
return Object.assign({}, state, { queries: newQueries, queriesLastUpdate });
250253
},
251254
};

0 commit comments

Comments
 (0)
Please sign in to comment.