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

Allow execution of highlighted subquery #3288

Merged
merged 9 commits into from
Jan 20, 2019
Merged

Allow execution of highlighted subquery #3288

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d7abefe
allow execution of selected subquery
chang Jan 16, 2019
1306521
fix query save while highlighted
chang Jan 16, 2019
eae55ff
don't modify queryText and update UI when running selected
chang Jan 18, 2019
78e16f7
Merge branch 'master' into run-selected-query
chang Jan 18, 2019
516e812
code style and transition
chang Jan 18, 2019
ae9fffd
Merge branch 'master' into run-selected-query
chang Jan 18, 2019
9398807
Fix query selection execution background color
ranbena Jan 18, 2019
44f4853
Merge pull request #1 from getredash/select-exec-bg
chang Jan 18, 2019
8d61595
make naming consistent
chang Jan 18, 2019
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
23 changes: 22 additions & 1 deletion client/app/components/QueryEditor.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ class QueryEditor extends React.Component {

onLoad = (editor) => {
// Release Cmd/Ctrl+L to the browser
this.editor = editor;
chang marked this conversation as resolved.
Show resolved Hide resolved
editor.commands.bindKey('Cmd+L', null);
editor.commands.bindKey('Ctrl+P', null);
editor.commands.bindKey('Ctrl+L', null);
Expand Down Expand Up @@ -181,6 +182,25 @@ class QueryEditor extends React.Component {
});
};

setFullUnhighlightedQuery = () => {
this.props.updateQuery(this.state.queryText);
}

updateQueryWithSelection = (selection) => {
const doc = this.editor.getSession().doc;
const highlightedQueryText = doc.getTextRange(selection.getRange());
if (highlightedQueryText.length > 1) {
this.props.updateQuery(highlightedQueryText);
} else {
this.setFullUnhighlightedQuery();
}
}

saveQuery = (customOptions, data) => {
this.setFullUnhighlightedQuery();
this.props.saveQuery(customOptions, data);
}

updateQuery = (queryText) => {
this.props.updateQuery(queryText);
this.setState({ queryText });
Expand Down Expand Up @@ -229,6 +249,7 @@ class QueryEditor extends React.Component {
onLoad={this.onLoad}
onPaste={this.onPaste}
onChange={this.updateQuery}
onSelectionChange={this.updateQueryWithSelection}
/>
</div>

Expand Down Expand Up @@ -269,7 +290,7 @@ class QueryEditor extends React.Component {
</select>
{this.props.canEdit ? (
<Tooltip placement="top" title={modKey + ' + S'}>
<button className="btn btn-default m-l-5" onClick={this.props.saveQuery} title="Save">
<button className="btn btn-default m-l-5" onClick={this.saveQuery} title="Save">
<span className="fa fa-floppy-o" />
<span className="hidden-xs m-l-5">Save</span>
{this.props.isDirty ? '*' : null}
Expand Down