From 7ebebe5ba2f1b090db4c92c742aabb80b2a74519 Mon Sep 17 00:00:00 2001
From: ramon <ramonjd@gmail.com>
Date: Tue, 5 Sep 2023 15:00:05 +1000
Subject: [PATCH 1/3] Using the template actions component for template parts
 patterns

---
 .../index.js                                  | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-pattern/index.js
index 39f28dba6d5204..989856ce110e3a 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-pattern/index.js
@@ -16,11 +16,14 @@ import useInitEditedEntityFromURL from '../sync-state-with-url/use-init-edited-e
 import usePatternDetails from './use-pattern-details';
 import { store as editSiteStore } from '../../store';
 import { unlock } from '../../lock-unlock';
+import TemplateActions from '../template-actions';
 
 export default function SidebarNavigationScreenPattern() {
-	const { params } = useNavigator();
+	const navigator = useNavigator();
+	const {
+		params: { postType, postId },
+	} = navigator;
 	const { categoryType } = getQueryArgs( window.location.href );
-	const { postType, postId } = params;
 	const { setCanvasMode } = unlock( useDispatch( editSiteStore ) );
 
 	useInitEditedEntityFromURL();
@@ -38,11 +41,21 @@ export default function SidebarNavigationScreenPattern() {
 	return (
 		<SidebarNavigationScreen
 			actions={
-				<SidebarButton
-					onClick={ () => setCanvasMode( 'edit' ) }
-					label={ __( 'Edit' ) }
-					icon={ pencil }
-				/>
+				<>
+					<TemplateActions
+						postType={ postType }
+						postId={ postId }
+						toggleProps={ { as: SidebarButton } }
+						onRemove={ () => {
+							navigator.goTo( `/${ postType }/all` );
+						} }
+					/>
+					<SidebarButton
+						onClick={ () => setCanvasMode( 'edit' ) }
+						label={ __( 'Edit' ) }
+						icon={ pencil }
+					/>
+				</>
 			}
 			backPath={ backPath }
 			{ ...patternDetails }

From a7b0e842ec4a1c9fd20452d673d5756bd40a1408 Mon Sep 17 00:00:00 2001
From: ramon <ramonjd@gmail.com>
Date: Tue, 5 Sep 2023 16:08:14 +1000
Subject: [PATCH 2/3] Using backPath to ensure the correct redirect after
 deletion

---
 .../src/components/sidebar-navigation-screen-pattern/index.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-pattern/index.js
index 989856ce110e3a..d9701e5358dcb5 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-pattern/index.js
@@ -47,7 +47,7 @@ export default function SidebarNavigationScreenPattern() {
 						postId={ postId }
 						toggleProps={ { as: SidebarButton } }
 						onRemove={ () => {
-							navigator.goTo( `/${ postType }/all` );
+							navigator.goTo( backPath );
 						} }
 					/>
 					<SidebarButton

From 252549e8c36932133b00012e305ab8f3345d51b2 Mon Sep 17 00:00:00 2001
From: ramon <ramonjd@gmail.com>
Date: Wed, 6 Sep 2023 12:49:17 +1000
Subject: [PATCH 3/3] using the template's name in the delete modal

---
 .../src/components/template-actions/index.js       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/edit-site/src/components/template-actions/index.js b/packages/edit-site/src/components/template-actions/index.js
index bce2a008077c66..19cf425d60014d 100644
--- a/packages/edit-site/src/components/template-actions/index.js
+++ b/packages/edit-site/src/components/template-actions/index.js
@@ -97,7 +97,7 @@ export default function TemplateActions( {
 									onRemove?.();
 									onClose();
 								} }
-								isTemplate={ template.type === 'wp_template' }
+								title={ template.title.rendered }
 							/>
 						</>
 					) }
@@ -120,7 +120,7 @@ export default function TemplateActions( {
 	);
 }
 
-function DeleteMenuItem( { onRemove, isTemplate } ) {
+function DeleteMenuItem( { onRemove, title } ) {
 	const [ isModalOpen, setIsModalOpen ] = useState( false );
 	return (
 		<>
@@ -133,11 +133,11 @@ function DeleteMenuItem( { onRemove, isTemplate } ) {
 				onCancel={ () => setIsModalOpen( false ) }
 				confirmButtonText={ __( 'Delete' ) }
 			>
-				{ isTemplate
-					? __( 'Are you sure you want to delete this template?' )
-					: __(
-							'Are you sure you want to delete this template part?'
-					  ) }
+				{ sprintf(
+					// translators: %s: The template or template part's title.
+					__( 'Are you sure you want to delete "%s"?' ),
+					decodeEntities( title )
+				) }
 			</ConfirmDialog>
 		</>
 	);