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

[SQL Lab] Lock result set controls to be always visible #9587

Merged
merged 1 commit into from Apr 21, 2020
+48 −40
Merged

[SQL Lab] Lock result set controls to be always visible #9587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
74 changes: 34 additions & 40 deletions superset-frontend/src/SqlLab/components/ResultSet.jsx
View file
Open in desktop
Expand Up @@ -143,48 +143,42 @@ export default class ResultSet extends React.PureComponent {
}
return (
<div className="ResultSetControls">
<div className="clearfix">
<div className="pull-left">
<ButtonGroup>
{this.props.visualize && (
<ExploreResultsButton
query={this.props.query}
database={this.props.database}
actions={this.props.actions}
/>
)}
{this.props.csv && (
<Button
bsSize="small"
href={'/superset/csv/' + this.props.query.id}
>
<i className="fa fa-file-text-o" /> {t('.CSV')}
</Button>
)}
<div className="ResultSetButtons">
{this.props.visualize && (
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mostly indentation changes. the only change is the ResultSetButtons div

<ExploreResultsButton
query={this.props.query}
database={this.props.database}
actions={this.props.actions}
/>
)}
{this.props.csv && (
<Button
bsSize="small"
href={'/superset/csv/' + this.props.query.id}
>
<i className="fa fa-file-text-o" /> {t('.CSV')}
</Button>
)}

<CopyToClipboard
text={prepareCopyToClipboardTabularData(data)}
wrapped={false}
copyNode={
<Button bsSize="small">
<i className="fa fa-clipboard" /> {t('Clipboard')}
</Button>
}
/>
</ButtonGroup>
</div>
<div className="pull-right">
{this.props.search && (
<input
type="text"
onChange={this.changeSearch}
value={this.state.searchText}
className="form-control input-sm"
placeholder={t('Filter Results')}
/>
)}
</div>
<CopyToClipboard
text={prepareCopyToClipboardTabularData(data)}
wrapped={false}
copyNode={
<Button bsSize="small">
<i className="fa fa-clipboard" /> {t('Clipboard')}
</Button>
}
/>
</div>
{this.props.search && (
<input
type="text"
onChange={this.changeSearch}
value={this.state.searchText}
className="form-control input-sm"
placeholder={t('Filter Results')}
/>
)}
</div>
);
}
Expand Down
14 changes: 14 additions & 0 deletions superset-frontend/src/SqlLab/main.less
View file
Open in desktop
Expand Up @@ -359,7 +359,21 @@ div.tablePopover {
}

.ResultSetControls {
display: flex;
justify-content: space-between;
padding: 8px 0;
position: fixed;
}

.ResultSetButtons {
display: grid;
grid-auto-flow: column;
grid-gap: 4px;
padding-right: 8px;
}

.filterable-table-container {
margin-top: 48px;
}

.ace_editor {
Expand Down