Skip to content

Commit c43a9fd

Browse files
committedApr 13, 2017
[hotfix] fixing the build
1 parent 6c68a21 commit c43a9fd

File tree

4 files changed

+14
-26
lines changed

4 files changed

+14
-26
lines changed
 

‎superset/assets/javascripts/explorev2/components/ChartContainer.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,8 @@ class ChartContainer extends React.PureComponent {
263263

264264
<div className="pull-right">
265265
{this.props.chartStatus === 'success' &&
266-
this.props.queryResponse &&
267-
this.props.queryResponse.is_cached &&
266+
this.props.queryResponse &&
267+
this.props.queryResponse.is_cached &&
268268
<TooltipWrapper
269269
tooltip="Loaded from cache. Click to force refresh"
270270
label="cache-desc"
@@ -275,7 +275,7 @@ class ChartContainer extends React.PureComponent {
275275
>
276276
cached
277277
</Label>
278-
</TooltipWrapper>
278+
</TooltipWrapper>
279279
}
280280
<Timer
281281
startTime={this.props.chartUpdateStartTime}

‎superset/assets/javascripts/explorev2/components/DisplayQueryButton.jsx

+10-10
Original file line numberDiff line numberDiff line change
@@ -28,34 +28,34 @@ export default class DisplayQueryButton extends React.PureComponent {
2828
this.beforeOpen = this.beforeOpen.bind(this);
2929
this.fetchQuery = this.fetchQuery.bind(this);
3030
}
31+
setStateFromQueryResponse() {
32+
const qr = this.props.queryResponse;
33+
this.setState({
34+
language: qr.language,
35+
query: qr.query,
36+
isLoading: false,
37+
});
38+
}
3139
fetchQuery() {
3240
this.setState({ isLoading: true });
3341
$.ajax({
3442
type: 'GET',
3543
url: this.props.queryEndpoint,
36-
success: data => {
44+
success: (data) => {
3745
this.setState({
3846
language: data.language,
3947
query: data.query,
4048
isLoading: false,
4149
});
4250
},
43-
error: data => {
51+
error: (data) => {
4452
this.setState({
4553
error: data.error,
4654
isLoading: false,
4755
});
4856
},
4957
});
5058
}
51-
setStateFromQueryResponse() {
52-
const qr = this.props.queryResponse;
53-
this.setState({
54-
language: qr.language,
55-
query: qr.query,
56-
isLoading: false,
57-
});
58-
}
5959
beforeOpen() {
6060
if (this.props.chartStatus === 'loading' || this.props.chartStatus === null) {
6161
this.fetchQuery();

‎superset/assets/spec/javascripts/explorev2/components/DisplayQueryButton_spec.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { expect } from 'chai';
33
import { describe, it } from 'mocha';
44
import { mount } from 'enzyme';
55
import { Modal } from 'react-bootstrap';
6-
import ModalTrigger from './../../../../javascripts/components/ModalTrigger.jsx';
6+
import ModalTrigger from './../../../../javascripts/components/ModalTrigger';
77

88
import DisplayQueryButton from '../../../../javascripts/explorev2/components/DisplayQueryButton';
99

‎superset/db_engine_specs.py

-12
Original file line numberDiff line numberDiff line change
@@ -429,18 +429,6 @@ def fetch_result_sets(cls, db, datasource_type, force=False):
429429
row['table_schema'], row['table_name']))
430430
return result_sets
431431

432-
@classmethod
433-
def extract_error_message(cls, e):
434-
"""Extract error message for queries"""
435-
logging.error(e)
436-
print("-="*100)
437-
print("-="*100)
438-
print("-="*100)
439-
print("-="*100)
440-
print(type(e))
441-
print(dir(e))
442-
return error_msg_from_exception(e)
443-
444432
@classmethod
445433
def extra_table_metadata(cls, database, table_name, schema_name):
446434
indexes = database.get_indexes(table_name, schema_name)

0 commit comments

Comments
 (0)
Please sign in to comment.