From 54d578b79358d4ada4e0aea601e9b173c3caa17c Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Tue, 16 May 2023 11:32:42 +0100
Subject: [PATCH 1/2] Command center: Add searchLabel property to commands

---
 packages/commands/src/components/command-menu.js      |  4 ++--
 packages/commands/src/hooks/use-command.js            |  2 ++
 packages/commands/src/store/actions.js                | 11 ++++++-----
 packages/commands/src/store/reducer.js                |  1 +
 packages/core-commands/src/add-post-type-commands.js  |  4 ++--
 .../src/site-editor-navigation-commands.js            |  3 ++-
 .../src/hooks/commands/use-edit-mode-commands.js      |  4 ++--
 7 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/packages/commands/src/components/command-menu.js b/packages/commands/src/components/command-menu.js
index 75bc6f4e827a2..9f59db3f6f53c 100644
--- a/packages/commands/src/components/command-menu.js
+++ b/packages/commands/src/components/command-menu.js
@@ -41,7 +41,7 @@ function CommandMenuLoader( { name, search, hook, setLoader, close } ) {
 				{ commands.map( ( command ) => (
 					<Command.Item
 						key={ command.name }
-						value={ command.name }
+						value={ command.searchLabel ?? command.label }
 						onSelect={ () => command.callback( { close } ) }
 					>
 						<HStack
@@ -110,7 +110,7 @@ export function CommandMenuGroup( { isContextual, search, setLoader, close } ) {
 			{ commands.map( ( command ) => (
 				<Command.Item
 					key={ command.name }
-					value={ command.name }
+					value={ command.searchLabel ?? command.label }
 					onSelect={ () => command.callback( { close } ) }
 				>
 					<HStack
diff --git a/packages/commands/src/hooks/use-command.js b/packages/commands/src/hooks/use-command.js
index d3edbf4e17fdc..e3f56662b91f2 100644
--- a/packages/commands/src/hooks/use-command.js
+++ b/packages/commands/src/hooks/use-command.js
@@ -26,6 +26,7 @@ export default function useCommand( command ) {
 			name: command.name,
 			context: command.context,
 			label: command.label,
+			searchLabel: command.searchLabel,
 			icon: command.icon,
 			callback: currentCallback.current,
 		} );
@@ -35,6 +36,7 @@ export default function useCommand( command ) {
 	}, [
 		command.name,
 		command.label,
+		command.searchLabel,
 		command.icon,
 		command.context,
 		registerCommand,
diff --git a/packages/commands/src/store/actions.js b/packages/commands/src/store/actions.js
index 81f3ddf722208..de5f3f7ca1544 100644
--- a/packages/commands/src/store/actions.js
+++ b/packages/commands/src/store/actions.js
@@ -5,11 +5,12 @@
  *
  * @typedef {Object} WPCommandConfig
  *
- * @property {string}      name     Command name.
- * @property {string}      label    Command label.
- * @property {string=}     context  Command context.
- * @property {JSX.Element} icon     Command icon.
- * @property {Function}    callback Command callback.
+ * @property {string}      name        Command name.
+ * @property {string}      label       Command label.
+ * @property {string=}     searchLabel Command label.
+ * @property {string=}     context     Command context.
+ * @property {JSX.Element} icon        Command icon.
+ * @property {Function}    callback    Command callback.
  */
 
 /**
diff --git a/packages/commands/src/store/reducer.js b/packages/commands/src/store/reducer.js
index e61de53d21a70..c2bb73b189f16 100644
--- a/packages/commands/src/store/reducer.js
+++ b/packages/commands/src/store/reducer.js
@@ -19,6 +19,7 @@ function commands( state = {}, action ) {
 				[ action.name ]: {
 					name: action.name,
 					label: action.label,
+					searchLabel: action.searchLabel,
 					context: action.context,
 					callback: action.callback,
 					icon: action.icon,
diff --git a/packages/core-commands/src/add-post-type-commands.js b/packages/core-commands/src/add-post-type-commands.js
index afd783c7c0cc3..3c2a7ea8c52cd 100644
--- a/packages/core-commands/src/add-post-type-commands.js
+++ b/packages/core-commands/src/add-post-type-commands.js
@@ -14,7 +14,7 @@ const { useCommand } = unlock( privateApis );
 
 export function useAddPostTypeCommands() {
 	useCommand( {
-		name: 'add new post',
+		name: 'core/add-new-post',
 		label: __( 'Add new post' ),
 		icon: plus,
 		callback: () => {
@@ -22,7 +22,7 @@ export function useAddPostTypeCommands() {
 		},
 	} );
 	useCommand( {
-		name: 'add new page',
+		name: 'core/add-new-page',
 		label: __( 'Add new page' ),
 		icon: plus,
 		callback: () => {
diff --git a/packages/core-commands/src/site-editor-navigation-commands.js b/packages/core-commands/src/site-editor-navigation-commands.js
index 310b0c1c1e17a..1bf29fa08f9ce 100644
--- a/packages/core-commands/src/site-editor-navigation-commands.js
+++ b/packages/core-commands/src/site-editor-navigation-commands.js
@@ -66,7 +66,8 @@ const getNavigationCommandLoaderPerPostType = ( postType ) =>
 					? { canvas: getQueryArg( window.location.href, 'canvas' ) }
 					: {};
 				return {
-					name: record.title?.rendered + ' ' + record.id,
+					name: postType + '-' + record.id,
+					searchLabel: record.title?.rendered + ' ' + record.id,
 					label: record.title?.rendered
 						? record.title?.rendered
 						: __( '(no title)' ),
diff --git a/packages/edit-site/src/hooks/commands/use-edit-mode-commands.js b/packages/edit-site/src/hooks/commands/use-edit-mode-commands.js
index 59071a4088f42..67b7164edcdab 100644
--- a/packages/edit-site/src/hooks/commands/use-edit-mode-commands.js
+++ b/packages/edit-site/src/hooks/commands/use-edit-mode-commands.js
@@ -35,7 +35,7 @@ function useEditModeCommandLoader() {
 				? __( 'Delete template' )
 				: __( 'Delete template part' );
 		commands.push( {
-			name: label,
+			name: 'core/remove-template',
 			label,
 			icon: trash,
 			context: 'site-editor-edit',
@@ -55,7 +55,7 @@ function useEditModeCommandLoader() {
 				? __( 'Reset template' )
 				: __( 'Reset template part' );
 		commands.push( {
-			name: label,
+			name: 'core/reset-template',
 			label,
 			icon: backup,
 			callback: ( { close } ) => {

From 49d535cb22e97f5b404a9a6ae6497bd96de925da Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Tue, 16 May 2023 12:37:27 +0100
Subject: [PATCH 2/2] Fix comment

Co-authored-by: Nik Tsekouras <ntsekouras@outlook.com>
---
 packages/commands/src/store/actions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/commands/src/store/actions.js b/packages/commands/src/store/actions.js
index de5f3f7ca1544..6162f1497cf0a 100644
--- a/packages/commands/src/store/actions.js
+++ b/packages/commands/src/store/actions.js
@@ -7,7 +7,7 @@
  *
  * @property {string}      name        Command name.
  * @property {string}      label       Command label.
- * @property {string=}     searchLabel Command label.
+ * @property {string=}     searchLabel Command search label.
  * @property {string=}     context     Command context.
  * @property {JSX.Element} icon        Command icon.
  * @property {Function}    callback    Command callback.