diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx index e152df43f077..9229c42453fb 100644 --- a/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx +++ b/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx @@ -31,7 +31,6 @@ import { Button, Constants, Divider, - Modal, Tooltip, Select, } from '@superset-ui/core/components'; @@ -39,7 +38,6 @@ import ControlHeader from 'src/explore/components/ControlHeader'; import { Icons } from '@superset-ui/core/components/Icons'; import { useDebouncedEffect } from 'src/explore/exploreUtils'; import { noOp } from 'src/utils/common'; -import { ModalTitleWithIcon } from 'src/components/ModalTitleWithIcon'; import ControlPopover from '../ControlPopover/ControlPopover'; import { DateFilterControlProps, FrameType } from './types'; @@ -146,7 +144,6 @@ export default function DateFilterLabel(props: DateFilterControlProps) { onChange, onOpenPopover = noOp, onClosePopover = noOp, - overlayStyle = 'Popover', isOverflowingFilterBar = false, } = props; const defaultTimeFilter = useDefaultTimeFilter(); @@ -384,46 +381,10 @@ export default function DateFilterLabel(props: DateFilterControlProps) { ); - const modalContent = ( - <> - - - - {/* the zIndex value is from trying so that the Modal doesn't overlay the AdhocFilter */} - - } - name={t('Edit time range')} - show={show} - onHide={toggleOverlay} - width="600px" - hideFooter - zIndex={1030} - > - {overlayContent} - - - ); - return ( <> - {overlayStyle === 'Modal' ? modalContent : popoverContent} + {popoverContent} ); } diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/tests/DateFilterLabel.test.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/tests/DateFilterLabel.test.tsx index bfb276b7deaf..f4c36bfa1749 100644 --- a/superset-frontend/src/explore/components/controls/DateFilterControl/tests/DateFilterLabel.test.tsx +++ b/superset-frontend/src/explore/components/controls/DateFilterControl/tests/DateFilterLabel.test.tsx @@ -58,15 +58,6 @@ test('DateFilter with default props', () => { ).toBeInTheDocument(); }); -test('DateFilter should be applied the overlayStyle props', () => { - render(setup({ onChange: () => {}, overlayStyle: 'Modal' })); - // should be Modal as overlay - userEvent.click(screen.getByText(NO_TIME_RANGE)); - expect( - screen.getByTestId(DateFilterTestKey.ModalOverlay), - ).toBeInTheDocument(); -}); - test('DateFilter should be applied the global config time_filter from the store', () => { render( setup( diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/types.ts b/superset-frontend/src/explore/components/controls/DateFilterControl/types.ts index c1aa84344808..e06c5409cce4 100644 --- a/superset-frontend/src/explore/components/controls/DateFilterControl/types.ts +++ b/superset-frontend/src/explore/components/controls/DateFilterControl/types.ts @@ -112,6 +112,5 @@ export interface DateFilterControlProps { value?: string; onOpenPopover?: () => void; onClosePopover?: () => void; - overlayStyle?: 'Modal' | 'Popover'; isOverflowingFilterBar?: boolean; } diff --git a/superset-frontend/src/explore/components/controls/FilterControl/utils/useDatePickerInAdhocFilter.tsx b/superset-frontend/src/explore/components/controls/FilterControl/utils/useDatePickerInAdhocFilter.tsx index f42ddf4883e3..af148bb92dde 100644 --- a/superset-frontend/src/explore/components/controls/FilterControl/utils/useDatePickerInAdhocFilter.tsx +++ b/superset-frontend/src/explore/components/controls/FilterControl/utils/useDatePickerInAdhocFilter.tsx @@ -52,7 +52,6 @@ export const useDatePickerInAdhocFilter = ({ value={timeRange} name="time_range" onChange={onTimeRangeChange} - overlayStyle="Modal" /> ) : undefined;