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

DataViews: add control to reset all filters at once #55955

Merged
merged 7 commits into from Nov 8, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
54 changes: 33 additions & 21 deletions packages/edit-site/src/components/dataviews/filters.js
Expand Up @@ -7,6 +7,8 @@ import { __ } from '@wordpress/i18n';
* Internal dependencies
*/
import { default as InFilter, OPERATOR_IN } from './in-filter';
import ResetFilters from './reset-filters';

const VALID_OPERATORS = [ OPERATOR_IN ];

export default function Filters( { fields, view, onChangeView } ) {
Expand Down Expand Up @@ -34,27 +36,37 @@ export default function Filters( { fields, view, onChangeView } ) {
} );
} );

return view.visibleFilters?.map( ( fieldName ) => {
const visibleFiltersForField = filtersRegistered.filter(
( f ) => f.field === fieldName
);
const visibleFilters = view.visibleFilters
?.map( ( fieldName ) => {
const visibleFiltersForField = filtersRegistered.filter(
( f ) => f.field === fieldName
);

if ( visibleFiltersForField.length === 0 ) {
return null;
}

return visibleFiltersForField.map( ( filter ) => {
if ( OPERATOR_IN === filter.operator ) {
return (
<InFilter
key={ fieldName }
filter={ visibleFiltersForField[ 0 ] }
view={ view }
onChangeView={ onChangeView }
/>
);
if ( visibleFiltersForField.length === 0 ) {
return null;
}
return null;
} );
} );

return visibleFiltersForField.map( ( filter ) => {
if ( OPERATOR_IN === filter.operator ) {
return (
<InFilter
key={ fieldName }
filter={ visibleFiltersForField[ 0 ] }
view={ view }
onChangeView={ onChangeView }
/>
);
}
return null;
} );
} )
.filter( Boolean );

if ( visibleFilters.length > 0 ) {
oandregal marked this conversation as resolved.
Show resolved Hide resolved
visibleFilters.push(
<ResetFilters view={ view } onChangeView={ onChangeView } />
oandregal marked this conversation as resolved.
Show resolved Hide resolved
);
}

return visibleFilters;
}
26 changes: 26 additions & 0 deletions packages/edit-site/src/components/dataviews/reset-filters.js
@@ -0,0 +1,26 @@
/**
* WordPress dependencies
*/
import { BaseControl, Button } from '@wordpress/components';
import { __ } from '@wordpress/i18n';

export default ( { view, onChangeView } ) => {
return (
oandregal marked this conversation as resolved.
Show resolved Hide resolved
<BaseControl>
<Button
disabled={ view.search === '' && view.filters?.length === 0 }
variant="tertiary"
onClick={ () => {
onChangeView( ( currentView ) => ( {
...currentView,
page: 1,
search: '',
filters: [],
} ) );
} }
>
{ __( 'Reset filters' ) }
</Button>
</BaseControl>
);
};