Skip to content
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.

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

chore(native filters): Expandable filter config modal #24559

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -205,13 +205,6 @@ jest.mock('@superset-ui/core', () => ({
}),
}));

jest.mock(
'src/components/Icons/Icon',
() =>
({ fileName }: { fileName: string }) =>
<span role="img" aria-label={fileName.replace('_', '-')} />,
);

// extract text from embedded html tags
// source: https://polvara.me/posts/five-things-you-didnt-know-about-testing-library
const getTextInHTMLTags =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,13 @@ const FilterTitleContainer = forwardRef<HTMLDivElement, Props>(
className={classNames.join(' ')}
>
<div css={{ display: 'flex', width: '100%' }}>
<div css={{ alignItems: 'center', display: 'flex' }}>
<div
css={{
alignItems: 'center',
display: 'flex',
wordBreak: 'break-all',
}}
>
{isRemoved ? t('(Removed)') : getFilterTitle(id)}
</div>
{!removedFilters[id] && isErrored && (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,17 @@ import {
styled,
SLOW_DEBOUNCE,
t,
css,
useTheme,
} from '@superset-ui/core';
import { useDispatch } from 'react-redux';
import { AntdForm } from 'src/components';
import Icons from 'src/components/Icons';
import ErrorBoundary from 'src/components/ErrorBoundary';
import { StyledModal } from 'src/components/Modal';
import { testWithId } from 'src/utils/testUtils';
import { updateCascadeParentIds } from 'src/dashboard/actions/nativeFilters';
import useEffectEvent from 'src/hooks/useEffectEvent';
import { useFilterConfigMap, useFilterConfiguration } from '../state';
import FilterConfigurePane from './FilterConfigurePane';
import FiltersConfigForm, {
Expand All @@ -58,17 +62,40 @@ import {
} from './utils';
import DividerConfigForm from './DividerConfigForm';

const StyledModalWrapper = styled(StyledModal)`
min-width: 700px;
const MODAL_MARGIN = 16;

const StyledModalWrapper = styled(StyledModal)<{ expanded: boolean }>`
min-width: 880px;
width: ${({ expanded }) => (expanded ? '100%' : '70%')} !important;

@media (max-width: ${880 + MODAL_MARGIN * 2}px) {
width: 100% !important;
min-width: auto;
}

.ant-modal-body {
padding: 0px;
}

${({ expanded }) =>
expanded &&
css`
height: 100%;

.ant-modal-body {
flex: 1 1 auto;
}
.ant-modal-content {
height: 100%;
}
`}
`;

export const StyledModalBody = styled.div`
export const StyledModalBody = styled.div<{ expanded: boolean }>`
display: flex;
height: 700px;
height: ${({ expanded }) => (expanded ? '100%' : '700px')};
flex-direction: row;
flex: 1;
.filters-list {
width: ${({ theme }) => theme.gridUnit * 50}px;
overflow: auto;
Expand All @@ -79,6 +106,10 @@ export const StyledForm = styled(AntdForm)`
width: 100%;
`;

export const StyledExpandButtonWrapper = styled.div`
margin-left: ${({ theme }) => theme.gridUnit * 4}px;
`;

export const FILTERS_CONFIG_MODAL_TEST_ID = 'filters-config-modal';
export const getFiltersConfigModalTestId = testWithId(
FILTERS_CONFIG_MODAL_TEST_ID,
Expand Down Expand Up @@ -119,6 +150,7 @@ function FiltersConfigModal({
onCancel,
}: FiltersConfigModalProps) {
const dispatch = useDispatch();
const theme = useTheme();

const [form] = AntdForm.useForm<NativeFiltersForm>();

Expand Down Expand Up @@ -477,6 +509,14 @@ function FiltersConfigModal({
[buildDependencyMap, canBeUsedAsDependency, orderedFilters],
);

const [expanded, setExpanded] = useState(false);
const toggleExpand = useEffectEvent(() => {
setExpanded(!expanded);
});
const ToggleIcon = expanded
? Icons.FullscreenExitOutlined
: Icons.FullscreenOutlined;

const handleValuesChange = useMemo(
() =>
debounce((changes: any, values: NativeFiltersForm) => {
Expand Down Expand Up @@ -581,25 +621,40 @@ function FiltersConfigModal({
visible={isOpen}
maskClosable={false}
title={t('Add and edit filters')}
width="50%"
expanded={expanded}
destroyOnClose
onCancel={handleCancel}
onOk={handleSave}
centered
data-test="filter-modal"
footer={
<Footer
onDismiss={() => setSaveAlertVisible(false)}
onCancel={handleCancel}
handleSave={handleSave}
canSave={!erroredFilters.length}
saveAlertVisible={saveAlertVisible}
onConfirmCancel={handleConfirmCancel}
/>
<div
css={css`
display: flex;
justify-content: flex-end;
align-items: flex-end;
`}
>
<Footer
onDismiss={() => setSaveAlertVisible(false)}
onCancel={handleCancel}
handleSave={handleSave}
canSave={!erroredFilters.length}
saveAlertVisible={saveAlertVisible}
onConfirmCancel={handleConfirmCancel}
/>
<StyledExpandButtonWrapper>
<ToggleIcon
iconSize="l"
iconColor={theme.colors.grayscale.dark2}
onClick={toggleExpand}
/>
</StyledExpandButtonWrapper>
</div>
}
>
<ErrorBoundary>
<StyledModalBody>
<StyledModalBody expanded={expanded}>
<StyledForm
form={form}
onValuesChange={handleValuesChange}
Expand Down
Loading