diff --git a/superset-frontend/spec/javascripts/explore/components/AdhocMetricEditPopoverTitle_spec.jsx b/superset-frontend/spec/javascripts/explore/components/AdhocMetricEditPopoverTitle_spec.jsx index 360995005eac8..dd2b007bf91be 100644 --- a/superset-frontend/spec/javascripts/explore/components/AdhocMetricEditPopoverTitle_spec.jsx +++ b/superset-frontend/spec/javascripts/explore/components/AdhocMetricEditPopoverTitle_spec.jsx @@ -20,7 +20,7 @@ import React from 'react'; import sinon from 'sinon'; import { shallow } from 'enzyme'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import AdhocMetricEditPopoverTitle from 'src/explore/components/controls/MetricControl/AdhocMetricEditPopoverTitle'; diff --git a/superset-frontend/spec/javascripts/explore/components/DatasourceControl_spec.jsx b/superset-frontend/spec/javascripts/explore/components/DatasourceControl_spec.jsx index 594a3a6cbb692..d2bec10573474 100644 --- a/superset-frontend/spec/javascripts/explore/components/DatasourceControl_spec.jsx +++ b/superset-frontend/spec/javascripts/explore/components/DatasourceControl_spec.jsx @@ -25,7 +25,7 @@ import DatasourceModal from 'src/datasource/DatasourceModal'; import ChangeDatasourceModal from 'src/datasource/ChangeDatasourceModal'; import DatasourceControl from 'src/explore/components/controls/DatasourceControl'; import Icon from 'src/components/Icon'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; const defaultProps = { name: 'datasource', diff --git a/superset-frontend/spec/javascripts/explore/components/RowCountLabel_spec.jsx b/superset-frontend/spec/javascripts/explore/components/RowCountLabel_spec.jsx index 7a669c9937923..128a0329c298f 100644 --- a/superset-frontend/spec/javascripts/explore/components/RowCountLabel_spec.jsx +++ b/superset-frontend/spec/javascripts/explore/components/RowCountLabel_spec.jsx @@ -20,7 +20,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import Label from 'src/components/Label'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import RowCountLabel from 'src/explore/components/RowCountLabel'; describe('RowCountLabel', () => { diff --git a/superset-frontend/src/CRUD/Field.jsx b/superset-frontend/src/CRUD/Field.jsx index 006f253e3f30e..1ed8a5e3780ea 100644 --- a/superset-frontend/src/CRUD/Field.jsx +++ b/superset-frontend/src/CRUD/Field.jsx @@ -20,7 +20,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { FormGroup, HelpBlock, FormControl } from 'react-bootstrap'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import FormLabel from 'src/components/FormLabel'; import './crud.less'; diff --git a/superset-frontend/src/SqlLab/components/ColumnElement.tsx b/superset-frontend/src/SqlLab/components/ColumnElement.tsx index 8f1953dd79937..85c2af058c6ad 100644 --- a/superset-frontend/src/SqlLab/components/ColumnElement.tsx +++ b/superset-frontend/src/SqlLab/components/ColumnElement.tsx @@ -21,7 +21,7 @@ import PropTypes from 'prop-types'; import { ClassNames } from '@emotion/core'; import { styled, useTheme } from '@superset-ui/core'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; const propTypes = { column: PropTypes.object.isRequired, diff --git a/superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx b/superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx index 45f0bf47d575c..1bedafd2119d2 100644 --- a/superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx +++ b/superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx @@ -28,7 +28,7 @@ import { styled, t } from '@superset-ui/core'; import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags'; import { areArraysShallowEqual } from 'src/reduxUtils'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import { detectOS } from 'src/utils/common'; import * as Actions from '../actions/sqlLab'; import SqlEditor from './SqlEditor'; diff --git a/superset-frontend/src/SqlLab/components/TableElement.jsx b/superset-frontend/src/SqlLab/components/TableElement.jsx index 497f094bd0fcf..a2dd2a0968866 100644 --- a/superset-frontend/src/SqlLab/components/TableElement.jsx +++ b/superset-frontend/src/SqlLab/components/TableElement.jsx @@ -25,7 +25,7 @@ import shortid from 'shortid'; import { t, styled } from '@superset-ui/core'; import { debounce } from 'lodash'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import CopyToClipboard from '../../components/CopyToClipboard'; import { IconTooltip } from '../../components/IconTooltip'; import ColumnElement from './ColumnElement'; diff --git a/superset-frontend/src/SqlLab/components/TemplateParamsEditor.tsx b/superset-frontend/src/SqlLab/components/TemplateParamsEditor.tsx index 5d30a88f31053..1e18040694c2a 100644 --- a/superset-frontend/src/SqlLab/components/TemplateParamsEditor.tsx +++ b/superset-frontend/src/SqlLab/components/TemplateParamsEditor.tsx @@ -25,7 +25,7 @@ import { debounce } from 'lodash'; import ModalTrigger from 'src/components/ModalTrigger'; import { ConfigEditor } from 'src/components/AsyncAceEditor'; import { FAST_DEBOUNCE } from 'src/constants'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; const StyledConfigEditor = styled(ConfigEditor)` &.ace_editor { diff --git a/superset-frontend/src/common/components/common.stories.tsx b/superset-frontend/src/common/components/common.stories.tsx index d9987f2af55d2..3ae33ee552621 100644 --- a/superset-frontend/src/common/components/common.stories.tsx +++ b/superset-frontend/src/common/components/common.stories.tsx @@ -18,13 +18,11 @@ */ import React, { useState, useRef, useCallback } from 'react'; import { action } from '@storybook/addon-actions'; -import { withKnobs, boolean, select } from '@storybook/addon-knobs'; -import Button from 'src/components/Button'; +import { withKnobs, boolean } from '@storybook/addon-knobs'; import { CronPicker, CronError } from 'src/components/CronPicker'; import Modal from 'src/components/Modal'; import InfoTooltip from 'src/components/InfoTooltip'; import Tabs, { EditableTabs } from './Tabs'; -import { Tooltip as AntdTooltip } from './Tooltip'; import { Menu, Input, Divider } from '.'; import { Dropdown } from './Dropdown'; @@ -121,34 +119,6 @@ export const TabsWithDropdownMenu = () => ( ); -export const Tooltip = () => ( - - - -); - export const StyledInfoTooltip = (args: any) => { const styles = { padding: '100px 0 0 200px', diff --git a/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTag.test.jsx b/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTag.test.jsx index 4bec3da0945ae..17941445c9acd 100644 --- a/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTag.test.jsx +++ b/superset-frontend/src/components/AlteredSliceTag/AlteredSliceTag.test.jsx @@ -22,7 +22,7 @@ import { getChartControlPanelRegistry } from '@superset-ui/core'; import AlteredSliceTag from 'src/components/AlteredSliceTag'; import ModalTrigger from 'src/components/ModalTrigger'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import TableCollection from 'src/components/dataViewCommon/TableCollection'; import TableView from 'src/components/TableView'; diff --git a/superset-frontend/src/components/AlteredSliceTag/index.jsx b/superset-frontend/src/components/AlteredSliceTag/index.jsx index df0cff50f1b19..4601992a22808 100644 --- a/superset-frontend/src/components/AlteredSliceTag/index.jsx +++ b/superset-frontend/src/components/AlteredSliceTag/index.jsx @@ -22,7 +22,7 @@ import { isEqual, isEmpty } from 'lodash'; import { t } from '@superset-ui/core'; import getControlsForVizType from 'src/utils/getControlsForVizType'; import { safeStringify } from 'src/utils/safeStringify'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import ModalTrigger from '../ModalTrigger'; import TableView from '../TableView'; diff --git a/superset-frontend/src/components/Button/index.tsx b/superset-frontend/src/components/Button/index.tsx index 347c6b8dac0c9..1f9d737836b0d 100644 --- a/superset-frontend/src/components/Button/index.tsx +++ b/superset-frontend/src/components/Button/index.tsx @@ -22,7 +22,7 @@ import { mix } from 'polished'; import cx from 'classnames'; import { Button as AntdButton } from 'antd'; import { useTheme } from '@superset-ui/core'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; export type OnClickHandler = React.MouseEventHandler; diff --git a/superset-frontend/src/components/CachedLabel/index.tsx b/superset-frontend/src/components/CachedLabel/index.tsx index 9b349a734c4ab..5a42949f5237c 100644 --- a/superset-frontend/src/components/CachedLabel/index.tsx +++ b/superset-frontend/src/components/CachedLabel/index.tsx @@ -19,7 +19,7 @@ import React, { useState } from 'react'; import { t } from '@superset-ui/core'; import Label from 'src/components/Label'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import { TooltipContent } from './TooltipContent'; interface Props { diff --git a/superset-frontend/src/components/CertifiedIcon/index.tsx b/superset-frontend/src/components/CertifiedIcon/index.tsx index 5f35a889d6176..49278a6cbce5e 100644 --- a/superset-frontend/src/components/CertifiedIcon/index.tsx +++ b/superset-frontend/src/components/CertifiedIcon/index.tsx @@ -19,7 +19,7 @@ import React from 'react'; import { t, supersetTheme } from '@superset-ui/core'; import Icon from 'src/components/Icon'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; export interface CertifiedIconProps { certifiedBy?: string; diff --git a/superset-frontend/src/components/CopyToClipboard/index.jsx b/superset-frontend/src/components/CopyToClipboard/index.jsx index bff6116857a32..8f384bcaa46cf 100644 --- a/superset-frontend/src/components/CopyToClipboard/index.jsx +++ b/superset-frontend/src/components/CopyToClipboard/index.jsx @@ -19,7 +19,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { t } from '@superset-ui/core'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import withToasts from 'src/messageToasts/enhancers/withToasts'; import copyTextToClipboard from 'src/utils/copy'; diff --git a/superset-frontend/src/components/EditableTitle/index.tsx b/superset-frontend/src/components/EditableTitle/index.tsx index 5d407d20376f5..f1685daca48f1 100644 --- a/superset-frontend/src/components/EditableTitle/index.tsx +++ b/superset-frontend/src/components/EditableTitle/index.tsx @@ -19,7 +19,7 @@ import React, { useEffect, useState, useRef } from 'react'; import cx from 'classnames'; import { t } from '@superset-ui/core'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; export interface EditableTitleProps { canEdit?: boolean; diff --git a/superset-frontend/src/components/FacePile/index.tsx b/superset-frontend/src/components/FacePile/index.tsx index 025c8e83dc9dc..45daae643528c 100644 --- a/superset-frontend/src/components/FacePile/index.tsx +++ b/superset-frontend/src/components/FacePile/index.tsx @@ -22,7 +22,7 @@ import { styled, SupersetTheme, } from '@superset-ui/core'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import { Avatar } from 'src/common/components'; import { getRandomColor } from './utils'; diff --git a/superset-frontend/src/components/FaveStar/FaveStar.test.tsx b/superset-frontend/src/components/FaveStar/FaveStar.test.tsx index e7c1773dfdd7a..443cb1e41c43b 100644 --- a/superset-frontend/src/components/FaveStar/FaveStar.test.tsx +++ b/superset-frontend/src/components/FaveStar/FaveStar.test.tsx @@ -29,7 +29,7 @@ jest.mock('../Icon', () => ({ ), })); -jest.mock('src/common/components/Tooltip', () => ({ +jest.mock('src/components/Tooltip', () => ({ Tooltip: (props: any) =>
, })); diff --git a/superset-frontend/src/components/FaveStar/index.tsx b/superset-frontend/src/components/FaveStar/index.tsx index 913084cd7a688..8a0903372f0a4 100644 --- a/superset-frontend/src/components/FaveStar/index.tsx +++ b/superset-frontend/src/components/FaveStar/index.tsx @@ -19,7 +19,7 @@ import React, { useCallback } from 'react'; import { t, styled } from '@superset-ui/core'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import { useComponentDidMount } from 'src/common/hooks/useComponentDidMount'; import Icon from '../Icon'; diff --git a/superset-frontend/src/components/FilterableTable/FilterableTable.tsx b/superset-frontend/src/components/FilterableTable/FilterableTable.tsx index 86dca4357594f..714c6ca5f6cea 100644 --- a/superset-frontend/src/components/FilterableTable/FilterableTable.tsx +++ b/superset-frontend/src/components/FilterableTable/FilterableTable.tsx @@ -30,7 +30,7 @@ import { Table, } from 'react-virtualized'; import { getMultipleTextDimensions, t, styled } from '@superset-ui/core'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import Button from '../Button'; import CopyToClipboard from '../CopyToClipboard'; import ModalTrigger from '../ModalTrigger'; diff --git a/superset-frontend/src/components/IconTooltip/IconTooltip.test.jsx b/superset-frontend/src/components/IconTooltip/IconTooltip.test.jsx index fba7b4b647015..922e8dd3058c9 100644 --- a/superset-frontend/src/components/IconTooltip/IconTooltip.test.jsx +++ b/superset-frontend/src/components/IconTooltip/IconTooltip.test.jsx @@ -18,7 +18,7 @@ */ import React from 'react'; import { shallow } from 'enzyme'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import { IconTooltip } from 'src/components/IconTooltip'; describe('IconTooltip', () => { diff --git a/superset-frontend/src/components/IconTooltip/index.tsx b/superset-frontend/src/components/IconTooltip/index.tsx index affc57d6a1ac9..22ae8f45e20cc 100644 --- a/superset-frontend/src/components/IconTooltip/index.tsx +++ b/superset-frontend/src/components/IconTooltip/index.tsx @@ -17,7 +17,7 @@ * under the License. */ import React, { ReactNode } from 'react'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import { styled } from '@superset-ui/core'; export interface Props { diff --git a/superset-frontend/src/components/InfoTooltip/index.tsx b/superset-frontend/src/components/InfoTooltip/index.tsx index 1be6888959691..7091cd911b98f 100644 --- a/superset-frontend/src/components/InfoTooltip/index.tsx +++ b/superset-frontend/src/components/InfoTooltip/index.tsx @@ -19,7 +19,7 @@ import React from 'react'; import { styled } from '@superset-ui/core'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import Icon from 'src/components/Icon'; interface InfoTooltipProps { diff --git a/superset-frontend/src/components/ListView/ActionsBar.tsx b/superset-frontend/src/components/ListView/ActionsBar.tsx index 135982208e851..ad4553e89f8f7 100644 --- a/superset-frontend/src/components/ListView/ActionsBar.tsx +++ b/superset-frontend/src/components/ListView/ActionsBar.tsx @@ -18,7 +18,7 @@ */ import React from 'react'; import { styled } from '@superset-ui/core'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import { IconName } from 'src/components/Icon'; import Icons from 'src/components/Icons'; import { TooltipPlacement } from 'antd/lib/tooltip'; diff --git a/superset-frontend/src/components/ListViewCard/index.tsx b/superset-frontend/src/components/ListViewCard/index.tsx index b8586ddffff62..2991e45319ee1 100644 --- a/superset-frontend/src/components/ListViewCard/index.tsx +++ b/superset-frontend/src/components/ListViewCard/index.tsx @@ -20,7 +20,7 @@ import React from 'react'; import { styled } from '@superset-ui/core'; import Icon from 'src/components/Icon'; import { AntdCard, Skeleton, ThinSkeleton } from 'src/common/components'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import ImageLoader, { BackgroundPosition } from './ImageLoader'; const ActionsWrapper = styled.div` diff --git a/superset-frontend/src/components/PopoverSection/index.tsx b/superset-frontend/src/components/PopoverSection/index.tsx index 94ac66a47e4a8..ec45f178614ab 100644 --- a/superset-frontend/src/components/PopoverSection/index.tsx +++ b/superset-frontend/src/components/PopoverSection/index.tsx @@ -18,7 +18,7 @@ */ import React, { MouseEventHandler, ReactNode } from 'react'; import { useTheme } from '@superset-ui/core'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import Icon from 'src/components/Icon'; export interface PopoverSectionProps { diff --git a/superset-frontend/src/components/RefreshLabel/index.tsx b/superset-frontend/src/components/RefreshLabel/index.tsx index e3e15fff052ff..69bb213a3ae91 100644 --- a/superset-frontend/src/components/RefreshLabel/index.tsx +++ b/superset-frontend/src/components/RefreshLabel/index.tsx @@ -18,7 +18,7 @@ */ import React, { MouseEventHandler } from 'react'; import { SupersetTheme } from '@superset-ui/core'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import Icon, { IconProps } from 'src/components/Icon'; export interface RefreshLabelProps { diff --git a/superset-frontend/src/common/components/Tooltip/Tooltip.stories.tsx b/superset-frontend/src/components/Tooltip/Tooltip.stories.tsx similarity index 100% rename from superset-frontend/src/common/components/Tooltip/Tooltip.stories.tsx rename to superset-frontend/src/components/Tooltip/Tooltip.stories.tsx diff --git a/superset-frontend/src/common/components/Tooltip/Tooltip.test.tsx b/superset-frontend/src/components/Tooltip/Tooltip.test.tsx similarity index 100% rename from superset-frontend/src/common/components/Tooltip/Tooltip.test.tsx rename to superset-frontend/src/components/Tooltip/Tooltip.test.tsx diff --git a/superset-frontend/src/common/components/Tooltip/index.tsx b/superset-frontend/src/components/Tooltip/index.tsx similarity index 100% rename from superset-frontend/src/common/components/Tooltip/index.tsx rename to superset-frontend/src/components/Tooltip/index.tsx diff --git a/superset-frontend/src/components/WarningIconWithTooltip.tsx b/superset-frontend/src/components/WarningIconWithTooltip.tsx index fdd4a0fd4f691..616d43d1d1e05 100644 --- a/superset-frontend/src/components/WarningIconWithTooltip.tsx +++ b/superset-frontend/src/components/WarningIconWithTooltip.tsx @@ -19,7 +19,7 @@ import React from 'react'; import { supersetTheme, SafeMarkdown } from '@superset-ui/core'; import Icon from 'src/components/Icon'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; interface WarningIconWithTooltipProps { warningMarkdown: string; diff --git a/superset-frontend/src/dashboard/components/PublishedStatus/index.jsx b/superset-frontend/src/dashboard/components/PublishedStatus/index.jsx index 403ab03ebd11e..915ea0aecc968 100644 --- a/superset-frontend/src/dashboard/components/PublishedStatus/index.jsx +++ b/superset-frontend/src/dashboard/components/PublishedStatus/index.jsx @@ -19,7 +19,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { t } from '@superset-ui/core'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import Label from 'src/components/Label'; const propTypes = { diff --git a/superset-frontend/src/dashboard/components/SliceHeader/index.tsx b/superset-frontend/src/dashboard/components/SliceHeader/index.tsx index f2570eb6ee523..cb82080eddd2a 100644 --- a/superset-frontend/src/dashboard/components/SliceHeader/index.tsx +++ b/superset-frontend/src/dashboard/components/SliceHeader/index.tsx @@ -18,7 +18,7 @@ */ import React, { FC } from 'react'; import { styled, t } from '@superset-ui/core'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import { useSelector } from 'react-redux'; import EditableTitle from 'src/components/EditableTitle'; import SliceHeaderControls from 'src/dashboard/components/SliceHeaderControls'; diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FilterSetUnit.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FilterSetUnit.tsx index 5132e420cf599..e667b27f5e755 100644 --- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FilterSetUnit.tsx +++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/FilterSetUnit.tsx @@ -22,8 +22,8 @@ import { FilterSet } from 'src/dashboard/reducers/types'; import { DataMaskState } from 'src/dataMask/types'; import { CheckOutlined, EllipsisOutlined } from '@ant-design/icons'; import { HandlerFunction, styled, supersetTheme, t } from '@superset-ui/core'; -import { Tooltip } from 'src/common/components/Tooltip'; import Button from 'src/components/Button'; +import { Tooltip } from 'src/components/Tooltip'; import FiltersHeader from './FiltersHeader'; import { getFilterBarTestId } from '..'; diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/Footer.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/Footer.tsx index e967f958c9560..df6c6ee44ebf0 100644 --- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/Footer.tsx +++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterSets/Footer.tsx @@ -19,7 +19,7 @@ import { t, styled } from '@superset-ui/core'; import React, { FC } from 'react'; import Button from 'src/components/Button'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import { APPLY_FILTERS_HINT } from './utils'; import { useFilterSetNameDuplicated } from './state'; import { getFilterBarTestId } from '..'; diff --git a/superset-frontend/src/explore/components/ControlHeader.jsx b/superset-frontend/src/explore/components/ControlHeader.jsx index bac0b88054653..522ac94a01d52 100644 --- a/superset-frontend/src/explore/components/ControlHeader.jsx +++ b/superset-frontend/src/explore/components/ControlHeader.jsx @@ -20,7 +20,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { t } from '@superset-ui/core'; import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import FormLabel from 'src/components/FormLabel'; const propTypes = { diff --git a/superset-frontend/src/explore/components/EmbedCodeButton.jsx b/superset-frontend/src/explore/components/EmbedCodeButton.jsx index 5796ebe9b0d03..9fde203e6ce72 100644 --- a/superset-frontend/src/explore/components/EmbedCodeButton.jsx +++ b/superset-frontend/src/explore/components/EmbedCodeButton.jsx @@ -23,7 +23,7 @@ import { t } from '@superset-ui/core'; import Popover from 'src/components/Popover'; import FormLabel from 'src/components/FormLabel'; import Icon from 'src/components/Icon'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import CopyToClipboard from 'src/components/CopyToClipboard'; import { getShortUrl } from 'src/utils/urlUtils'; import { URL_PARAMS } from 'src/constants'; diff --git a/superset-frontend/src/explore/components/ExploreActionButtons.tsx b/superset-frontend/src/explore/components/ExploreActionButtons.tsx index cbf038b47dda0..cb4d2bab63417 100644 --- a/superset-frontend/src/explore/components/ExploreActionButtons.tsx +++ b/superset-frontend/src/explore/components/ExploreActionButtons.tsx @@ -20,7 +20,7 @@ import React, { useState } from 'react'; import cx from 'classnames'; import { t } from '@superset-ui/core'; import Icon from 'src/components/Icon'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import copyTextToClipboard from 'src/utils/copy'; import withToasts from 'src/messageToasts/enhancers/withToasts'; import { useUrlShortener } from 'src/common/hooks/useUrlShortener'; diff --git a/superset-frontend/src/explore/components/ExploreChartHeader.jsx b/superset-frontend/src/explore/components/ExploreChartHeader.jsx index 8b93aff3b5a61..bf57edc89e6c7 100644 --- a/superset-frontend/src/explore/components/ExploreChartHeader.jsx +++ b/superset-frontend/src/explore/components/ExploreChartHeader.jsx @@ -21,7 +21,7 @@ import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import PropTypes from 'prop-types'; import { styled, t } from '@superset-ui/core'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import { chartPropShape } from '../../dashboard/util/propShapes'; import ExploreActionButtons from './ExploreActionButtons'; import RowCountLabel from './RowCountLabel'; diff --git a/superset-frontend/src/explore/components/ExploreViewContainer.jsx b/superset-frontend/src/explore/components/ExploreViewContainer.jsx index 2724ddab068ab..195f227e126ec 100644 --- a/superset-frontend/src/explore/components/ExploreViewContainer.jsx +++ b/superset-frontend/src/explore/components/ExploreViewContainer.jsx @@ -27,7 +27,7 @@ import { Resizable } from 're-resizable'; import { useDynamicPluginContext } from 'src/components/DynamicPlugins'; import { Global } from '@emotion/core'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import { usePrevious } from 'src/common/hooks/usePrevious'; import Icon from 'src/components/Icon'; import { diff --git a/superset-frontend/src/explore/components/QueryAndSaveBtns.jsx b/superset-frontend/src/explore/components/QueryAndSaveBtns.jsx index 84b04102f0914..d9c1423981507 100644 --- a/superset-frontend/src/explore/components/QueryAndSaveBtns.jsx +++ b/superset-frontend/src/explore/components/QueryAndSaveBtns.jsx @@ -21,7 +21,7 @@ import PropTypes from 'prop-types'; import ButtonGroup from 'src/components/ButtonGroup'; import { t, useTheme } from '@superset-ui/core'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import Button from 'src/components/Button'; const propTypes = { diff --git a/superset-frontend/src/explore/components/RowCountLabel.jsx b/superset-frontend/src/explore/components/RowCountLabel.jsx index 9ba9aaca55c40..dad899e777193 100644 --- a/superset-frontend/src/explore/components/RowCountLabel.jsx +++ b/superset-frontend/src/explore/components/RowCountLabel.jsx @@ -21,7 +21,7 @@ import PropTypes from 'prop-types'; import { getNumberFormatter, t } from '@superset-ui/core'; import Label from 'src/components/Label'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; const propTypes = { rowcount: PropTypes.number, diff --git a/superset-frontend/src/explore/components/controls/ColorSchemeControl.jsx b/superset-frontend/src/explore/components/controls/ColorSchemeControl.jsx index 6b76fbc3d26e6..908d809871d15 100644 --- a/superset-frontend/src/explore/components/controls/ColorSchemeControl.jsx +++ b/superset-frontend/src/explore/components/controls/ColorSchemeControl.jsx @@ -20,7 +20,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { isFunction } from 'lodash'; import { Select } from 'src/components/Select'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import ControlHeader from '../ControlHeader'; import './ColorSchemeControl.less'; diff --git a/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx b/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx index b181e596d7eb5..0cadaf0d1fcff 100644 --- a/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx +++ b/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx @@ -21,7 +21,7 @@ import PropTypes from 'prop-types'; import { t, styled, supersetTheme } from '@superset-ui/core'; import { Dropdown, Menu } from 'src/common/components'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import Icon from 'src/components/Icon'; import ChangeDatasourceModal from 'src/datasource/ChangeDatasourceModal'; import DatasourceModal from 'src/datasource/DatasourceModal'; diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx index 30099498cb37e..811d5fbdf093f 100644 --- a/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx +++ b/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx @@ -37,7 +37,7 @@ import Popover from 'src/components/Popover'; import { Divider } from 'src/common/components'; import Icon from 'src/components/Icon'; import { Select } from 'src/components/Select'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import { DEFAULT_TIME_RANGE } from 'src/explore/constants'; import { useDebouncedEffect } from 'src/explore/exploreUtils'; import { SLOW_DEBOUNCE } from 'src/constants'; diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx index 622d69d00d7d4..381b031ece63d 100644 --- a/superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx +++ b/superset-frontend/src/explore/components/controls/DateFilterControl/components/DateFunctionTooltip.tsx @@ -19,7 +19,7 @@ import React from 'react'; import { useTheme, t } from '@superset-ui/core'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import { ClassNames } from '@emotion/core'; const TIME_PICKER_HELPER = ( diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx index 38fb2d36759d4..0ba8dd31ba068 100644 --- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx +++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx @@ -19,7 +19,7 @@ import React, { useEffect, useMemo, useState } from 'react'; import { logging, SupersetClient, t, Metric } from '@superset-ui/core'; import { ColumnMeta } from '@superset-ui/chart-controls'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import { OPERATORS } from 'src/explore/constants'; import { OptionSortType } from 'src/explore/types'; import { diff --git a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopoverTitle.jsx b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopoverTitle.jsx index d5ac3178b021e..ea1e40104655f 100644 --- a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopoverTitle.jsx +++ b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopoverTitle.jsx @@ -20,7 +20,7 @@ import React from 'react'; import { t } from '@superset-ui/core'; import PropTypes from 'prop-types'; import { FormControl } from 'react-bootstrap'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; const propTypes = { title: PropTypes.shape({ diff --git a/superset-frontend/src/explore/components/controls/OptionControls/index.tsx b/superset-frontend/src/explore/components/controls/OptionControls/index.tsx index 723df5c966b76..03d399ecde9cf 100644 --- a/superset-frontend/src/explore/components/controls/OptionControls/index.tsx +++ b/superset-frontend/src/explore/components/controls/OptionControls/index.tsx @@ -23,7 +23,7 @@ import { MetricOption, InfoTooltipWithTrigger, } from '@superset-ui/chart-controls'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import Icon from 'src/components/Icon'; import { savedMetricType } from 'src/explore/components/controls/MetricControl/types'; import AdhocMetric from 'src/explore/components/controls/MetricControl/AdhocMetric'; diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl.jsx b/superset-frontend/src/explore/components/controls/VizTypeControl.jsx index 7d6d36e20dde2..904051b15bae5 100644 --- a/superset-frontend/src/explore/components/controls/VizTypeControl.jsx +++ b/superset-frontend/src/explore/components/controls/VizTypeControl.jsx @@ -21,8 +21,8 @@ import PropTypes from 'prop-types'; import { Row, Col, FormControl } from 'react-bootstrap'; import { Behavior, t, getChartMetadataRegistry } from '@superset-ui/core'; import { useDynamicPluginContext } from 'src/components/DynamicPlugins'; -import { Tooltip } from 'src/common/components/Tooltip'; import Modal from 'src/components/Modal'; +import { Tooltip } from 'src/components/Tooltip'; import Label from 'src/components/Label'; import ControlHeader from '../ControlHeader'; import './VizTypeControl.less'; diff --git a/superset-frontend/src/views/CRUD/alert/AlertList.tsx b/superset-frontend/src/views/CRUD/alert/AlertList.tsx index 931cd418c8f58..f5fd9a35c09ac 100644 --- a/superset-frontend/src/views/CRUD/alert/AlertList.tsx +++ b/superset-frontend/src/views/CRUD/alert/AlertList.tsx @@ -24,7 +24,7 @@ import moment from 'moment'; import ActionsBar, { ActionProps } from 'src/components/ListView/ActionsBar'; import Button from 'src/components/Button'; import FacePile from 'src/components/FacePile'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import ListView, { FilterOperators, Filters, diff --git a/superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx b/superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx index f6ef08c541d2c..712f6109e36d4 100644 --- a/superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx +++ b/superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx @@ -18,7 +18,7 @@ */ import { styled, t } from '@superset-ui/core'; import React from 'react'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import Icon, { IconName } from 'src/components/Icon'; import { AlertState } from '../types'; diff --git a/superset-frontend/src/views/CRUD/alert/components/RecipientIcon.tsx b/superset-frontend/src/views/CRUD/alert/components/RecipientIcon.tsx index 606d05a6f9b88..3a8fff81d109e 100644 --- a/superset-frontend/src/views/CRUD/alert/components/RecipientIcon.tsx +++ b/superset-frontend/src/views/CRUD/alert/components/RecipientIcon.tsx @@ -18,7 +18,7 @@ */ import { styled, t } from '@superset-ui/core'; import React from 'react'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import Icon, { IconName } from 'src/components/Icon'; import { RecipientIconName } from '../types'; diff --git a/superset-frontend/src/views/CRUD/chart/ChartList.tsx b/superset-frontend/src/views/CRUD/chart/ChartList.tsx index ac46f51299c51..368db789d2bbc 100644 --- a/superset-frontend/src/views/CRUD/chart/ChartList.tsx +++ b/superset-frontend/src/views/CRUD/chart/ChartList.tsx @@ -51,7 +51,7 @@ import withToasts from 'src/messageToasts/enhancers/withToasts'; import PropertiesModal from 'src/explore/components/PropertiesModal'; import ImportModelsModal from 'src/components/ImportModal/index'; import Chart from 'src/types/Chart'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import Icons from 'src/components/Icons'; import ChartCard from './ChartCard'; diff --git a/superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx b/superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx index 4d886d7d6b288..4d6fd664d3216 100644 --- a/superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx +++ b/superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx @@ -27,7 +27,7 @@ import { createFetchRelated, createErrorHandler } from 'src/views/CRUD/utils'; import withToasts from 'src/messageToasts/enhancers/withToasts'; import SubMenu, { SubMenuProps } from 'src/components/Menu/SubMenu'; import DeleteModal from 'src/components/DeleteModal'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import ConfirmStatusChange from 'src/components/ConfirmStatusChange'; import ActionsBar, { ActionProps } from 'src/components/ListView/ActionsBar'; import ListView, { ListViewProps, Filters } from 'src/components/ListView'; diff --git a/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx b/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx index 91656aca5b313..6113ed69c476f 100644 --- a/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx +++ b/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx @@ -41,7 +41,7 @@ import FacePile from 'src/components/FacePile'; import Icons from 'src/components/Icons'; import FaveStar from 'src/components/FaveStar'; import PropertiesModal from 'src/dashboard/components/PropertiesModal'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import ImportModelsModal from 'src/components/ImportModal/index'; import Dashboard from 'src/dashboard/containers/Dashboard'; diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx index b399e3feccfef..13d2ab8b540a5 100644 --- a/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx +++ b/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx @@ -25,7 +25,7 @@ import { createErrorHandler } from 'src/views/CRUD/utils'; import withToasts from 'src/messageToasts/enhancers/withToasts'; import SubMenu, { SubMenuProps } from 'src/components/Menu/SubMenu'; import DeleteModal from 'src/components/DeleteModal'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import Icons from 'src/components/Icons'; import ListView, { Filters } from 'src/components/ListView'; import { commonMenuData } from 'src/views/CRUD/data/common'; diff --git a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx index 454816741b90c..b6806dd17d3ee 100644 --- a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx +++ b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx @@ -41,7 +41,7 @@ import SubMenu, { import { commonMenuData } from 'src/views/CRUD/data/common'; import Owner from 'src/types/Owner'; import withToasts from 'src/messageToasts/enhancers/withToasts'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import Icons from 'src/components/Icons'; import FacePile from 'src/components/FacePile'; import CertifiedIcon from 'src/components/CertifiedIcon'; diff --git a/superset-frontend/src/views/CRUD/data/query/QueryList.tsx b/superset-frontend/src/views/CRUD/data/query/QueryList.tsx index 5944d1067b32e..49d7feaf80a17 100644 --- a/superset-frontend/src/views/CRUD/data/query/QueryList.tsx +++ b/superset-frontend/src/views/CRUD/data/query/QueryList.tsx @@ -36,7 +36,7 @@ import ListView, { ListViewProps, } from 'src/components/ListView'; import Icon, { IconName } from 'src/components/Icon'; -import { Tooltip } from 'src/common/components/Tooltip'; +import { Tooltip } from 'src/components/Tooltip'; import SyntaxHighlighter from 'react-syntax-highlighter/dist/cjs/light'; import sql from 'react-syntax-highlighter/dist/cjs/languages/hljs/sql'; import github from 'react-syntax-highlighter/dist/cjs/styles/hljs/github';