Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[bug fixes] annotations <> x domains, zeros in text #4194

Merged
merged 3 commits into from
Mar 15, 2018
Merged

[bug fixes] annotations <> x domains, zeros in text #4194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d64711c
[bugs] account for annotations in nvd3 x scale domain, fix dynamic wi…
williaster Jan 11, 2018
f24868e
tweak TextControl casting
williaster Jan 11, 2018
9ac4918
[annotations] filter separately from finding data extent
williaster Mar 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions superset/assets/javascripts/explore/components/controls/TextControl.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@ export default class TextControl extends React.Component {
this.onChange = this.onChange.bind(this);
}
onChange(event) {
let value = event.target.value || '';
let value = event.target.value;

// Validation & casting
const errors = [];
if (this.props.isFloat) {
if (value !== '' && this.props.isFloat) {
const error = v.numeric(value);
if (error) {
errors.push(error);
} else {
value = parseFloat(value);
}
}
if (this.props.isInt) {
if (value !== '' && this.props.isInt) {
const error = v.integer(value);
if (error) {
errors.push(error);
Expand All @@ -54,7 +54,8 @@ export default class TextControl extends React.Component {
this.props.onChange(value, errors);
}
render() {
const value = this.props.value ? this.props.value.toString() : '';
const { value: rawValue } = this.props;
const value = typeof rawValue !== 'undefined' && rawValue !== null ? rawValue.toString() : '';
return (
<div>
<ControlHeader {...this.props} />
Expand Down
52 changes: 41 additions & 11 deletions superset/assets/visualizations/nvd3_vis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,8 +539,8 @@ 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);
const annotationLayers = (slice.formData.annotation_layers || []).filter(x => x.show);

if (isTimeSeries && annotationLayers) {
// Formula annotations
const formulas = annotationLayers.filter(a => a.annotationType === AnnotationTypes.FORMULA)
Expand Down Expand Up @@ -629,13 +629,27 @@ function nvd3Vis(slice, payload) {

const tip = tipFactory(e);
const records = (slice.annotationData[e.name].records || []).map((r) => {
const timeColumn = new Date(moment.utc(r[e.timeColumn]));
const timeValue = new Date(moment.utc(r[e.timeColumn]));

return {
...r,
[e.timeColumn]: timeColumn,
[e.timeColumn]: timeValue,
};
}).filter(r => !Number.isNaN(r[e.timeColumn].getMilliseconds()));
}).filter(record => !Number.isNaN(record[e.timeColumn].getMilliseconds()));

// account for the annotation in the x domain
records.forEach((record) => {
const timeValue = record[e.timeColumn];

xMin = Math.min(...[xMin, timeValue]);
xMax = Math.max(...[xMax, timeValue]);
});

if (records.length) {
const domain = [xMin, xMax];
xScale.domain(domain);
chart.xDomain(domain);

annotations.selectAll('line')
.data(records)
.enter()
Expand Down Expand Up @@ -670,16 +684,32 @@ function nvd3Vis(slice, payload) {
const tip = tipFactory(e);

const records = (slice.annotationData[e.name].records || []).map((r) => {
const timeColumn = new Date(moment.utc(r[e.timeColumn]));
const intervalEndColumn = new Date(moment.utc(r[e.intervalEndColumn]));
const timeValue = new Date(moment.utc(r[e.timeColumn]));
const intervalEndValue = new Date(moment.utc(r[e.intervalEndColumn]));
return {
...r,
[e.timeColumn]: timeColumn,
[e.intervalEndColumn]: intervalEndColumn,
[e.timeColumn]: timeValue,
[e.intervalEndColumn]: intervalEndValue,
};
}).filter(r => !Number.isNaN(r[e.timeColumn].getMilliseconds()) &&
!Number.isNaN(r[e.intervalEndColumn].getMilliseconds()));
}).filter(record => (
!Number.isNaN(record[e.timeColumn].getMilliseconds()) &&
!Number.isNaN(record[e.intervalEndColumn].getMilliseconds())
));

// account for the annotation in the x domain
records.forEach((record) => {
const timeValue = record[e.timeColumn];
const intervalEndValue = record[e.intervalEndColumn];

xMin = Math.min(...[xMin, timeValue, intervalEndValue]);
xMax = Math.max(...[xMax, timeValue, intervalEndValue]);
});

if (records.length) {
const domain = [xMin, xMax];
xScale.domain(domain);
chart.xDomain(domain);

annotations.selectAll('rect')
.data(records)
.enter()
Expand Down