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.

Sign up for GitHub

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
merged 5 commits into from
Jul 20, 2023
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a67ec9b
chore(native filters): Expandable filter config modal
Jun 29, 2023
2ba4c61
increase default width to 70%
Jun 29, 2023
acca3e1
remove icon mock
Jul 5, 2023
35c4a9c
replace width by styled component
Jul 5, 2023
6516328
update the expand icon location and adjust default width to 880px
justinpark Jul 12, 2023
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
Next Next commit
chore(native filters): Expandable filter config modal
  • Loading branch information
@justinpark
Justin Park authored and justinpark committed Jul 12, 2023
commit a67ec9ba4808d3b273edb083654e7e3cd9ab11a9
8 changes: 7 additions & 1 deletion ...ontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTitleContainer.tsx
View file
Open in desktop
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
49 changes: 44 additions & 5 deletions ...frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx
View file
Open in desktop
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,25 @@ import {
} from './utils';
import DividerConfigForm from './DividerConfigForm';

const StyledModalWrapper = styled(StyledModal)`
const StyledModalWrapper = styled(StyledModal)<{ expanded: boolean }>`
min-width: 700px;
.ant-modal-body {
padding: 0px;
}
${({ expanded }) =>
expanded &&
css`
.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 Down Expand Up @@ -119,6 +131,7 @@ function FiltersConfigModal({
onCancel,
}: FiltersConfigModalProps) {
const dispatch = useDispatch();
const theme = useTheme();

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

Expand Down Expand Up @@ -477,6 +490,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 @@ -580,8 +601,26 @@ function FiltersConfigModal({
<StyledModalWrapper
visible={isOpen}
maskClosable={false}
title={t('Add and edit filters')}
title={
<div
css={css`
display: flex;
justify-content: space-between;
align-items: flex-end;
margin-right: 50px;
`}
>
<div>{t('Add and edit filters')}</div>
<ToggleIcon
iconSize="l"
iconColor={theme.colors.grayscale.base}
onClick={toggleExpand}
/>
</div>
}
width="50%"
{...(expanded && { width: '100%', height: '100%' })}
expanded={expanded}
destroyOnClose
onCancel={handleCancel}
onOk={handleSave}
Expand All @@ -599,7 +638,7 @@ function FiltersConfigModal({
}
>
<ErrorBoundary>
<StyledModalBody>
<StyledModalBody expanded={expanded}>
<StyledForm
form={form}
onValuesChange={handleValuesChange}
Expand Down