Pre pull request clean up code

woocommerce · Apr 28, 2021 · 5e0c7f9 · 5e0c7f9
1 parent 105b3f7
commit 5e0c7f9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 19 deletions.
diff --git a/assets/js/base/components/product-list/product-list.js b/assets/js/base/components/product-list/product-list.js
@@ -62,18 +62,16 @@ const generateQuery = ( {
 		'stock_status',
 		[]
 	);
+	// @todo Find way to exclude "outofstock" from existing product filters.
 	if ( hideOutOfStockItems ) {
-		let newStockStatus = [];
+		let newStockStatus = [ 'instock', 'onbackorder' ];
 		if ( productStockStatus.length > 0 ) {
+			newStockStatus = productStockStatus;
 			if ( productStockStatus.includes( 'outofstock' ) ) {
 				newStockStatus = productStockStatus.filter(
 					( slug ) => slug !== 'outofstock'
 				);
-			} else {
-				newStockStatus = productStockStatus;
 			}
-		} else {
-			newStockStatus = [ 'instock', 'onbackorder' ];
 		}
 		setProductStockStatus( newStockStatus );
 	}

diff --git a/assets/js/blocks/stock-filter/block.js b/assets/js/blocks/stock-filter/block.js
@@ -79,7 +79,7 @@ const StockStatusFilterBlock = ( {
 	);
 
 	/**
-	 * Compare intersection of all stock stauses and filtered counts to get a list of options to display.
+	 * Compare intersection of all stock statuses and filtered counts to get a list of options to display.
 	 */
 	useEffect( () => {
 		/**
@@ -137,6 +137,18 @@ const StockStatusFilterBlock = ( {
 		queryState.stock_status,
 	] );
 
+	const onSubmit = useCallback(
+		( isChecked ) => {
+			if ( isEditor ) {
+				return;
+			}
+			if ( isChecked ) {
+				setProductStockStatusQuery( checked );
+			}
+		},
+		[ isEditor, setProductStockStatusQuery, checked ]
+	);
+
 	// Track checked STATE changes - if state changes, update the query.
 	useEffect( () => {
 		if ( ! blockAttributes.showFilterButton ) {
@@ -160,18 +172,6 @@ const StockStatusFilterBlock = ( {
 		}
 	}, [ checked, currentCheckedQuery, previousCheckedQuery ] );
 
-	const onSubmit = useCallback(
-		( isChecked ) => {
-			if ( isEditor ) {
-				return;
-			}
-			if ( isChecked ) {
-				setProductStockStatusQuery( checked );
-			}
-		},
-		[ isEditor, setProductStockStatusQuery, checked ]
-	);
-
 	/**
 	 * When a checkbox in the list changes, update state.
 	 */

diff --git a/assets/js/blocks/stock-filter/edit.js b/assets/js/blocks/stock-filter/edit.js
@@ -12,7 +12,6 @@ import {
 } from '@wordpress/components';
 import HeadingToolbar from '@woocommerce/editor-components/heading-toolbar';
 import BlockTitle from '@woocommerce/editor-components/block-title';
-// import { useState } from '@wordpress/element';
 
 /**
  * Internal dependencies