You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by hu...@apache.org on 2020/12/17 23:54:24 UTC
[incubator-superset] 02/02: clean up the code
This is an automated email from the ASF dual-hosted git repository.
hugh pushed a commit to branch hugh/ch229
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
commit e8991e037f89dd464c3303f07583e1d086d53ae9
Author: hughhhh <hu...@gmail.com>
AuthorDate: Thu Dec 17 18:53:29 2020 -0500
clean up the code
---
.../src/SqlLab/components/RunQueryActionButton.tsx | 79 ++++++----------------
1 file changed, 22 insertions(+), 57 deletions(-)
diff --git a/superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx b/superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx
index d733465..c2caae0 100644
--- a/superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx
+++ b/superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx
@@ -58,77 +58,42 @@ const RunQueryActionButton = ({
const shouldShowStopBtn =
!!queryState && ['running', 'pending'].indexOf(queryState) > -1;
- const commonBtnProps: ButtonProps = {
- buttonSize: 'small',
- buttonStyle: btnStyle,
- disabled: !dbId,
- };
-
if (shouldShowStopBtn) {
return (
- <>
- {/* <Button {...commonBtnProps} cta onClick={stopQuery}>
- <i className="fa fa-stop" /> {t('Stop')}
- </Button> */}
<Dropdown.Button
- onClick={stopQuery}
- icon={<Icon color="#00000" name="caret-down" />}
- type="primary"
- overlay={overlayCreateAsMenu}
- disabled={!sql.trim()}
- >
- <i className="fa fa-stop" /> {t('Stop')}
- </Dropdown.Button>
- </>
+ onClick={stopQuery}
+ icon={<Icon color="#00000" name="caret-down" />}
+ type="primary"
+ overlay={overlayCreateAsMenu}
+ disabled={!sql.trim()}
+ >
+ <i className="fa fa-stop" /> {t('Stop')}
+ </Dropdown.Button>
);
}
if (allowAsync) {
return (
- <>
- {/* <Button
- {...commonBtnProps}
- cta
- onClick={() => runQuery(true)}
- key="run-async-btn"
- tooltip={t('Run query asynchronously (Ctrl + ↵)')}
- disabled={!sql.trim()}
- >
- <i className="fa fa-bolt" /> {runBtnText}
- </Button> */}
- <Dropdown.Button
- onClick={() => runQuery(true)}
- icon={<Icon color="#00000" name="caret-down" />}
- type="primary"
- overlay={overlayCreateAsMenu}
- disabled={!sql.trim()}
- >
- <i className="fa fa-bolt" /> {runBtnText}
- </Dropdown.Button>
- </>
- );
- }
- return (
- <>
- {/* <Button
- {...commonBtnProps}
- cta
- onClick={() => runQuery(false)}
- key="run-btn"
- tooltip={t('Run query synchronously (Ctrl + ↵)')}
- disabled={!sql.trim()}
- >
- <i className="fa fa-refresh" /> {runBtnText}
- </Button> */}
<Dropdown.Button
- onClick={() => runQuery(false)}
+ onClick={() => runQuery(true)}
icon={<Icon color="#00000" name="caret-down" />}
type="primary"
overlay={overlayCreateAsMenu}
disabled={!sql.trim()}
>
- <i className="fa fa-refresh" /> {runBtnText}
+ <i className="fa fa-bolt" /> {runBtnText}
</Dropdown.Button>
- </>
+ );
+ }
+ return (
+ <Dropdown.Button
+ onClick={() => runQuery(false)}
+ icon={<Icon color="#00000" name="caret-down" />}
+ type="primary"
+ overlay={overlayCreateAsMenu}
+ disabled={!sql.trim()}
+ >
+ <i className="fa fa-refresh" /> {runBtnText}
+ </Dropdown.Button>
);
};