[Product Query] Fix filter block data counter

assets/js/base/context/hooks/collections/use-collection-data.ts

@@ -3,8 +3,9 @@
  */
 import { useState, useEffect, useMemo } from '@wordpress/element';
 import { useDebounce } from 'use-debounce';
-import { sortBy } from 'lodash';
+import { isEmpty, sortBy } from 'lodash';
 import { useShallowEqual } from '@woocommerce/base-hooks';
+import { getSettingWithCoercion } from '@woocommerce/settings';
 import { objectHasProp } from '@woocommerce/types';
 
 /**
@@ -47,6 +48,7 @@ interface UseCollectionDataProps {
 	queryStock?: boolean;
 	queryRating?: boolean;
 	queryState: Record< string, unknown >;
+	productIds?: number[];
 }
 
 export const useCollectionData = ( {
@@ -55,6 +57,7 @@ export const useCollectionData = ( {
 	queryStock,
 	queryRating,
 	queryState,
+	productIds,
 }: UseCollectionDataProps ) => {
 	let context = useQueryStateContext();
 	context = `${ context }-collection-data`;
@@ -163,6 +166,7 @@ export const useCollectionData = ( {
 			per_page: undefined,
 			orderby: undefined,
 			order: undefined,
+			...( ! isEmpty( productIds ) && { include: productIds } ),
 			...collectionDataQueryVars,
 		},
 		shouldSelect: debouncedShouldSelect,

assets/js/blocks/attribute-filter/block.tsx

@@ -101,6 +101,10 @@ const AttributeFilterBlock = ( {
 		isString
 	);
 
+	const productIds = isEditor
+		? []
+		: getSettingWithCoercion( 'product_ids', [], Array.isArray );
+
 	const [ hasSetFilterDefaultsFromUrl, setHasSetFilterDefaultsFromUrl ] =
 		useState( false );
 
@@ -158,6 +162,7 @@ const AttributeFilterBlock = ( {
 				...queryState,
 				attributes: filterAvailableTerms ? queryState.attributes : null,
 			},
+			productIds,
 		} );
 
 	/**

assets/js/blocks/price-filter/block.tsx

@@ -99,6 +99,10 @@ const PriceFilterBlock = ( {
 		isBoolean
 	);
 
+	const productIds = isEditor
+		? []
+		: getSettingWithCoercion( 'product_ids', [], Array.isArray );
+
 	const [ hasSetFilterDefaultsFromUrl, setHasSetFilterDefaultsFromUrl ] =
 		useState( false );
 
@@ -108,6 +112,7 @@ const PriceFilterBlock = ( {
 	const { results, isLoading } = useCollectionData( {
 		queryPrices: true,
 		queryState,
+		productIds,
 	} );
 
 	const currency = getCurrencyFromPriceResponse(

assets/js/blocks/stock-filter/block.tsx

@@ -70,6 +70,10 @@ const StockStatusFilterBlock = ( {
 		{}
 	);
 
+	const productIds = isEditor
+		? []
+		: getSettingWithCoercion( 'product_ids', [], Array.isArray );
+
 	const STOCK_STATUS_OPTIONS = useRef(
 		getSetting( 'hideOutOfStockItems', false )
 			? otherStockStatusOptions
@@ -101,6 +105,7 @@ const StockStatusFilterBlock = ( {
 		useCollectionData( {
 			queryStock: true,
 			queryState,
+			productIds,
 		} );
 
 	/**

src/BlockTypes/AttributeFilter.php

@@ -10,7 +10,9 @@ class AttributeFilter extends AbstractBlock {
 	 *
 	 * @var string
 	 */
-	protected $block_name = 'attribute-filter';
+	protected $block_name             = 'attribute-filter';
+	const FILTER_QUERY_VAR_PREFIX     = 'filter_';
+	const QUERY_TYPE_QUERY_VAR_PREFIX = 'query_type_';
 
 	/**
 	 * Extra data passed through from server to client for block.