From 0fc75c514871d330888c3c0a81a48f5afdf43475 Mon Sep 17 00:00:00 2001
From: Maikel Perez <maikel.perez@automattic.com>
Date: Wed, 13 Mar 2024 19:16:12 -0300
Subject: [PATCH] Remove Custom Fields for New Product Editor (#45493)

* Add remove custom field for the new product editor

* Add changelog file

* Show add button when the custom fields are empty

* Ensures to always convert the metas into a string array since it can be anything

* Add changelog file
---
 .../product-editor/changelog/add-44169-remove |   4 +
 .../custom-fields/custom-fields.tsx           | 114 +++++++++++-------
 .../src/hooks/use-custom-fields/types.ts      |   2 +-
 .../use-custom-fields/use-custom-fields.ts    |  32 ++++-
 .../hooks/use-custom-fields/utils/index.ts    |   8 +-
 .../woocommerce/changelog/add-44169-remove    |   4 +
 .../Features/ProductBlockEditor/Init.php      |   3 +-
 7 files changed, 114 insertions(+), 53 deletions(-)
 create mode 100644 packages/js/product-editor/changelog/add-44169-remove
 create mode 100644 plugins/woocommerce/changelog/add-44169-remove

diff --git a/packages/js/product-editor/changelog/add-44169-remove b/packages/js/product-editor/changelog/add-44169-remove
new file mode 100644
index 00000000000..9dbf72c281e
--- /dev/null
+++ b/packages/js/product-editor/changelog/add-44169-remove
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Remove Custom Fields for New Product Editor
diff --git a/packages/js/product-editor/src/components/custom-fields/custom-fields.tsx b/packages/js/product-editor/src/components/custom-fields/custom-fields.tsx
index 396e3c383e6..abed847edea 100644
--- a/packages/js/product-editor/src/components/custom-fields/custom-fields.tsx
+++ b/packages/js/product-editor/src/components/custom-fields/custom-fields.tsx
@@ -4,6 +4,7 @@
 import { Button } from '@wordpress/components';
 import { createElement, Fragment, useState } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
+import { closeSmall } from '@wordpress/icons';
 import classNames from 'classnames';
 
 /**
@@ -21,17 +22,17 @@ export function CustomFields( {
 	renderActionButtonsWrapper = ( buttons ) => buttons,
 	...props
 }: CustomFieldsProps ) {
-	const { customFields, addCustomFields, updateCustomField } =
-		useCustomFields();
+	const {
+		customFields,
+		addCustomFields,
+		updateCustomField,
+		removeCustomField,
+	} = useCustomFields();
 
 	const [ showCreateModal, setShowCreateModal ] = useState( false );
 	const [ selectedCustomField, setSelectedCustomField ] =
 		useState< Metadata< string > >();
 
-	if ( customFields.length === 0 ) {
-		return <EmptyState />;
-	}
-
 	function handleAddNewButtonClick() {
 		setShowCreateModal( true );
 	}
@@ -44,6 +45,14 @@ export function CustomFields( {
 		};
 	}
 
+	function customFieldRemoveButtonClickHandler(
+		customField: Metadata< string >
+	) {
+		return function handleCustomFieldRemoveButtonClick() {
+			removeCustomField( customField );
+		};
+	}
+
 	function handleCreateModalCreate( value: Metadata< string >[] ) {
 		addCustomFields( value );
 		setShowCreateModal( false );
@@ -70,46 +79,61 @@ export function CustomFields( {
 				</Button>
 			) }
 
-			<table
-				{ ...props }
-				className={ classNames(
-					'woocommerce-product-custom-fields__table',
-					className
-				) }
-			>
-				<thead>
-					<tr className="woocommerce-product-custom-fields__table-row">
-						<th>{ __( 'Name', 'woocommerce' ) }</th>
-						<th>{ __( 'Value', 'woocommerce' ) }</th>
-						<th>{ __( 'Actions', 'woocommerce' ) }</th>
-					</tr>
-				</thead>
-				<tbody>
-					{ customFields.map( ( customField ) => (
-						<tr
-							className="woocommerce-product-custom-fields__table-row"
-							key={ customField.id ?? customField.key }
-						>
-							<td className="woocommerce-product-custom-fields__table-datacell">
-								{ customField.key }
-							</td>
-							<td className="woocommerce-product-custom-fields__table-datacell">
-								{ customField.value }
-							</td>
-							<td className="woocommerce-product-custom-fields__table-datacell">
-								<Button
-									variant="tertiary"
-									onClick={ customFieldEditButtonClickHandler(
-										customField
-									) }
-								>
-									{ __( 'Edit', 'woocommerce' ) }
-								</Button>
-							</td>
+			{ customFields.length === 0 ? (
+				<EmptyState />
+			) : (
+				<table
+					{ ...props }
+					className={ classNames(
+						'woocommerce-product-custom-fields__table',
+						className
+					) }
+				>
+					<thead>
+						<tr className="woocommerce-product-custom-fields__table-row">
+							<th>{ __( 'Name', 'woocommerce' ) }</th>
+							<th>{ __( 'Value', 'woocommerce' ) }</th>
+							<th>{ __( 'Actions', 'woocommerce' ) }</th>
 						</tr>
-					) ) }
-				</tbody>
-			</table>
+					</thead>
+					<tbody>
+						{ customFields.map( ( customField ) => (
+							<tr
+								className="woocommerce-product-custom-fields__table-row"
+								key={ customField.id ?? customField.key }
+							>
+								<td className="woocommerce-product-custom-fields__table-datacell">
+									{ customField.key }
+								</td>
+								<td className="woocommerce-product-custom-fields__table-datacell">
+									{ customField.value }
+								</td>
+								<td className="woocommerce-product-custom-fields__table-datacell">
+									<Button
+										variant="tertiary"
+										onClick={ customFieldEditButtonClickHandler(
+											customField
+										) }
+									>
+										{ __( 'Edit', 'woocommerce' ) }
+									</Button>
+
+									<Button
+										icon={ closeSmall }
+										onClick={ customFieldRemoveButtonClickHandler(
+											customField
+										) }
+										aria-label={ __(
+											'Remove custom field',
+											'woocommerce'
+										) }
+									/>
+								</td>
+							</tr>
+						) ) }
+					</tbody>
+				</table>
+			) }
 
 			{ showCreateModal && (
 				<CreateModal
diff --git a/packages/js/product-editor/src/hooks/use-custom-fields/types.ts b/packages/js/product-editor/src/hooks/use-custom-fields/types.ts
index 0555406ea92..0f5c0ff3145 100644
--- a/packages/js/product-editor/src/hooks/use-custom-fields/types.ts
+++ b/packages/js/product-editor/src/hooks/use-custom-fields/types.ts
@@ -5,5 +5,5 @@ import { Metadata } from '../../types';
 
 export type DisjoinMetas< T extends Metadata< string > > = {
 	customFields: T[];
-	internalMetas: T[];
+	otherMetas: T[];
 };
diff --git a/packages/js/product-editor/src/hooks/use-custom-fields/use-custom-fields.ts b/packages/js/product-editor/src/hooks/use-custom-fields/use-custom-fields.ts
index dff983f2ce5..4f516edb5c6 100644
--- a/packages/js/product-editor/src/hooks/use-custom-fields/use-custom-fields.ts
+++ b/packages/js/product-editor/src/hooks/use-custom-fields/use-custom-fields.ts
@@ -20,11 +20,11 @@ export function useCustomFields<
 		'meta_data'
 	);
 
-	const { customFields, internalMetas } = useMemo(
+	const { customFields, otherMetas } = useMemo(
 		function extractCustomFieldsFromMetas() {
 			return metas.reduce( disjoinMetas< T >, {
 				customFields: [],
-				internalMetas: [],
+				otherMetas: [],
 			} );
 		},
 		[ metas ]
@@ -34,7 +34,7 @@ export function useCustomFields<
 		const newValue =
 			typeof value === 'function' ? value( customFields ) : value;
 
-		setMetas( [ ...internalMetas, ...newValue ] );
+		setMetas( [ ...otherMetas, ...newValue ] );
 	}
 
 	function addCustomFields( value: T[] ) {
@@ -52,10 +52,36 @@ export function useCustomFields<
 		);
 	}
 
+	function removeCustomField( customField: T ) {
+		setCustomFields( ( current ) => {
+			// If the id is undefined then it is a local copy.
+			if ( customField.id === undefined ) {
+				return current.filter( function isNotEquals( field ) {
+					return ! (
+						field.key === customField.key &&
+						field.value === customField.value
+					);
+				} );
+			}
+
+			return current.map( ( field ) => {
+				if ( field.id === customField.id ) {
+					return {
+						...field,
+						value: null,
+					};
+				}
+
+				return field;
+			} );
+		} );
+	}
+
 	return {
 		customFields,
 		addCustomFields,
 		setCustomFields,
 		updateCustomField,
+		removeCustomField,
 	};
 }
diff --git a/packages/js/product-editor/src/hooks/use-custom-fields/utils/index.ts b/packages/js/product-editor/src/hooks/use-custom-fields/utils/index.ts
index c15b8be6ae8..4279278bdbe 100644
--- a/packages/js/product-editor/src/hooks/use-custom-fields/utils/index.ts
+++ b/packages/js/product-editor/src/hooks/use-custom-fields/utils/index.ts
@@ -4,8 +4,10 @@
 import type { Metadata } from '../../../types';
 import type { DisjoinMetas } from '../types';
 
-export function isCustomField< T extends Metadata< string > >( value: T ) {
-	return ! value.key.startsWith( '_' );
+export function isCustomField< T extends Metadata< string > >(
+	customField: T
+) {
+	return ! customField.key.startsWith( '_' ) && customField.value !== null;
 }
 
 export function disjoinMetas< T extends Metadata< string > >(
@@ -15,7 +17,7 @@ export function disjoinMetas< T extends Metadata< string > >(
 	if ( isCustomField( meta ) ) {
 		state.customFields.push( meta );
 	} else {
-		state.internalMetas.push( meta );
+		state.otherMetas.push( meta );
 	}
 	return state;
 }
diff --git a/plugins/woocommerce/changelog/add-44169-remove b/plugins/woocommerce/changelog/add-44169-remove
new file mode 100644
index 00000000000..98efda0eb78
--- /dev/null
+++ b/plugins/woocommerce/changelog/add-44169-remove
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Ensures to always convert the metas into a string array since it can be anything
diff --git a/plugins/woocommerce/src/Admin/Features/ProductBlockEditor/Init.php b/plugins/woocommerce/src/Admin/Features/ProductBlockEditor/Init.php
index 7b7599966ad..3497f195ef4 100644
--- a/plugins/woocommerce/src/Admin/Features/ProductBlockEditor/Init.php
+++ b/plugins/woocommerce/src/Admin/Features/ProductBlockEditor/Init.php
@@ -393,7 +393,8 @@ class Init {
 					$hidden = get_user_meta( $object['id'], $attr, true );
 
 					if ( is_array( $hidden ) ) {
-						return $hidden;
+						// Ensures to always return a string array.
+						return array_values( $hidden );
 					}
 
 					return array( 'postcustom' );