Skip to content

[sql-lab] only show the reset state button if location param present #1075

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

Merged
ascott merged 2 commits into from
Sep 8, 2016
Merged

[sql-lab] only show the reset state button if location param present #1075

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6725458
only show the reset state button if location param
Sep 8, 2016
5a70310
Merge branch 'master' into alanna-toggle-reset-state
Sep 8, 2016
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
9 changes: 6 additions & 3 deletions caravel/assets/javascripts/SqlLab/components/SqlEditorLeft.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ class SqlEditorTopToolbar extends React.Component {
}
render() {
const tables = this.props.tables.filter((t) => (t.queryEditorId === this.props.queryEditor.id));
const shouldShowReset = window.location.search === '?reset=1';
Copy link
Member

@bkyryliuk bkyryliuk Sep 8, 2016

Choose a reason for hiding this comment

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

what if you have here other args?

Copy link
Member

@mistercrunch mistercrunch Sep 8, 2016

Choose a reason for hiding this comment

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

I think we have a querystring parser function in the caravel module.

Copy link
Author

@ascott ascott Sep 8, 2016

Choose a reason for hiding this comment

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

sql-lab isn't using url params for anything else currently. i think this will probably be a short term thing, so it can be toggled for a demo tomorrow. we should remove it once most of the dev work is done.

return (
<div className="clearfix sql-toolbar">
<div>
Expand Down Expand Up @@ -159,9 +160,11 @@ class SqlEditorTopToolbar extends React.Component {
<TableElement table={table} queryEditor={this.props.queryEditor} />
))}
</div>
<Button bsSize="small" bsStyle="danger" onClick={this.resetState.bind(this)}>
<i className="fa fa-bomb" /> Reset State
</Button>
{shouldShowReset &&
<Button bsSize="small" bsStyle="danger" onClick={this.resetState.bind(this)}>
<i className="fa fa-bomb" /> Reset State
</Button>
}
</div>
);
}
Expand Down