QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-21 00:54:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

add explicit message display for 'Fetching Annotation Layer' error (#3631)

Browse Source
This commit is contained in:
Grace Guo
2017-10-10 11:49:53 -07:00
committed by Maxime Beauchemin
parent b866b33dee
commit bd45e3b19a
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
superset/assets/javascripts/components/AsyncSelect.jsx
View File

@@ -42,19 +42,20 @@ class AsyncSelect extends React.PureComponent {
fetchOptions() { fetchOptions() {
this.setState({ isLoading: true }); this.setState({ isLoading: true });
const mutator = this.props.mutator; const mutator = this.props.mutator;
$.get(this.props.dataEndpoint, (data) => { $.get(this.props.dataEndpoint)
this.setState({ options: mutator ? mutator(data) : data, isLoading: false }); .done((data) => {
this.setState({ options: mutator ? mutator(data) : data, isLoading: false });
if (!this.props.value && this.props.autoSelect && this.state.options.length) { if (!this.props.value && this.props.autoSelect && this.state.options.length) {
this.onChange(this.state.options[0]); this.onChange(this.state.options[0]);
} }
}) })
.fail(() => { .fail((xhr) => {
this.props.onAsyncError(); this.props.onAsyncError(xhr.responseText);
}) })
.always(() => { .always(() => {
this.setState({ isLoading: false }); this.setState({ isLoading: false });
}); });
} }
render() { render() {
return ( return (

2
superset/assets/javascripts/explore/components/controls/SelectAsyncControl.jsx
View File

@@ -37,7 +37,7 @@ const SelectAsyncControl = ({ value, onChange, dataEndpoint,
<Select <Select
dataEndpoint={dataEndpoint} dataEndpoint={dataEndpoint}
onChange={onSelectionChange} onChange={onSelectionChange}
onAsyncError={() => notify.error(onAsyncErrorMessage)} onAsyncError={errorMsg => notify.error(onAsyncErrorMessage + ': ' + errorMsg)}
mutator={mutator} mutator={mutator}
multi={multi} multi={multi}
value={value} value={value}

2
superset/assets/visualizations/nvd3_vis.js
View File

@@ -512,7 +512,7 @@ function nvd3Vis(slice, payload) {
.call(chart); .call(chart);
// add annotation_layer // add annotation_layer
if (isTimeSeries && payload.annotations.length) { if (isTimeSeries && payload.annotations && payload.annotations.length) {
const tip = d3tip() const tip = d3tip()
.attr('class', 'd3-tip') .attr('class', 'd3-tip')
.direction('n') .direction('n')