diff --git a/superset/assets/javascripts/SqlLab/components/ResultSet.jsx b/superset/assets/javascripts/SqlLab/components/ResultSet.jsx index 1a4e57fc8d..ea1e8f5b29 100644 --- a/superset/assets/javascripts/SqlLab/components/ResultSet.jsx +++ b/superset/assets/javascripts/SqlLab/components/ResultSet.jsx @@ -6,6 +6,8 @@ import shortid from 'shortid'; import VisualizeModal from './VisualizeModal'; import HighlightedSql from './HighlightedSql'; +const RESULTS_CONTROLS_HEIGHT = 36; + const propTypes = { actions: React.PropTypes.object, csv: React.PropTypes.bool, @@ -52,36 +54,6 @@ class ResultSet extends React.PureComponent { this.fetchResults(nextProps.query); } } - componentWillMount() { - // hack to get height of result set table so it can be fixed and scroll in place - if (this.state.resultSetHeight === '0') { - // calculate result set table height - - // document.getElementById('brace-editor').getBoundingClientRect().height; - const sqlEditorHeight = 192; - - // document.getElementById('js-sql-toolbar').getBoundingClientRect().height; - const sqlToolbar = 30; - - // document.getElementsByClassName('nav-tabs')[0].getBoundingClientRect().height * 2; - const tabsHeight = 88; - - // document.getElementsByTagName('header')[0].getBoundingClientRect().height; - const headerHeight = 59; - - // this needs to be hardcoded since this element is in this component and has not mounted yet - const resultsControlsHeight = 30; - - const sum = - sqlEditorHeight + - sqlToolbar + - tabsHeight + - resultsControlsHeight + - headerHeight; - - this.setState({ resultSetHeight: window.innerHeight - sum - 95 }); - } - } getControls() { if (this.props.search || this.props.visualize || this.props.csv) { let csvButton; @@ -223,7 +195,10 @@ class ResultSet extends React.PureComponent { /> {this.getControls.bind(this)()} {sql} -