DataViews: allow users to add filters dynamically #55992
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| /** | ||
| * WordPress dependencies | ||
| */ | ||
| import { | ||
| privateApis as componentsPrivateApis, | ||
| Button, | ||
| Icon, | ||
| } from '@wordpress/components'; | ||
| import { chevronRightSmall, plus } from '@wordpress/icons'; | ||
| import { __ } from '@wordpress/i18n'; | ||
|
|
||
| /** | ||
| * Internal dependencies | ||
| */ | ||
| import { unlock } from '../../lock-unlock'; | ||
| import { OPERATOR_IN } from './in-filter'; | ||
|
|
||
| const { | ||
| DropdownMenuV2, | ||
| DropdownSubMenuV2, | ||
| DropdownSubMenuTriggerV2, | ||
| DropdownMenuItemV2, | ||
| } = unlock( componentsPrivateApis ); | ||
|
|
||
| const VALID_OPERATORS = [ OPERATOR_IN ]; | ||
|
|
||
| export default function AddFilter( { fields, view, onChangeView } ) { | ||
| const filters = []; | ||
| fields.forEach( ( field ) => { | ||
| if ( ! field.filters ) { | ||
| return; | ||
| } | ||
|
|
||
| field.filters.forEach( ( filter ) => { | ||
| if ( VALID_OPERATORS.some( ( operator ) => operator === filter ) ) { | ||
| filters.push( { | ||
| field: field.id, | ||
| name: field.header, | ||
| operator: filter, | ||
| elements: [ | ||
| { | ||
| value: '', | ||
| label: __( 'All' ), | ||
| }, | ||
| ...( field.elements || [] ), | ||
| ], | ||
| isVisible: view.filters.some( | ||
| ( f ) => f.field === field.id && f.operator === filter | ||
| ), | ||
| } ); | ||
| } | ||
| } ); | ||
| } ); | ||
|
|
||
| if ( filters.length === 0 ) { | ||
| return null; | ||
| } | ||
|
|
||
| return ( | ||
| <DropdownMenuV2 | ||
| label={ __( 'Add filter' ) } | ||
| trigger={ | ||
| <Button | ||
| aria-disabled={ filters.length === view.filters?.length } | ||
|
There was a problem hiding this comment. Should this be There was a problem hiding this comment. I always thought this behavior should be default in buttons, any reason to require There was a problem hiding this comment. Unfortunately I don't have much context around it, since these changes were discussed before I started working on There was a problem hiding this comment. Good call and I was on that discussion as well. I guess now, I may be more on the side of let's try and remove that prop and make it default and see how it goes. |
||
| __next40pxDefaultSize={ true } | ||
| icon={ plus } | ||
| variant="tertiary" | ||
| > | ||
| { __( 'Add filter' ) } | ||
| </Button> | ||
| } | ||
| > | ||
| { filters.map( ( filter ) => { | ||
| if ( filter.isVisible ) { | ||
| return ( | ||
| <DropdownMenuItemV2 | ||
| key={ filter.field } | ||
| disabled={ true } | ||
| > | ||
| { filter.name } | ||
| </DropdownMenuItemV2> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <DropdownSubMenuV2 | ||
| key={ filter.field } | ||
| trigger={ | ||
| <DropdownSubMenuTriggerV2 | ||
| suffix={ <Icon icon={ chevronRightSmall } /> } | ||
| > | ||
| { filter.name } | ||
| </DropdownSubMenuTriggerV2> | ||
| } | ||
| > | ||
| { filter.elements.map( ( element ) => ( | ||
| <DropdownMenuItemV2 | ||
| key={ element.value } | ||
| onSelect={ () => { | ||
| onChangeView( ( currentView ) => ( { | ||
| ...currentView, | ||
| page: 1, | ||
| filters: [ | ||
| ...currentView.filters, | ||
| { | ||
| field: filter.field, | ||
| operator: 'in', | ||
oandregal marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| value: element.value, | ||
| }, | ||
| ], | ||
| } ) ); | ||
| } } | ||
| role="menuitemcheckbox" | ||
| > | ||
| { element.label } | ||
| </DropdownMenuItemV2> | ||
| ) ) } | ||
| </DropdownSubMenuV2> | ||
| ); | ||
| } ) } | ||
| </DropdownMenuV2> | ||
| ); | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,25 @@ | ||
| /** | ||
| * WordPress dependencies | ||
| */ | ||
| import { Button } from '@wordpress/components'; | ||
| import { __ } from '@wordpress/i18n'; | ||
|
|
||
| export default ( { view, onChangeView } ) => { | ||
| return ( | ||
| <Button | ||
| aria-disabled={ view.search === '' && view.filters?.length === 0 } | ||
oandregal marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| __next40pxDefaultSize={ true } | ||
youknowriad marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| variant="tertiary" | ||
| onClick={ () => { | ||
| onChangeView( ( currentView ) => ( { | ||
| ...currentView, | ||
| page: 1, | ||
| search: '', | ||
| filters: [], | ||
| } ) ); | ||
| } } | ||
| > | ||
| { __( 'Reset filters' ) } | ||
| </Button> | ||
| ); | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We no longer need this, the visible filters are derived from the
filtersstate.