Skip to content

Show tooltip with time frame #6979

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
xtinec merged 1 commit into from
Mar 13, 2019
Merged

Show tooltip with time frame #6979

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 25 additions & 9 deletions superset/assets/src/explore/components/controls/DateFilterControl.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import {
Radio,
Tab,
Tabs,
Tooltip,
} from 'react-bootstrap';
import Datetime from 'react-datetime';
import 'react-datetime/css/react-datetime.css';
Expand Down Expand Up @@ -311,15 +312,30 @@ export default class DateFilterControl extends React.Component {
{grain}
</MenuItem>
));
const timeFrames = COMMON_TIME_FRAMES.map(timeFrame => (
<Radio
key={timeFrame.replace(' ', '').toLowerCase()}
checked={this.state.common === timeFrame}
onChange={() => this.setState(getStateFromCommonTimeFrame(timeFrame))}
>
{timeFrame}
</Radio>
));
const timeFrames = COMMON_TIME_FRAMES.map((timeFrame) => {
const nextState = getStateFromCommonTimeFrame(timeFrame);
return (
<OverlayTrigger
key={timeFrame}
placement="left"
overlay={
<Tooltip id={`tooltip-${timeFrame}`}>
{nextState.since}<br />{nextState.until}
</Tooltip>
}
>
<div>
<Radio
key={timeFrame.replace(' ', '').toLowerCase()}
checked={this.state.common === timeFrame}
onChange={() => this.setState(nextState)}
>
{timeFrame}
</Radio>
</div>
</OverlayTrigger>
);
});
return (
<Popover id="filter-popover" placement="top" positionTop={0}>
<div style={{ width: '250px' }}>
Expand Down