diff --git a/superset/assets/src/explore/components/controls/DateFilterControl.jsx b/superset/assets/src/explore/components/controls/DateFilterControl.jsx index 9e07b99037ca..b068945bb6a7 100644 --- a/superset/assets/src/explore/components/controls/DateFilterControl.jsx +++ b/superset/assets/src/explore/components/controls/DateFilterControl.jsx @@ -32,6 +32,7 @@ import { Radio, Tab, Tabs, + Tooltip, } from 'react-bootstrap'; import Datetime from 'react-datetime'; import 'react-datetime/css/react-datetime.css'; @@ -311,15 +312,30 @@ export default class DateFilterControl extends React.Component { {grain} )); - const timeFrames = COMMON_TIME_FRAMES.map(timeFrame => ( - this.setState(getStateFromCommonTimeFrame(timeFrame))} - > - {timeFrame} - - )); + const timeFrames = COMMON_TIME_FRAMES.map((timeFrame) => { + const nextState = getStateFromCommonTimeFrame(timeFrame); + return ( + + {nextState.since}
{nextState.until} + + } + > +
+ this.setState(nextState)} + > + {timeFrame} + +
+
+ ); + }); return (