graceguo-supercat closed pull request #4630: [Bug fix] Fixed/Refactored
annotation layer code so that non-timeseries annotations are applied based on
the updated chart object after adding all data
URL: https://github.com/apache/incubator-superset/pull/4630
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/superset/assets/visualizations/nvd3_vis.js
b/superset/assets/visualizations/nvd3_vis.js
index 7cfb1c3320..9ce02bd031 100644
--- a/superset/assets/visualizations/nvd3_vis.js
+++ b/superset/assets/visualizations/nvd3_vis.js
@@ -533,6 +533,28 @@ function nvd3Vis(slice, payload) {
chart.yAxis.axisLabel(fd.y_axis_label).axisLabelDistance(distance);
}
+ const annotationLayers = (slice.formData.annotation_layers ||
[]).filter(x => x.show);
+ if (isTimeSeries && annotationLayers && slice.annotationData) {
+ // Time series annotations add additional data
+ const timeSeriesAnnotations = annotationLayers
+ .filter(a => a.annotationType ===
AnnotationTypes.TIME_SERIES).reduce((bushel, a) =>
+ bushel.concat((slice.annotationData[a.name] || []).map((series) => {
+ if (!series) {
+ return {};
+ }
+ const key = Array.isArray(series.key) ?
+ `${a.name}, ${series.key.join(', ')}` : a.name;
+ return {
+ ...series,
+ key,
+ color: a.color,
+ strokeWidth: a.width,
+ classed: `${a.opacity} ${a.style}`,
+ };
+ })), []);
+ data.push(...timeSeriesAnnotations);
+ }
+
// render chart
svg
.datum(data)
@@ -544,8 +566,7 @@ function nvd3Vis(slice, payload) {
// on scroll, hide tooltips. throttle to only 4x/second.
$(window).scroll(throttle(hideTooltips, 250));
- const annotationLayers = (slice.formData.annotation_layers ||
[]).filter(x => x.show);
-
+ // The below code should be run AFTER rendering because chart is updated
in call()
if (isTimeSeries && annotationLayers) {
// Formula annotations
const formulas = annotationLayers.filter(a => a.annotationType ===
AnnotationTypes.FORMULA)
@@ -620,7 +641,7 @@ function nvd3Vis(slice, payload) {
'<div>' + body.join(', ') + '</div>';
});
- if (slice.annotationData && Object.keys(slice.annotationData).length) {
+ if (slice.annotationData) {
// Event annotations
annotationLayers.filter(x => (
x.annotationType === AnnotationTypes.EVENT &&
@@ -674,7 +695,6 @@ function nvd3Vis(slice, payload) {
}
});
-
// Interval annotations
annotationLayers.filter(x => (
x.annotationType === AnnotationTypes.INTERVAL &&
@@ -737,33 +757,8 @@ function nvd3Vis(slice, payload) {
.call(tip);
}
});
-
- // Time series annotations
- const timeSeriesAnnotations = annotationLayers
- .filter(a => a.annotationType ===
AnnotationTypes.TIME_SERIES).reduce((bushel, a) =>
- bushel.concat((slice.annotationData[a.name] || []).map((series)
=> {
- if (!series) {
- return {};
- }
- const key = Array.isArray(series.key) ?
- `${a.name}, ${series.key.join(', ')}` : a.name;
- return {
- ...series,
- key,
- color: a.color,
- strokeWidth: a.width,
- classed: `${a.opacity} ${a.style}`,
- };
- })), []);
- data.push(...timeSeriesAnnotations);
}
}
-
- // rerender chart
- svg.datum(data)
- .attr('height', height)
- .attr('width', width)
- .call(chart);
}
return chart;
};
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
