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 6910053 fix: dashboard should not add extra_filters onto chart annotation (#10115) 6910053 is described below commit 69100536de1a76a2a5195d4d28a02ed5bdde9b69 Author: Grace Guo <grace....@airbnb.com> AuthorDate: Sat Jun 20 18:08:45 2020 -0700 fix: dashboard should not add extra_filters onto chart annotation (#10115) --- superset-frontend/src/chart/chartAction.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/superset-frontend/src/chart/chartAction.js b/superset-frontend/src/chart/chartAction.js index 7ea14ae..b4328ba 100644 --- a/superset-frontend/src/chart/chartAction.js +++ b/superset-frontend/src/chart/chartAction.js @@ -221,6 +221,7 @@ export function runAnnotationQuery( timeout = 60, formData = null, key, + isDashboardRequest = false, ) { return function (dispatch, getState) { const sliceKey = key || Object.keys(getState().charts)[0]; @@ -251,7 +252,7 @@ export function runAnnotationQuery( {}, ); - if (fd !== null) { + if (!isDashboardRequest && fd) { const hasExtraFilters = fd.extra_filters && fd.extra_filters.length > 0; sliceFormData.extra_filters = hasExtraFilters ? fd.extra_filters @@ -410,13 +411,16 @@ export function exploreJSON( }); const annotationLayers = formData.annotation_layers || []; + const isDashboardRequest = dashboardId > 0; return Promise.all([ chartDataRequestCaught, dispatch(triggerQuery(false, key)), dispatch(updateQueryFormData(formData, key)), ...annotationLayers.map(x => - dispatch(runAnnotationQuery(x, timeout, formData, key)), + dispatch( + runAnnotationQuery(x, timeout, formData, key, isDashboardRequest), + ), ), ]); };