pt
/
superset
mirror of https://github.com/apache/superset.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix annotation cache (#18788)

This commit is contained in:
Geido 2022-02-21 16:57:22 +02:00 committed by GitHub
parent c491829e99
commit 535634310b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,14 +244,14 @@ export async function getChartDataRequest({
);
}
export function runAnnotationQuery(
export function runAnnotationQuery({
annotation,
timeout = 60,
formData = null,
key,
isDashboardRequest = false,
force = false,
) {
}) {
return function (dispatch, getState) {
const sliceKey = key || Object.keys(getState().charts)[0];
// make a copy of formData, not modifying original formData
@ -482,16 +482,16 @@ export function exploreJSON(
chartDataRequestCaught,
dispatch(triggerQuery(false, key)),
dispatch(updateQueryFormData(formData, key)),
...annotationLayers.map(x =>
...annotationLayers.map(annotation =>
dispatch(
runAnnotationQuery(
x,
runAnnotationQuery({
annotation,
timeout,
formData,
key,
isDashboardRequest,
force,
),
}),
),
),
]);

10
superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.jsx
View File

@ -98,7 +98,11 @@ class AnnotationLayerControl extends React.PureComponent {
this.setState({ addedAnnotationIndex: annotations.length - 1 });
}
this.props.refreshAnnotationData(newAnnotation);
this.props.refreshAnnotationData({
annotation: newAnnotation,
force: true,
});
this.props.onChange(annotations);
}
@ -239,8 +243,8 @@ function mapStateToProps({ charts, explore }) {
function mapDispatchToProps(dispatch) {
return {
refreshAnnotationData: annotationLayer =>
dispatch(runAnnotationQuery(annotationLayer)),
refreshAnnotationData: annotationObj =>
dispatch(runAnnotationQuery(annotationObj)),
};
}