Removed unused rename component.

Cleaning up after rebase
WordPress · Sep 21, 2023 · 314d5b7 · 314d5b7
1 parent 5da8939
commit 314d5b7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 135 deletions.
diff --git a/packages/edit-site/src/components/page-patterns/rename-menu-item.js b/packages/edit-site/src/components/page-patterns/rename-menu-item.js
diff --git a/packages/edit-site/src/components/template-actions/index.js b/packages/edit-site/src/components/template-actions/index.js
@@ -26,10 +26,9 @@ import RenameMenuItem from './rename-menu-item';
 import {
 	TEMPLATE_POST_TYPE,
 	TEMPLATE_PART_POST_TYPE,
-	PATTERN_POST_TYPE,
 	POST_TYPE_LABELS,
+	PATTERN_TYPES,
 } from '../../utils/constants';
-
 export default function TemplateActions( {
 	postType,
 	postId,
@@ -50,7 +49,7 @@ export default function TemplateActions( {
 		useDispatch( reusableBlocksStore );
 	const isRemovable = isTemplateRemovable( record );
 	// Only custom patterns or custom template parts can be renamed or deleted.
-	const isUserPattern = record?.type === PATTERN_POST_TYPE;
+	const isUserPattern = record?.type === PATTERN_TYPES.user;
 	const isTemplate = record?.type === TEMPLATE_POST_TYPE;
 	const isTemplatePart = record?.type === TEMPLATE_PART_POST_TYPE;
 
@@ -72,7 +71,9 @@ export default function TemplateActions( {
 				sprintf(
 					// translators: %s: The pattern's title e.g. 'Call to action'.
 					__( '"%s" deleted.' ),
-					pattern.title
+					decodeEntities(
+						pattern?.title?.rendered || pattern?.title?.raw
+					)
 				),
 				{ type: 'snackbar', id: 'edit-site-patterns-success' }
 			);
@@ -89,9 +90,9 @@ export default function TemplateActions( {
 	};
 
 	const deleteItem = async ( item ) => {
-		if ( isUserPattern ) {
+		if ( isTemplateRemovable( item ) ) {
 			removeTemplate( item );
-		} else if ( isTemplateRemovable( item ) ) {
+		} else if ( isUserPattern ) {
 			deletePattern( item );
 		}
 	};

diff --git a/packages/edit-site/src/components/template-actions/rename-menu-item.js b/packages/edit-site/src/components/template-actions/rename-menu-item.js
@@ -22,7 +22,7 @@ import { decodeEntities } from '@wordpress/html-entities';
 import {
 	TEMPLATE_POST_TYPE,
 	TEMPLATE_PART_POST_TYPE,
-	PATTERN_POST_TYPE,
+	PATTERN_TYPES,
 	TEMPLATE_CUSTOM_SOURCE,
 	POST_TYPE_LABELS,
 } from '../../utils/constants';
@@ -44,7 +44,7 @@ export default function RenameMenuItem( { postType, postId, onClose } ) {
 
 	const isTemplate = record?.type === TEMPLATE_POST_TYPE;
 	const isTemplatePart = record?.type === TEMPLATE_PART_POST_TYPE;
-	const isUserPattern = record?.type === PATTERN_POST_TYPE;
+	const isUserPattern = record?.type === PATTERN_TYPES.user;
 
 	if (
 		( isTemplate || isTemplatePart ) &&

diff --git a/packages/edit-site/src/store/actions.js b/packages/edit-site/src/store/actions.js
@@ -141,7 +141,7 @@ export const removeTemplate =
 				throw lastError;
 			}
 
-			// Depending on how the entity was retrieved it's title might be
+			// Depending on how the entity was retrieved its title might be
 			// an object or simple string.
 			const templateTitle =
 				typeof template.title === 'string'