iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: dashboard should not add extra_filters onto chart annotation (#10115)

This commit is contained in:
Grace Guo 2020-06-20 18:08:45 -07:00 committed by GitHub
parent 961b55cfba
commit 69100536de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
superset-frontend/src/chart/chartAction.js
View File

@ -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),
),
),
]);
};