Specify Product Price ancestor and simplify Product Elements ancestors (#47802)

* Extend product elements sharedConfig ancestor with Product Collection and Products (Beta)

* Utilise sharedConfig ancestor in Image block

* Utilise sharedConfig ancestor in Price block

* Utilise sharedConfig ancestor in Rating block

* Utilise sharedConfig ancestor in Sale Badge block

* Utilise sharedConfig ancestor in SKU block

* Utilise sharedConfig ancestor in Stock Indicator block

* Add changelog

* Bring back original ancestors for Summary and Title blocks

* Remove Product Price from a test as it's no longer available in global context

plugins/woocommerce-blocks/assets/js/atomic/blocks/product-elements/image/index.ts

@@ -27,12 +27,6 @@ const blockConfig: BlockConfiguration = {
 	keywords: [ 'WooCommerce' ],
 	description,
 	usesContext: [ 'query', 'queryId', 'postId' ],
-	ancestor: [
-		'woocommerce/all-products',
-		'woocommerce/single-product',
-		'core/post-template',
-		'woocommerce/product-template',
-	],
 	textdomain: 'woocommerce',
 	attributes,
 	supports,

plugins/woocommerce-blocks/assets/js/atomic/blocks/product-elements/price/index.tsx

@@ -16,10 +16,8 @@ import {
 	BLOCK_DESCRIPTION as description,
 } from './constants';
 
-const { ancestor, ...configuration } = sharedConfig;
-
 const blockConfig = {
-	...configuration,
+	...sharedConfig,
 	apiVersion: 2,
 	title,
 	description,

plugins/woocommerce-blocks/assets/js/atomic/blocks/product-elements/rating/index.ts

@@ -15,12 +15,6 @@ import { supports } from './support';
 
 const blockConfig: BlockConfiguration = {
 	...sharedConfig,
-	ancestor: [
-		'woocommerce/all-products',
-		'woocommerce/single-product',
-		'core/post-template',
-		'woocommerce/product-template',
-	],
 	icon: { src: icon },
 	supports,
 	edit,

plugins/woocommerce-blocks/assets/js/atomic/blocks/product-elements/sale-badge/index.ts

@@ -28,10 +28,7 @@ const blockConfig: BlockConfiguration = {
 	edit,
 	usesContext: [ 'query', 'queryId', 'postId' ],
 	ancestor: [
-		'woocommerce/all-products',
+		...( sharedConfig.ancestor || [] ),
-		'woocommerce/single-product',
-		'core/post-template',
-		'woocommerce/product-template',
 		'woocommerce/product-gallery',
 	],
 };

plugins/woocommerce-blocks/assets/js/atomic/blocks/product-elements/shared/config.tsx

@@ -28,7 +28,14 @@ const sharedConfig: Omit< BlockConfiguration, 'attributes' | 'title' > = {
 	supports: {
 		html: false,
 	},
-	ancestor: [ 'woocommerce/all-products', 'woocommerce/single-product' ],
+	ancestor: [
+		'woocommerce/all-products',
+		'woocommerce/single-product',
+		// Product Collection product template
+		'woocommerce/product-template',
+		// Products (Beta) product template
+		'core/post-template',
+	],
 	save,
 	deprecated: [
 		{

plugins/woocommerce-blocks/assets/js/atomic/blocks/product-elements/sku/index.tsx

@@ -17,10 +17,8 @@ import {
 	BLOCK_DESCRIPTION as description,
 } from './constants';
 
-const { ancestor, ...configuration } = sharedConfig;
-
 const blockConfig: BlockConfiguration = {
-	...configuration,
+	...sharedConfig,
 	apiVersion: 2,
 	title,
 	description,
@@ -28,10 +26,7 @@ const blockConfig: BlockConfiguration = {
 	usesContext: [ 'query', 'queryId', 'postId' ],
 	attributes,
 	ancestor: [
-		'woocommerce/all-products',
+		...( sharedConfig.ancestor || [] ),
-		'woocommerce/single-product',
-		'core/post-template',
-		'woocommerce/product-template',
 		'woocommerce/product-meta',
 	],
 	edit,

plugins/woocommerce-blocks/assets/js/atomic/blocks/product-elements/stock-indicator/index.ts

@@ -28,12 +28,6 @@ const blockConfig: BlockConfiguration = {
 	supports,
 	edit,
 	usesContext: [ 'query', 'queryId', 'postId' ],
-	ancestor: [
-		'woocommerce/all-products',
-		'woocommerce/single-product',
-		'core/post-template',
-		'woocommerce/product-template',
-	],
 };
 
 registerBlockType( 'woocommerce/product-stock-indicator', {

plugins/woocommerce-blocks/assets/js/atomic/blocks/product-elements/summary/index.ts

@@ -20,6 +20,9 @@ import { Save } from './save';
 
 const blockConfig: BlockConfiguration = {
 	...sharedConfig,
+	// Product Summary is not expected to be available in Product Collection
+	// nor Products (Beta). They use core/post-summary variation.
+	ancestor: [ 'woocommerce/all-products', 'woocommerce/single-product' ],
 	apiVersion: 2,
 	title,
 	description,

plugins/woocommerce-blocks/assets/js/atomic/blocks/product-elements/title/index.ts

@@ -22,6 +22,9 @@ import { Save } from './save';
 
 const blockConfig: BlockConfiguration = {
 	...sharedConfig,
+	// Product Title is not expected to be available in Product Collection
+	// nor Products (Beta). They use core/post-title variation.
+	ancestor: [ 'woocommerce/all-products', 'woocommerce/single-product' ],
 	apiVersion: 2,
 	title,
 	description,

plugins/woocommerce/changelog/fix-product-price-ancestors

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Product Price: Narrow down the ancestors of the block so it's available in inserter only in places where block makes sense

plugins/woocommerce/tests/e2e-pw/tests/merchant/create-woocommerce-blocks.spec.js

@@ -13,9 +13,6 @@ const singleProductPrice = '555.00';
 // all WooCommerce blocks except:
 // default cart and checkout blocks, mini-cart, product collection
 const blocks = [
-	{
-		name: 'Product Price',
-	},
 	{
 		name: 'Product Search',
 	},