DataViews: centralize control of filter visibility in the Filters com…

…ponent (#57056)
WordPress · Dec 14, 2023 · 8c010bd · 8c010bd · github-actions · Dec 14, 2023
1 parent bcc5a9b
commit 8c010bd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/packages/dataviews/src/filter-summary.js b/packages/dataviews/src/filter-summary.js
@@ -13,7 +13,7 @@ import { Children, Fragment } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import { OPERATOR_IN, OPERATOR_NOT_IN, LAYOUT_LIST } from './constants';
+import { OPERATOR_IN, OPERATOR_NOT_IN } from './constants';
 import { unlock } from './lock-unlock';
 
 const {
@@ -73,10 +73,6 @@ function WithSeparators( { children } ) {
 }
 
 export default function FilterSummary( { filter, view, onChangeView } ) {
-	if ( view.type === LAYOUT_LIST ) {
-		return null;
-	}
-
 	const filterInView = view.filters.find( ( f ) => f.field === filter.field );
 	const activeElement = filter.elements.find(
 		( element ) => element.value === filterInView?.value

diff --git a/packages/dataviews/src/filters.js b/packages/dataviews/src/filters.js
@@ -4,7 +4,12 @@
 import FilterSummary from './filter-summary';
 import AddFilter from './add-filter';
 import ResetFilters from './reset-filters';
-import { ENUMERATION_TYPE, OPERATOR_IN, OPERATOR_NOT_IN } from './constants';
+import {
+	ENUMERATION_TYPE,
+	OPERATOR_IN,
+	OPERATOR_NOT_IN,
+	LAYOUT_LIST,
+} from './constants';
 
 const sanitizeOperators = ( field ) => {
 	let operators = field.filterBy?.operators;
@@ -57,7 +62,7 @@ export default function Filters( { fields, view, onChangeView } ) {
 	const filterComponents = [
 		addFilter,
 		...filters.map( ( filter ) => {
-			if ( ! filter.isVisible ) {
+			if ( ! filter.isVisible || view.type === LAYOUT_LIST ) {
 				return null;
 			}
 
@@ -72,7 +77,7 @@ export default function Filters( { fields, view, onChangeView } ) {
 		} ),
 	];
 
-	if ( filterComponents.length > 1 ) {
+	if ( filterComponents.length > 1 && view.type !== LAYOUT_LIST ) {
 		filterComponents.push(
 			<ResetFilters
 				key="reset-filters"

diff --git a/packages/dataviews/src/reset-filters.js b/packages/dataviews/src/reset-filters.js
@@ -4,16 +4,7 @@
 import { Button } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 
-/**
- * Internal dependencies
- */
-import { LAYOUT_LIST } from './constants';
-
 export default ( { view, onChangeView } ) => {
-	if ( view.type === LAYOUT_LIST ) {
-		return null;
-	}
-
 	return (
 		<Button
 			disabled={ view.search === '' && view.filters?.length === 0 }