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(sqllab): fix control x to stop query #21899

Merged
merged 3 commits into from
Oct 24, 2022
Merged

fix(sqllab): fix control x to stop query #21899

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95b7051
fix for control x
pkdotson Oct 21, 2022
2790ebb
fix lint
pkdotson Oct 21, 2022
91b6f97
ugh more lint
pkdotson Oct 21, 2022
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
17 changes: 10 additions & 7 deletions superset-frontend/src/SqlLab/components/SqlEditor/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ const SqlEditor = ({
if (latestQuery && ['running', 'pending'].indexOf(latestQuery.state) >= 0) {
dispatch(postStopQuery(latestQuery));
}
return false;
Copy link
Member

Choose a reason for hiding this comment

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

What is this used for?

Copy link
Member Author

@pkdotson pkdotson Oct 21, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

yes to prevent the event from bubbling up. This is for the stopquery fn. Mousetrap sometimes recommends this.

};

const runQuery = () => {
Expand All @@ -244,7 +245,6 @@ const SqlEditor = ({
const getHotkeyConfig = () => {
// Get the user's OS
const userOS = detectOS();

const base = [
{
name: 'runQuery1',
Expand Down Expand Up @@ -326,18 +326,21 @@ const SqlEditor = ({
window.addEventListener('resize', handleWindowResizeWithThrottle);
window.addEventListener('beforeunload', onBeforeUnload);

// setup hotkeys
const hotkeys = getHotkeyConfig();
hotkeys.forEach(keyConfig => {
Mousetrap.bind([keyConfig.key], keyConfig.func);
});

return () => {
window.removeEventListener('resize', handleWindowResizeWithThrottle);
window.removeEventListener('beforeunload', onBeforeUnload);
};
}, []);

useEffect(() => {
// setup hotkeys
Mousetrap.reset();
const hotkeys = getHotkeyConfig();
hotkeys.forEach(keyConfig => {
Mousetrap.bind([keyConfig.key], keyConfig.func);
});
}, [latestQuery]);

const onResizeStart = () => {
// Set the heights on the ace editor and the ace content area after drag starts
// to smooth out the visual transition to the new heights when drag ends
Expand Down