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

Fix List filter Remove all filters item not present on alwaysOn filters #8324

Merged
merged 3 commits into from
Oct 28, 2022
Merged

Fix List filter Remove all filters item not present on alwaysOn filters #8324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6552162
Fix Remove all filter item not present on alwaysOn filters
WiXSL Oct 27, 2022
237ed61
Updated tests
WiXSL Oct 27, 2022
bcc3e41
Apply review
WiXSL Oct 27, 2022
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
38 changes: 37 additions & 1 deletion packages/ra-ui-materialui/src/list/filter/FilterButton.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ describe('<FilterButton />', () => {
);
});

it('should remove all filters when the "Clear all filters" button is clicked', async () => {
it('should remove all filters when the "Remove all filters" button is clicked', async () => {
render(<Basic />);

// First, check we don't have a clear filters option yet
Expand Down Expand Up @@ -125,6 +125,42 @@ describe('<FilterButton />', () => {
});
});

it('should remove all alwaysOn filters when the "Remove all filters" button is clicked', async () => {
render(<Basic />);

// First, check we don't have a clear filters option yet
await screen.findByText('Add filter');
fireEvent.click(screen.getByText('Add filter'));

await screen.findByText('Title', { selector: 'li > span' });
expect(screen.queryByDisplayValue('Remove all filters')).toBeNull();

// Then we apply a filter to an alwaysOn filter
fireEvent.change(screen.getByLabelText('Search'), {
target: {
value:
'Accusantium qui nihil voluptatum quia voluptas maxime ab similique',
},
});
await screen.findByDisplayValue(
'Accusantium qui nihil voluptatum quia voluptas maxime ab similique'
);

// Then we clear all filters
fireEvent.click(screen.getByText('Add filter'));
await screen.findByText('Remove all filters');
fireEvent.click(screen.getByText('Remove all filters'));

// We check that the previously applied filter has been removed
await waitFor(() => {
expect(
screen.queryByDisplayValue(
'Accusantium qui nihil voluptatum quia voluptas maxime ab similique'
)
).toBeNull();
});
});

it('should not display save query in filter button', async () => {
const { queryByText } = render(
<AdminContext theme={theme}>
Expand Down
3 changes: 1 addition & 2 deletions packages/ra-ui-materialui/src/list/filter/FilterButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ export const FilterButton = (props: FilterButtonProps): JSX.Element => {
sort,
} = useListContext(props);
const hasFilterValues = !isEqual(filterValues, {});
const hasDisplayedFilters = !isEqual(displayedFilters, {});
const validSavedQueries = extractValidSavedQueries(savedQueries);
const hasSavedCurrentQuery = validSavedQueries.some(savedQuery =>
isEqual(savedQuery.value, {
Expand Down Expand Up @@ -198,7 +197,7 @@ export const FilterButton = (props: FilterButtonProps): JSX.Element => {
})}
</MenuItem>
)}
{hasDisplayedFilters && (
{hasFilterValues && (
<MenuItem onClick={() => setFilters({}, {}, false)}>
{translate('ra.action.remove_all_filters', {
_: 'Remove all filters',
Expand Down