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

fix(sqllab): Removed the tooltip from CopyToClipboard button in sqllab #18749

Merged
merged 4 commits into from
Feb 18, 2022
Merged

fix(sqllab): Removed the tooltip from CopyToClipboard button in sqllab #18749

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57babbd
fix(15849): Removed the tooltip from CopyToClipboard button in sqllab
prosdev0107 Feb 15, 2022
f31d405
chore(sqllab): added props for tooltip in CopyToClipboard component
prosdev0107 Feb 16, 2022
239135f
fix(sqllab): Added arg to storybook and refactor the component
prosdev0107 Feb 16, 2022
04c1c35
fix(sqllab): added a test case for hideTooltip
prosdev0107 Feb 17, 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
1 change: 1 addition & 0 deletions superset-frontend/src/SqlLab/components/ResultSet/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,7 @@ export default class ResultSet extends React.PureComponent<
<i className="fa fa-clipboard" /> {t('Copy to Clipboard')}
</Button>
}
hasTooltip={false}
/>
</ResultSetButtons>
{this.props.search && (
Expand Down
46 changes: 29 additions & 17 deletions superset-frontend/src/components/CopyToClipboard/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ const propTypes = {
tooltipText: PropTypes.string,
addDangerToast: PropTypes.func.isRequired,
addSuccessToast: PropTypes.func.isRequired,
hasTooltip: PropTypes.bool,
};

const defaultProps = {
Expand All @@ -41,6 +42,7 @@ const defaultProps = {
shouldShowText: true,
wrapped: true,
tooltipText: t('Copy to clipboard'),
hasTooltip: true,
};

class CopyToClipboard extends React.Component {
Expand Down Expand Up @@ -88,15 +90,21 @@ class CopyToClipboard extends React.Component {

renderNotWrapped() {
return (
<Tooltip
id="copy-to-clipboard-tooltip"
placement="top"
style={{ cursor: 'pointer' }}
title={this.props.tooltipText}
trigger={['hover']}
>
{this.getDecoratedCopyNode()}
</Tooltip>
<>
{this.props.hasTooltip ? (
<Tooltip
id="copy-to-clipboard-tooltip"
placement="top"
style={{ cursor: 'pointer' }}
title={this.props.tooltipText}
trigger={['hover']}
>
{this.getDecoratedCopyNode()}
</Tooltip>
) : (
this.getDecoratedCopyNode()
)}
</>
);
}

Expand All @@ -108,14 +116,18 @@ class CopyToClipboard extends React.Component {
{this.props.text}
</span>
)}
<Tooltip
id="copy-to-clipboard-tooltip"
placement="top"
title={this.props.tooltipText}
trigger={['hover']}
>
{this.getDecoratedCopyNode()}
</Tooltip>
{this.props.hasTooltip ? (
<Tooltip
id="copy-to-clipboard-tooltip"
placement="top"
title={this.props.tooltipText}
trigger={['hover']}
>
{this.getDecoratedCopyNode()}
</Tooltip>
) : (
this.getDecoratedCopyNode()
)}
</span>
);
}
Expand Down