Merge pull request #2690 from woocommerce/fix/hide-gtin-in-product-ed…

…itor [GTIN] Hide GTIN in product editor
woocommerce · Nov 22, 2024 · f17e3c0 · f17e3c0
2 parents 5d03086 + 4aece62
commit f17e3c0
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 6 deletions.
diff --git a/js/src/blocks/product-select-with-text-field/edit.js b/js/src/blocks/product-select-with-text-field/edit.js
@@ -86,12 +86,14 @@ export default function Edit( { attributes, context } ) {
 				options={ options }
 				value={ optionValue }
 				onChange={ handleSelectionChange }
+				disabled={ attributes.disabled }
 			/>
 			{ isSelectedCustomInput && (
 				<TextControl
 					type="text"
 					value={ text }
 					onChange={ handleTextChange }
+					disabled={ attributes.disabled }
 				/>
 			) }
 		</div>

diff --git a/src/Admin/Input/Input.php b/src/Admin/Input/Input.php
@@ -258,14 +258,21 @@ public function set_block_attribute( string $key, $value ): InputInterface {
 	public function get_block_attributes(): array {
 		$meta_key = $this->prefix_meta_key( $this->get_id() );
 
-		return array_merge(
+		$block_attributes = array_merge(
 			[
 				'property' => "meta_data.{$meta_key}",
 				'label'    => $this->get_label(),
 				'tooltip'  => $this->get_description(),
 			],
 			$this->block_attributes
 		);
+
+		// Set boolean disabled property only if it's needed.
+		if ( $this->is_readonly() ) {
+			$block_attributes['disabled'] = true;
+		}
+
+		return $block_attributes;
 	}
 
 	/**

diff --git a/src/Admin/ProductBlocksService.php b/src/Admin/ProductBlocksService.php
@@ -275,6 +275,12 @@ private function add_product_attribute_blocks( SectionInterface $section ): void
 			$input_type = call_user_func( [ $attribute_type, 'get_input_type' ] );
 			$input      = AttributesForm::init_input( new $input_type(), new $attribute_type() );
 
+			// Avoid to render Inputs that are defined as hidden in the Input.
+			// i.e We don't render GTIN for new WC versions anymore.
+			if ( $input->is_hidden() ) {
+				continue;
+			}
+
 			if ( $is_variation_template ) {
 				// When editing a variation, its product type on the frontend side won't be changed dynamically.
 				// In addition, the property of `editedProduct.type` doesn't exist in the variation product.

diff --git a/src/Internal/DependencyManagement/CoreServiceProvider.php b/src/Internal/DependencyManagement/CoreServiceProvider.php
@@ -435,6 +435,6 @@ function ( ...$arguments ) {
 		}
 
 		// ClI Classes
-		$this->share_with_tags( WPCLIMigrationGTIN::class, ProductRepository::class, AttributeManager::class );
+		$this->conditionally_share_with_tags( WPCLIMigrationGTIN::class, ProductRepository::class, AttributeManager::class );
 	}
 }
diff --git a/tests/Unit/Admin/Product/Attributes/Input/AttributeInputCollectionTest.php b/tests/Unit/Admin/Product/Attributes/Input/AttributeInputCollectionTest.php
@@ -361,6 +361,7 @@ public function test_gtin_input() {
 					'property' => 'meta_data._wc_gla_gtin',
 					'label'    => 'Global Trade Item Number (GTIN)',
 					'tooltip'  => $description,
+					'disabled' => true,
 				],
 			],
 			$input->get_block_config()

diff --git a/tests/e2e/specs/product-editor/block-integration.test.js b/tests/e2e/specs/product-editor/block-integration.test.js
@@ -607,7 +607,9 @@ test.describe( 'Product Block Editor integration', () => {
 		await editorUtils.save();
 
 		for ( const [ attribute, value ] of pairs ) {
-			await expect( attribute ).toHaveValue( value );
+			if ( await attribute.isEditable() ) {
+				await expect( attribute ).toHaveValue( value );
+			}
 		}
 
 		/*
@@ -649,7 +651,9 @@ test.describe( 'Product Block Editor integration', () => {
 		await editorUtils.save();
 
 		for ( const [ attribute, value ] of pairs ) {
-			await expect( attribute ).toHaveValue( value );
+			if ( await attribute.isEditable() ) {
+				await expect( attribute ).toHaveValue( value );
+			}
 		}
 
 		/*

diff --git a/tests/e2e/specs/product-editor/classic-integration.test.js b/tests/e2e/specs/product-editor/classic-integration.test.js
@@ -586,7 +586,9 @@ test.describe( 'Classic Product Editor integration', () => {
 		await editorUtils.clickPluginTab();
 
 		for ( const [ attribute, value ] of pairs ) {
-			await expect( attribute ).toHaveValue( value );
+			if ( await attribute.isEditable() ) {
+				await expect( attribute ).toHaveValue( value );
+			}
 		}
 
 		/*
@@ -631,7 +633,9 @@ test.describe( 'Classic Product Editor integration', () => {
 		await editorUtils.gotoEditVariation();
 
 		for ( const [ attribute, value ] of pairs ) {
-			await expect( attribute ).toHaveValue( value );
+			if ( await attribute.isEditable() ) {
+				await expect( attribute ).toHaveValue( value );
+			}
 		}
 
 		/*

diff --git a/tests/e2e/utils/product-editor.js b/tests/e2e/utils/product-editor.js
@@ -67,6 +67,10 @@ async function getAvailableProductAttributesWithTestValues(
 async function setAttributeValue( locator, value ) {
 	const tagName = await locator.evaluate( ( element ) => element.tagName );
 
+	if ( ( await locator.isEditable() ) === false ) {
+		return;
+	}
+
 	if ( tagName === 'SELECT' ) {
 		await locator.selectOption( value );
 	} else {