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

fix (SQL Lab): disappearing results on tab switch #12472

Merged
merged 3 commits into from
Jan 13, 2021
Merged

fix (SQL Lab): disappearing results on tab switch #12472

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
62abc19
fix (SQL Lab): disappearing results on tab switch
betodealmeida Jan 12, 2021
35b6b3e
Remove state
betodealmeida Jan 13, 2021
1907dc2
Fix test
betodealmeida Jan 13, 2021
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
8 changes: 1 addition & 7 deletions superset-frontend/spec/javascripts/sqllab/SouthPane_spec.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import React from 'react';
import configureStore from 'redux-mock-store';
import thunk from 'redux-thunk';
import { styledShallow as shallow } from 'spec/helpers/theming';
import SouthPaneContainer, { SouthPane } from 'src/SqlLab/components/SouthPane';
import SouthPaneContainer from 'src/SqlLab/components/SouthPane';
import ResultSet from 'src/SqlLab/components/ResultSet';
import { STATUS_OPTIONS } from 'src/SqlLab/constants';
import { initialState } from './fixtures';
Expand Down Expand Up @@ -80,12 +80,6 @@ describe('SouthPane', () => {

let wrapper;

beforeAll(() => {
jest
.spyOn(SouthPane.prototype, 'getSouthPaneHeight')
.mockImplementation(() => 500);
});

it('should render offline when the state is offline', () => {
wrapper = getWrapper();
wrapper.setProps({ offline: true });
Expand Down
18 changes: 1 addition & 17 deletions superset-frontend/src/SqlLab/components/SouthPane.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,26 +86,10 @@ const StyledPane = styled.div`
export class SouthPane extends React.PureComponent {
constructor(props) {
super(props);
this.state = {
height: props.height,
};
this.southPaneRef = React.createRef();
this.getSouthPaneHeight = this.getSouthPaneHeight.bind(this);
this.switchTab = this.switchTab.bind(this);
}

UNSAFE_componentWillReceiveProps() {
// south pane expands the entire height of the tab content on mount
this.setState({ height: this.getSouthPaneHeight() });
}

// One layer of abstraction for easy spying in unit tests
getSouthPaneHeight() {
return this.southPaneRef.current
? this.southPaneRef.current.clientHeight
: 0;
}

switchTab(id) {
this.props.actions.setActiveSouthPaneTab(id);
}
Expand All @@ -121,7 +105,7 @@ export class SouthPane extends React.PureComponent {
</Label>
);
}
const innerTabContentHeight = this.state.height - TAB_HEIGHT;
const innerTabContentHeight = this.props.height - TAB_HEIGHT;
let latestQuery;
const { props } = this;
if (props.editorQueries.length > 0) {
Expand Down