-
+
{/* Add a tooltip only for long dataset names */}
{!isMissingDatasource && datasource.name.length > 25 ? (
@@ -218,10 +223,9 @@ class DatasourceControl extends React.PureComponent {
data-test="datasource-menu"
>
-
diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx
index 5f078c7449..efc632300a 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx
@@ -21,9 +21,9 @@ import rison from 'rison';
import {
SupersetClient,
styled,
- supersetTheme,
t,
TimeRangeEndpoints,
+ useTheme,
} from '@superset-ui/core';
import {
buildTimeRangeString,
@@ -39,7 +39,7 @@ import ControlHeader from 'src/explore/components/ControlHeader';
import Label from 'src/components/Label';
import Popover from 'src/components/Popover';
import { Divider } from 'src/common/components';
-import Icon from 'src/components/Icon';
+import Icons from 'src/components/Icons';
import { Select } from 'src/components/Select';
import { Tooltip } from 'src/components/Tooltip';
import { DEFAULT_TIME_RANGE } from 'src/explore/constants';
@@ -156,7 +156,7 @@ const ContentStyleWrapper = styled.div`
`;
const IconWrapper = styled.span`
- svg {
+ span {
margin-right: ${({ theme }) => 2 * theme.gridUnit}px;
vertical-align: middle;
}
@@ -281,6 +281,8 @@ export default function DateFilterLabel(props: DateFilterControlProps) {
setFrame(option.value as FrameType);
}
+ const theme = useTheme();
+
const overlayConetent = (
{t('RANGE TYPE')}
@@ -310,10 +312,7 @@ export default function DateFilterLabel(props: DateFilterControlProps) {
{validTimeRange && {evalResponse}
}
{!validTimeRange && (
-
+
{evalResponse}
)}
@@ -345,7 +344,7 @@ export default function DateFilterLabel(props: DateFilterControlProps) {
const title = (
-
+
{t('Edit time range')}
);