DataViews: implement multiple selection for filters #59610
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
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 |
|---|---|---|
|
|
@@ -24,43 +24,67 @@ import { ENTER, SPACE } from '@wordpress/keycodes'; | |
| * Internal dependencies | ||
| */ | ||
| import SearchWidget from './search-widget'; | ||
| import { | ||
| OPERATORS, | ||
| OPERATOR_IS, | ||
| OPERATOR_IS_NOT, | ||
| OPERATOR_IS_ANY, | ||
| OPERATOR_IS_NONE, | ||
| } from './constants'; | ||
|
|
||
| const FilterText = ( { activeElements, filterInView, filter } ) => { | ||
| if ( activeElements === undefined || activeElements.length === 0 ) { | ||
| return filter.name; | ||
| } | ||
|
|
||
| const filterTextWrappers = { | ||
| Name: <span className="dataviews-filter-summary__filter-text-name" />, | ||
| Value: <span className="dataviews-filter-summary__filter-text-value" />, | ||
| }; | ||
|
|
||
| if ( filterInView?.operator === OPERATOR_IS_ANY ) { | ||
| return createInterpolateElement( | ||
| sprintf( | ||
| /* translators: 1: Filter name. 3: Filter value. e.g.: "Author is any: Admin, Editor". */ | ||
| __( '<Name>%1$s is any: </Name><Value>%2$s</Value>' ), | ||
| filter.name, | ||
| activeElements.map( ( element ) => element.label ).join( ', ' ) | ||
|
There was a problem hiding this comment. I suspect that some (few) locales will want to have a say in the punctuation used to enumerate filters: activeElements.map( ... ).join(
/* translators: string used to join together active filters, e.g. "Author is any: Admin, Editor" */
__( ', ')
)@swissspidy: do you know if this is done elsewhere in WP? |
||
| ), | ||
| filterTextWrappers | ||
| ); | ||
| } | ||
|
|
||
| if ( filterInView?.operator === OPERATOR_IS_NONE ) { | ||
| return createInterpolateElement( | ||
| sprintf( | ||
| /* translators: 1: Filter name. 3: Filter value. e.g.: "Author is none: Admin, Editor". */ | ||
| __( '<Name>%1$s is none: </Name><Value>%2$s</Value>' ), | ||
| filter.name, | ||
| activeElements.map( ( element ) => element.label ).join( ', ' ) | ||
| ), | ||
| filterTextWrappers | ||
| ); | ||
| } | ||
|
|
||
| if ( filterInView?.operator === OPERATOR_IS ) { | ||
| return createInterpolateElement( | ||
| sprintf( | ||
| /* translators: 1: Filter name. 3: Filter value. e.g.: "Author is: Admin". */ | ||
| __( '<Name>%1$s is: </Name><Value>%2$s</Value>' ), | ||
| filter.name, | ||
| activeElements[ 0 ].label | ||
| ), | ||
| filterTextWrappers | ||
| ); | ||
| } | ||
|
|
||
| if ( filterInView?.operator === OPERATOR_IS_NOT ) { | ||
| return createInterpolateElement( | ||
| sprintf( | ||
| /* translators: 1: Filter name. 3: Filter value. e.g.: "Author is not: Admin". */ | ||
| __( '<Name>%1$s is not: </Name><Value>%2$s</Value>' ), | ||
| filter.name, | ||
| activeElements[ 0 ].label | ||
| ), | ||
| filterTextWrappers | ||
| ); | ||
|
|
@@ -140,9 +164,12 @@ export default function FilterSummary( { | |
| const toggleRef = useRef(); | ||
| const { filter, view, onChangeView } = commonProps; | ||
| const filterInView = view.filters.find( ( f ) => f.field === filter.field ); | ||
| const activeElements = filter.elements.filter( ( element ) => { | ||
| if ( filter.singleSelection ) { | ||
| return element.value === filterInView?.value; | ||
| } | ||
| return filterInView?.value?.includes( element.value ); | ||
| } ); | ||
| const isPrimary = filter.isPrimary; | ||
| const hasValues = filterInView?.value !== undefined; | ||
| const canResetOrRemove = ! isPrimary || hasValues; | ||
|
|
@@ -188,7 +215,7 @@ export default function FilterSummary( { | |
| ref={ toggleRef } | ||
| > | ||
| <FilterText | ||
| activeElements={ activeElements } | ||
| filterInView={ filterInView } | ||
| filter={ filter } | ||
| /> | ||
|
|
||
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.
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.
From a UX perspective, I wonder if we shouldn't switch the string based on the number of active filters:
… or if that would make things more confusing because "Is:" overlaps with
OPERATOR_IS. 🤔(I also wonder whether "Is any of" would sound more natural.)