From c7a57af45ea48f8317c087e7f6a73f58d8acdbf0 Mon Sep 17 00:00:00 2001
From: Glen Davies <glen.davies@automattic.com>
Date: Wed, 7 Feb 2024 13:15:12 +1300
Subject: [PATCH 01/11] Rename the getPostLinkProps setting

---
 packages/block-library/src/block/edit.js      | 23 ++++------
 packages/edit-post/src/editor.js              | 10 ++---
 ...t-history.js => use-load-entity-record.js} | 34 +++++----------
 .../block-editor/use-load-entity-record.js    | 29 +++++++++++++
 .../block-editor/use-post-link-props.js       | 24 -----------
 .../block-editor/use-site-editor-settings.js  |  8 ++--
 .../edit-site/src/components/routes/link.js   | 13 +-----
 .../edit-template-blocks-notification.js      |  4 +-
 .../components/post-template/block-theme.js   | 43 +++++++++++--------
 .../components/post-template/classic-theme.js | 21 +++++----
 .../create-new-template-modal.js              | 16 +++----
 .../provider/use-block-editor-settings.js     |  2 +-
 12 files changed, 103 insertions(+), 124 deletions(-)
 rename packages/edit-post/src/hooks/{use-post-history.js => use-load-entity-record.js} (66%)
 create mode 100644 packages/edit-site/src/components/block-editor/use-load-entity-record.js
 delete mode 100644 packages/edit-site/src/components/block-editor/use-post-link-props.js

diff --git a/packages/block-library/src/block/edit.js b/packages/block-library/src/block/edit.js
index f8359c9889312c..6526317d08308f 100644
--- a/packages/block-library/src/block/edit.js
+++ b/packages/block-library/src/block/edit.js
@@ -212,7 +212,7 @@ export default function ReusableBlockEdit( {
 		innerBlocks,
 		userCanEdit,
 		getBlockEditingMode,
-		getPostLinkProps,
+		onSelectEntityRecord,
 		editingMode,
 	} = useSelect(
 		( select ) => {
@@ -230,19 +230,17 @@ export default function ReusableBlockEdit( {
 				innerBlocks: blocks,
 				userCanEdit: canEdit,
 				getBlockEditingMode: _getBlockEditingMode,
-				getPostLinkProps: getSettings().getPostLinkProps,
+				onSelectEntityRecord: getSettings().onSelectEntityRecord,
 				editingMode: _getBlockEditingMode( patternClientId ),
 			};
 		},
 		[ patternClientId, ref ]
 	);
 
-	const editOriginalProps = getPostLinkProps
-		? getPostLinkProps( {
-				postId: ref,
-				postType: 'wp_block',
-		  } )
-		: {};
+	const editOriginal = onSelectEntityRecord( {
+		postId: ref,
+		postType: 'wp_block',
+	} );
 
 	// Sync the editing mode of the pattern block with the inner blocks.
 	useEffect( () => {
@@ -343,7 +341,7 @@ export default function ReusableBlockEdit( {
 	}, [ syncDerivedUpdates, patternClientId, registry, setAttributes ] );
 
 	const handleEditOriginal = ( event ) => {
-		editOriginalProps.onClick( event );
+		editOriginal( event );
 	};
 
 	const resetContent = () => {
@@ -380,13 +378,10 @@ export default function ReusableBlockEdit( {
 
 	return (
 		<RecursionProvider uniqueId={ ref }>
-			{ userCanEdit && editOriginalProps && (
+			{ userCanEdit && editOriginal && (
 				<BlockControls>
 					<ToolbarGroup>
-						<ToolbarButton
-							href={ editOriginalProps.href }
-							onClick={ handleEditOriginal }
-						>
+						<ToolbarButton onClick={ handleEditOriginal }>
 							{ __( 'Edit original' ) }
 						</ToolbarButton>
 					</ToolbarGroup>
diff --git a/packages/edit-post/src/editor.js b/packages/edit-post/src/editor.js
index ce99ed1eef38eb..4fe88fc3a0ef28 100644
--- a/packages/edit-post/src/editor.js
+++ b/packages/edit-post/src/editor.js
@@ -21,7 +21,7 @@ import Layout from './components/layout';
 import EditorInitialization from './components/editor-initialization';
 import { store as editPostStore } from './store';
 import { unlock } from './lock-unlock';
-import usePostHistory from './hooks/use-post-history';
+import useLoadEntityRecord from './hooks/use-load-entity-record';
 
 const { ExperimentalEditorProvider } = unlock( editorPrivateApis );
 
@@ -32,8 +32,8 @@ function Editor( {
 	initialEdits,
 	...props
 } ) {
-	const { currentPost, getPostLinkProps, initialPost, goBack } =
-		usePostHistory( initialPostId, initialPostType );
+	const { initialPost, currentPost, onSelectEntityRecord, goBack } =
+		useLoadEntityRecord( initialPostId, initialPostType );
 
 	const { hasInlineToolbar, post, preferredStyleVariations, template } =
 		useSelect(
@@ -81,7 +81,7 @@ function Editor( {
 	const editorSettings = useMemo(
 		() => ( {
 			...settings,
-			getPostLinkProps,
+			onSelectEntityRecord,
 			goBack,
 			defaultRenderingMode,
 			__experimentalPreferredStyleVariations: {
@@ -95,7 +95,7 @@ function Editor( {
 			hasInlineToolbar,
 			preferredStyleVariations,
 			updatePreferredStyleVariations,
-			getPostLinkProps,
+			onSelectEntityRecord,
 			goBack,
 			defaultRenderingMode,
 		]
diff --git a/packages/edit-post/src/hooks/use-post-history.js b/packages/edit-post/src/hooks/use-load-entity-record.js
similarity index 66%
rename from packages/edit-post/src/hooks/use-post-history.js
rename to packages/edit-post/src/hooks/use-load-entity-record.js
index fa76258a0c2468..5804fd7d1d38b6 100644
--- a/packages/edit-post/src/hooks/use-post-history.js
+++ b/packages/edit-post/src/hooks/use-load-entity-record.js
@@ -2,7 +2,6 @@
  * WordPress dependencies
  */
 import { useCallback, useReducer, useMemo } from '@wordpress/element';
-import { addQueryArgs, getQueryArgs, removeQueryArgs } from '@wordpress/url';
 
 /**
  * A hook that records the 'entity' history in the post editor as a user
@@ -16,9 +15,9 @@ import { addQueryArgs, getQueryArgs, removeQueryArgs } from '@wordpress/url';
  * @param {string} initialPostType The post type of the post when the editor loaded.
  *
  * @return {Object} An object containing the `currentPost` variable and
- *                 `getPostLinkProps` and `goBack` functions.
+ *                 `onSelectEntityRecord` and `goBack` functions.
  */
-export default function usePostHistory( initialPostId, initialPostType ) {
+export default function useLoadEntityRecord( initialPostId, initialPostType ) {
 	const [ postHistory, dispatch ] = useReducer(
 		( historyState, { type, post } ) => {
 			if ( type === 'push' ) {
@@ -42,27 +41,13 @@ export default function usePostHistory( initialPostId, initialPostType ) {
 		};
 	}, [ initialPostType, initialPostId ] );
 
-	const getPostLinkProps = useCallback( ( params ) => {
-		const currentArgs = getQueryArgs( window.location.href );
-		const currentUrlWithoutArgs = removeQueryArgs(
-			window.location.href,
-			...Object.keys( currentArgs )
-		);
-
-		const newUrl = addQueryArgs( currentUrlWithoutArgs, {
-			post: params.postId,
-			action: 'edit',
-		} );
-
-		return {
-			href: newUrl,
-			onClick: ( event ) => {
-				event?.preventDefault();
-				dispatch( {
-					type: 'push',
-					post: { postId: params.postId, postType: params.postType },
-				} );
-			},
+	const onSelectEntityRecord = useCallback( ( params ) => {
+		return ( event ) => {
+			event?.preventDefault();
+			dispatch( {
+				type: 'push',
+				post: { postId: params.postId, postType: params.postType },
+			} );
 		};
 	}, [] );
 
@@ -76,6 +61,7 @@ export default function usePostHistory( initialPostId, initialPostType ) {
 		currentPost,
 		getPostLinkProps,
 		initialPost,
+		onSelectEntityRecord,
 		goBack: postHistory.length > 1 ? goBack : undefined,
 	};
 }
diff --git a/packages/edit-site/src/components/block-editor/use-load-entity-record.js b/packages/edit-site/src/components/block-editor/use-load-entity-record.js
new file mode 100644
index 00000000000000..de7f9d35e8e4b7
--- /dev/null
+++ b/packages/edit-site/src/components/block-editor/use-load-entity-record.js
@@ -0,0 +1,29 @@
+/**
+ * WordPress dependencies
+ */
+import { privateApis as routerPrivateApis } from '@wordpress/router';
+import { useCallback } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const { useHistory } = unlock( routerPrivateApis );
+
+export default function useLoadEntityRecord() {
+	const history = useHistory();
+
+	const onSelectEntityRecord = useCallback(
+		( params ) => {
+			return ( event ) => {
+				event?.preventDefault();
+
+				history.push( { ...params, focusMode: true, canvas: 'edit' } );
+			};
+		},
+		[ history ]
+	);
+
+	return onSelectEntityRecord;
+}
diff --git a/packages/edit-site/src/components/block-editor/use-post-link-props.js b/packages/edit-site/src/components/block-editor/use-post-link-props.js
deleted file mode 100644
index 3fee876ceb96d5..00000000000000
--- a/packages/edit-site/src/components/block-editor/use-post-link-props.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { privateApis as routerPrivateApis } from '@wordpress/router';
-
-/**
- * Internal dependencies
- */
-import { unlock } from '../../lock-unlock';
-import { getPostLinkProps } from '../routes/link';
-
-const { useHistory } = unlock( routerPrivateApis );
-
-export function usePostLinkProps() {
-	const history = useHistory();
-
-	return ( params, state ) => {
-		return getPostLinkProps(
-			history,
-			{ ...params, focusMode: true, canvas: 'edit' },
-			state
-		);
-	};
-}
diff --git a/packages/edit-site/src/components/block-editor/use-site-editor-settings.js b/packages/edit-site/src/components/block-editor/use-site-editor-settings.js
index 77e9e69f02a984..f47a0f2a90ee19 100644
--- a/packages/edit-site/src/components/block-editor/use-site-editor-settings.js
+++ b/packages/edit-site/src/components/block-editor/use-site-editor-settings.js
@@ -12,7 +12,7 @@ import { privateApis as routerPrivateApis } from '@wordpress/router';
  */
 import { store as editSiteStore } from '../../store';
 import { unlock } from '../../lock-unlock';
-import { usePostLinkProps } from './use-post-link-props';
+import useLoadEntityRecord from './use-load-entity-record';
 import { FOCUSABLE_ENTITIES } from '../../utils/constants';
 
 const { useBlockEditorSettings } = unlock( editorPrivateApis );
@@ -103,7 +103,7 @@ function useGoBack() {
 }
 
 export function useSpecificEditorSettings() {
-	const getPostLinkProps = usePostLinkProps();
+	const onSelectEntityRecord = useLoadEntityRecord();
 	const { templateSlug, canvasMode, settings, postWithTemplate } = useSelect(
 		( select ) => {
 			const {
@@ -142,7 +142,7 @@ export function useSpecificEditorSettings() {
 			supportsTemplateMode: true,
 			focusMode: canvasMode !== 'view',
 			defaultRenderingMode,
-			getPostLinkProps,
+			onSelectEntityRecord,
 			goBack,
 			// I wonder if they should be set in the post editor too
 			__experimentalArchiveTitleTypeLabel: archiveLabels.archiveTypeLabel,
@@ -152,7 +152,7 @@ export function useSpecificEditorSettings() {
 		settings,
 		canvasMode,
 		defaultRenderingMode,
-		getPostLinkProps,
+		onSelectEntityRecord,
 		goBack,
 		archiveLabels.archiveTypeLabel,
 		archiveLabels.archiveNameLabel,
diff --git a/packages/edit-site/src/components/routes/link.js b/packages/edit-site/src/components/routes/link.js
index 1e358328942e68..4423eeeb1d6e8d 100644
--- a/packages/edit-site/src/components/routes/link.js
+++ b/packages/edit-site/src/components/routes/link.js
@@ -15,12 +15,8 @@ import {
 
 const { useHistory } = unlock( routerPrivateApis );
 
-export function getPostLinkProps(
-	history,
-	params = {},
-	state,
-	shouldReplace = false
-) {
+export function useLink( params, state, shouldReplace = false ) {
+	const history = useHistory();
 	function onClick( event ) {
 		event?.preventDefault();
 
@@ -52,11 +48,6 @@ export function getPostLinkProps(
 	};
 }
 
-export function useLink( params, state, shouldReplace ) {
-	const history = useHistory();
-	return getPostLinkProps( history, params, state, shouldReplace );
-}
-
 export default function Link( {
 	params = {},
 	state,
diff --git a/packages/editor/src/components/editor-canvas/edit-template-blocks-notification.js b/packages/editor/src/components/editor-canvas/edit-template-blocks-notification.js
index acf13c9025bce3..86cb3b5c4e5dd7 100644
--- a/packages/editor/src/components/editor-canvas/edit-template-blocks-notification.js
+++ b/packages/editor/src/components/editor-canvas/edit-template-blocks-notification.js
@@ -68,7 +68,7 @@ export default function EditTemplateBlocksNotification( { contentRef } ) {
 					actions: [
 						{
 							label: __( 'Edit template' ),
-							onClick: () => editTemplate.onClick(),
+							onClick: () => editTemplate(),
 						},
 					],
 				}
@@ -101,7 +101,7 @@ export default function EditTemplateBlocksNotification( { contentRef } ) {
 			confirmButtonText={ __( 'Edit template' ) }
 			onConfirm={ () => {
 				setIsDialogOpen( false );
-				editTemplate.onClick();
+				editTemplate();
 			} }
 			onCancel={ () => setIsDialogOpen( false ) }
 		>
diff --git a/packages/editor/src/components/post-template/block-theme.js b/packages/editor/src/components/post-template/block-theme.js
index a6a102e8470187..6236986883eed6 100644
--- a/packages/editor/src/components/post-template/block-theme.js
+++ b/packages/editor/src/components/post-template/block-theme.js
@@ -24,18 +24,22 @@ const POPOVER_PROPS = {
 };
 
 export default function BlockThemeControl( { id } ) {
-	const { isTemplateHidden, getPostLinkProps, getEditorSettings, hasGoBack } =
-		useSelect( ( select ) => {
-			const { getRenderingMode, getEditorSettings: _getEditorSettings } =
-				unlock( select( editorStore ) );
-			const editorSettings = _getEditorSettings();
-			return {
-				isTemplateHidden: getRenderingMode() === 'post-only',
-				getPostLinkProps: editorSettings.getPostLinkProps,
-				getEditorSettings: _getEditorSettings,
-				hasGoBack: editorSettings.hasOwnProperty( 'goBack' ),
-			};
-		}, [] );
+	const {
+		isTemplateHidden,
+		onSelectEntityRecord,
+		getEditorSettings,
+		hasGoBack,
+	} = useSelect( ( select ) => {
+		const { getRenderingMode, getEditorSettings: _getEditorSettings } =
+			unlock( select( editorStore ) );
+		const editorSettings = _getEditorSettings();
+		return {
+			isTemplateHidden: getRenderingMode() === 'post-only',
+			onSelectEntityRecord: editorSettings.onSelectEntityRecord,
+			getEditorSettings: _getEditorSettings,
+			hasGoBack: editorSettings.hasOwnProperty( 'goBack' ),
+		};
+	}, [] );
 
 	const { editedRecord: template, hasResolved } = useEntityRecord(
 		'postType',
@@ -44,16 +48,16 @@ export default function BlockThemeControl( { id } ) {
 	);
 	const { createSuccessNotice } = useDispatch( noticesStore );
 	const { setRenderingMode } = useDispatch( editorStore );
-	const editTemplate = getPostLinkProps
-		? getPostLinkProps( {
-				postId: template.id,
-				postType: 'wp_template',
-		  } )
-		: {};
 
 	if ( ! hasResolved ) {
 		return null;
 	}
+
+	const selectTemplate = onSelectEntityRecord( {
+		postId: template.id,
+		postType: 'wp_template',
+	} );
+
 	// The site editor does not have a `goBack` setting as it uses its own routing
 	// and assigns its own backlink to focusMode pages.
 	const notificationAction = hasGoBack
@@ -80,7 +84,7 @@ export default function BlockThemeControl( { id } ) {
 					<MenuGroup>
 						<MenuItem
 							onClick={ ( event ) => {
-								editTemplate.onClick( event );
+								selectTemplate( event );
 								onClose();
 								createSuccessNotice(
 									__(
@@ -95,6 +99,7 @@ export default function BlockThemeControl( { id } ) {
 						>
 							{ __( 'Edit template' ) }
 						</MenuItem>
+
 						<SwapTemplateButton onClick={ onClose } />
 						<ResetDefaultTemplate onClick={ onClose } />
 						<CreateNewTemplate onClick={ onClose } />
diff --git a/packages/editor/src/components/post-template/classic-theme.js b/packages/editor/src/components/post-template/classic-theme.js
index 3d731a500b9d17..7488e9d961eb7e 100644
--- a/packages/editor/src/components/post-template/classic-theme.js
+++ b/packages/editor/src/components/post-template/classic-theme.js
@@ -64,7 +64,7 @@ function PostTemplateDropdownContent( { onClose } ) {
 		canCreate,
 		canEdit,
 		currentTemplateId,
-		getPostLinkProps,
+		onSelectEntityRecord,
 		getEditorSettings,
 	} = useSelect(
 		( select ) => {
@@ -94,20 +94,19 @@ function PostTemplateDropdownContent( { onClose } ) {
 					editorSettings.supportsTemplateMode &&
 					!! _currentTemplateId,
 				currentTemplateId: _currentTemplateId,
-				getPostLinkProps: editorSettings.getPostLinkProps,
+				onSelectEntityRecord: editorSettings.onSelectEntityRecord,
 				getEditorSettings: select( editorStore ).getEditorSettings,
 			};
 		},
 		[ allowSwitchingTemplate ]
 	);
 
-	const editTemplate =
-		getPostLinkProps && currentTemplateId
-			? getPostLinkProps( {
-					postId: currentTemplateId,
-					postType: 'wp_template',
-			  } )
-			: {};
+	const selectTemplate = currentTemplateId
+		? onSelectEntityRecord( {
+				postId: currentTemplateId,
+				postType: 'wp_template',
+		  } )
+		: undefined;
 
 	const options = useMemo(
 		() =>
@@ -168,12 +167,12 @@ function PostTemplateDropdownContent( { onClose } ) {
 					}
 				/>
 			) }
-			{ canEdit && (
+			{ canEdit && selectTemplate && (
 				<p>
 					<Button
 						variant="link"
 						onClick={ () => {
-							editTemplate.onClick();
+							selectTemplate();
 							onClose();
 							createSuccessNotice(
 								__(
diff --git a/packages/editor/src/components/post-template/create-new-template-modal.js b/packages/editor/src/components/post-template/create-new-template-modal.js
index f11aa612bb2419..c4512ad0a231d2 100644
--- a/packages/editor/src/components/post-template/create-new-template-modal.js
+++ b/packages/editor/src/components/post-template/create-new-template-modal.js
@@ -23,13 +23,13 @@ import { store as editorStore } from '../../store';
 const DEFAULT_TITLE = __( 'Custom Template' );
 
 export default function CreateNewTemplateModal( { onClose } ) {
-	const { defaultBlockTemplate, getPostLinkProps } = useSelect(
+	const { defaultBlockTemplate, onSelectEntityRecord } = useSelect(
 		( select ) => {
 			const { getEditorSettings, getCurrentTemplateId } =
 				select( editorStore );
 			return {
 				defaultBlockTemplate: getEditorSettings().defaultBlockTemplate,
-				getPostLinkProps: getEditorSettings().getPostLinkProps,
+				onSelectEntityRecord: getEditorSettings().onSelectEntityRecord,
 				getTemplateId: getCurrentTemplateId,
 			};
 		}
@@ -97,13 +97,11 @@ export default function CreateNewTemplateModal( { onClose } ) {
 		} );
 
 		setIsBusy( false );
-		const editTemplate = getPostLinkProps
-			? getPostLinkProps( {
-					postId: newTemplate.id,
-					postType: 'wp_template',
-			  } )
-			: {};
-		editTemplate.onClick();
+		const selectTemplate = onSelectEntityRecord( {
+			postId: newTemplate.id,
+			postType: 'wp_template',
+		} );
+		selectTemplate();
 		cancel();
 	};
 
diff --git a/packages/editor/src/components/provider/use-block-editor-settings.js b/packages/editor/src/components/provider/use-block-editor-settings.js
index 78c9b1a56e83a7..dd1aa2bc35c83a 100644
--- a/packages/editor/src/components/provider/use-block-editor-settings.js
+++ b/packages/editor/src/components/provider/use-block-editor-settings.js
@@ -51,7 +51,7 @@ const BLOCK_EDITOR_SETTINGS = [
 	'fontSizes',
 	'gradients',
 	'generateAnchors',
-	'getPostLinkProps',
+	'onSelectEntityRecord',
 	'hasInlineToolbar',
 	'imageDefaultSize',
 	'imageDimensions',

From 8c4a10a1a6b5455ebe564bcc04a09d02b69a3ea6 Mon Sep 17 00:00:00 2001
From: Glen Davies <glen.davies@automattic.com>
Date: Tue, 30 Jan 2024 12:14:03 +1300
Subject: [PATCH 02/11] Check that setting defined in pattern block

---
 packages/block-library/src/block/edit.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/block-library/src/block/edit.js b/packages/block-library/src/block/edit.js
index 6526317d08308f..37cd25591884d1 100644
--- a/packages/block-library/src/block/edit.js
+++ b/packages/block-library/src/block/edit.js
@@ -237,10 +237,12 @@ export default function ReusableBlockEdit( {
 		[ patternClientId, ref ]
 	);
 
-	const editOriginal = onSelectEntityRecord( {
-		postId: ref,
-		postType: 'wp_block',
-	} );
+	const editOriginal = onSelectEntityRecord
+		? onSelectEntityRecord( {
+				postId: ref,
+				postType: 'wp_block',
+		  } )
+		: undefined;
 
 	// Sync the editing mode of the pattern block with the inner blocks.
 	useEffect( () => {

From c5782bfa835caf44e0b6f8b2988d03ddcf74492f Mon Sep 17 00:00:00 2001
From: Glen Davies <glen.davies@automattic.com>
Date: Wed, 7 Feb 2024 13:22:29 +1300
Subject: [PATCH 03/11] Rename to onNavigateToEntityRecord

---
 packages/block-library/src/block/edit.js      |  9 +++--
 .../edit-post/src/components/header/index.js  |  4 +-
 .../edit-post/src/components/layout/index.js  |  2 +-
 packages/edit-post/src/editor.js              | 18 +++++----
 ...rd.js => use-navigate-to-entity-record.js} | 19 +++++----
 ...rd.js => use-navigate-to-entity-record.js} |  6 +--
 .../block-editor/use-site-editor-settings.js  |  8 ++--
 .../src/components/document-bar/index.js      | 40 +++++++++++--------
 .../src/components/editor-canvas/index.js     |  3 +-
 .../components/post-template/block-theme.js   | 15 ++++---
 .../components/post-template/classic-theme.js |  9 +++--
 .../create-new-template-modal.js              |  7 ++--
 .../provider/use-block-editor-settings.js     |  2 +-
 13 files changed, 83 insertions(+), 59 deletions(-)
 rename packages/edit-post/src/hooks/{use-load-entity-record.js => use-navigate-to-entity-record.js} (77%)
 rename packages/edit-site/src/components/block-editor/{use-load-entity-record.js => use-navigate-to-entity-record.js} (78%)

diff --git a/packages/block-library/src/block/edit.js b/packages/block-library/src/block/edit.js
index 37cd25591884d1..2c3148bc56f78e 100644
--- a/packages/block-library/src/block/edit.js
+++ b/packages/block-library/src/block/edit.js
@@ -212,7 +212,7 @@ export default function ReusableBlockEdit( {
 		innerBlocks,
 		userCanEdit,
 		getBlockEditingMode,
-		onSelectEntityRecord,
+		onNavigateToEntityRecord,
 		editingMode,
 	} = useSelect(
 		( select ) => {
@@ -230,15 +230,16 @@ export default function ReusableBlockEdit( {
 				innerBlocks: blocks,
 				userCanEdit: canEdit,
 				getBlockEditingMode: _getBlockEditingMode,
-				onSelectEntityRecord: getSettings().onSelectEntityRecord,
+				onNavigateToEntityRecord:
+					getSettings().onNavigateToEntityRecord,
 				editingMode: _getBlockEditingMode( patternClientId ),
 			};
 		},
 		[ patternClientId, ref ]
 	);
 
-	const editOriginal = onSelectEntityRecord
-		? onSelectEntityRecord( {
+	const editOriginal = onNavigateToEntityRecord
+		? onNavigateToEntityRecord( {
 				postId: ref,
 				postType: 'wp_block',
 		  } )
diff --git a/packages/edit-post/src/components/header/index.js b/packages/edit-post/src/components/header/index.js
index 152ccd0e1c390a..b573ac43fe5fa7 100644
--- a/packages/edit-post/src/components/header/index.js
+++ b/packages/edit-post/src/components/header/index.js
@@ -76,7 +76,9 @@ function Header( { setEntitiesSavedStatesCallback, initialPost } ) {
 			hasBlockSelection:
 				!! select( blockEditorStore ).getBlockSelectionStart(),
 			hasActiveMetaboxes: select( editPostStore ).hasMetaBoxes(),
-			hasHistory: !! select( editorStore ).getEditorSettings().goBack,
+			hasHistory:
+				!! select( editorStore ).getEditorSettings()
+					.onNavigateToPreviousEntityRecord,
 			isPublishSidebarOpened:
 				select( editPostStore ).isPublishSidebarOpened(),
 			hasFixedToolbar: getPreference( 'core', 'fixedToolbar' ),
diff --git a/packages/edit-post/src/components/layout/index.js b/packages/edit-post/src/components/layout/index.js
index 55355999d3781d..9dd7314357e043 100644
--- a/packages/edit-post/src/components/layout/index.js
+++ b/packages/edit-post/src/components/layout/index.js
@@ -196,7 +196,7 @@ function Layout( { initialPost } ) {
 			documentLabel: postTypeLabel || _x( 'Document', 'noun' ),
 			hasBlockSelected:
 				!! select( blockEditorStore ).getBlockSelectionStart(),
-			hasHistory: !! getEditorSettings().goBack,
+			hasHistory: !! getEditorSettings().onNavigateToPreviousEntityRecord,
 		};
 	}, [] );
 
diff --git a/packages/edit-post/src/editor.js b/packages/edit-post/src/editor.js
index 4fe88fc3a0ef28..5410cbfaeb816c 100644
--- a/packages/edit-post/src/editor.js
+++ b/packages/edit-post/src/editor.js
@@ -21,7 +21,7 @@ import Layout from './components/layout';
 import EditorInitialization from './components/editor-initialization';
 import { store as editPostStore } from './store';
 import { unlock } from './lock-unlock';
-import useLoadEntityRecord from './hooks/use-load-entity-record';
+import useNavigateToEntityRecord from './hooks/use-navigate-to-entity-record';
 
 const { ExperimentalEditorProvider } = unlock( editorPrivateApis );
 
@@ -32,8 +32,12 @@ function Editor( {
 	initialEdits,
 	...props
 } ) {
-	const { initialPost, currentPost, onSelectEntityRecord, goBack } =
-		useLoadEntityRecord( initialPostId, initialPostType );
+	const {
+		initialPost,
+		currentPost,
+		onNavigateToEntityRecord,
+		onNavigateToPreviousEntityRecord,
+	} = useNavigateToEntityRecord( initialPostId, initialPostType );
 
 	const { hasInlineToolbar, post, preferredStyleVariations, template } =
 		useSelect(
@@ -81,8 +85,8 @@ function Editor( {
 	const editorSettings = useMemo(
 		() => ( {
 			...settings,
-			onSelectEntityRecord,
-			goBack,
+			onNavigateToEntityRecord,
+			onNavigateToPreviousEntityRecord,
 			defaultRenderingMode,
 			__experimentalPreferredStyleVariations: {
 				value: preferredStyleVariations,
@@ -95,8 +99,8 @@ function Editor( {
 			hasInlineToolbar,
 			preferredStyleVariations,
 			updatePreferredStyleVariations,
-			onSelectEntityRecord,
-			goBack,
+			onNavigateToEntityRecord,
+			onNavigateToPreviousEntityRecord,
 			defaultRenderingMode,
 		]
 	);
diff --git a/packages/edit-post/src/hooks/use-load-entity-record.js b/packages/edit-post/src/hooks/use-navigate-to-entity-record.js
similarity index 77%
rename from packages/edit-post/src/hooks/use-load-entity-record.js
rename to packages/edit-post/src/hooks/use-navigate-to-entity-record.js
index 5804fd7d1d38b6..f26fb2a2c4a092 100644
--- a/packages/edit-post/src/hooks/use-load-entity-record.js
+++ b/packages/edit-post/src/hooks/use-navigate-to-entity-record.js
@@ -15,9 +15,12 @@ import { useCallback, useReducer, useMemo } from '@wordpress/element';
  * @param {string} initialPostType The post type of the post when the editor loaded.
  *
  * @return {Object} An object containing the `currentPost` variable and
- *                 `onSelectEntityRecord` and `goBack` functions.
+ *                 `onNavigateToEntityRecord` and `onNavigateToPreviousEntityRecord` functions.
  */
-export default function useLoadEntityRecord( initialPostId, initialPostType ) {
+export default function useNavigateToEntityRecord(
+	initialPostId,
+	initialPostType
+) {
 	const [ postHistory, dispatch ] = useReducer(
 		( historyState, { type, post } ) => {
 			if ( type === 'push' ) {
@@ -41,7 +44,7 @@ export default function useLoadEntityRecord( initialPostId, initialPostType ) {
 		};
 	}, [ initialPostType, initialPostId ] );
 
-	const onSelectEntityRecord = useCallback( ( params ) => {
+	const onNavigateToEntityRecord = useCallback( ( params ) => {
 		return ( event ) => {
 			event?.preventDefault();
 			dispatch( {
@@ -51,7 +54,7 @@ export default function useLoadEntityRecord( initialPostId, initialPostType ) {
 		};
 	}, [] );
 
-	const goBack = useCallback( () => {
+	const onNavigateToPreviousEntityRecord = useCallback( () => {
 		dispatch( { type: 'pop' } );
 	}, [] );
 
@@ -59,9 +62,11 @@ export default function useLoadEntityRecord( initialPostId, initialPostType ) {
 
 	return {
 		currentPost,
-		getPostLinkProps,
 		initialPost,
-		onSelectEntityRecord,
-		goBack: postHistory.length > 1 ? goBack : undefined,
+		onNavigateToEntityRecord,
+		onNavigateToPreviousEntityRecord:
+			postHistory.length > 1
+				? onNavigateToPreviousEntityRecord
+				: undefined,
 	};
 }
diff --git a/packages/edit-site/src/components/block-editor/use-load-entity-record.js b/packages/edit-site/src/components/block-editor/use-navigate-to-entity-record.js
similarity index 78%
rename from packages/edit-site/src/components/block-editor/use-load-entity-record.js
rename to packages/edit-site/src/components/block-editor/use-navigate-to-entity-record.js
index de7f9d35e8e4b7..64ecc81aa1b801 100644
--- a/packages/edit-site/src/components/block-editor/use-load-entity-record.js
+++ b/packages/edit-site/src/components/block-editor/use-navigate-to-entity-record.js
@@ -11,10 +11,10 @@ import { unlock } from '../../lock-unlock';
 
 const { useHistory } = unlock( routerPrivateApis );
 
-export default function useLoadEntityRecord() {
+export default function useNavigateToEntityRecord() {
 	const history = useHistory();
 
-	const onSelectEntityRecord = useCallback(
+	const onNavigateToEntityRecord = useCallback(
 		( params ) => {
 			return ( event ) => {
 				event?.preventDefault();
@@ -25,5 +25,5 @@ export default function useLoadEntityRecord() {
 		[ history ]
 	);
 
-	return onSelectEntityRecord;
+	return onNavigateToEntityRecord;
 }
diff --git a/packages/edit-site/src/components/block-editor/use-site-editor-settings.js b/packages/edit-site/src/components/block-editor/use-site-editor-settings.js
index f47a0f2a90ee19..e416749cf292db 100644
--- a/packages/edit-site/src/components/block-editor/use-site-editor-settings.js
+++ b/packages/edit-site/src/components/block-editor/use-site-editor-settings.js
@@ -12,7 +12,7 @@ import { privateApis as routerPrivateApis } from '@wordpress/router';
  */
 import { store as editSiteStore } from '../../store';
 import { unlock } from '../../lock-unlock';
-import useLoadEntityRecord from './use-load-entity-record';
+import useNavigateToEntityRecord from './use-navigate-to-entity-record';
 import { FOCUSABLE_ENTITIES } from '../../utils/constants';
 
 const { useBlockEditorSettings } = unlock( editorPrivateApis );
@@ -103,7 +103,7 @@ function useGoBack() {
 }
 
 export function useSpecificEditorSettings() {
-	const onSelectEntityRecord = useLoadEntityRecord();
+	const onNavigateToEntityRecord = useNavigateToEntityRecord();
 	const { templateSlug, canvasMode, settings, postWithTemplate } = useSelect(
 		( select ) => {
 			const {
@@ -142,7 +142,7 @@ export function useSpecificEditorSettings() {
 			supportsTemplateMode: true,
 			focusMode: canvasMode !== 'view',
 			defaultRenderingMode,
-			onSelectEntityRecord,
+			onNavigateToEntityRecord,
 			goBack,
 			// I wonder if they should be set in the post editor too
 			__experimentalArchiveTitleTypeLabel: archiveLabels.archiveTypeLabel,
@@ -152,7 +152,7 @@ export function useSpecificEditorSettings() {
 		settings,
 		canvasMode,
 		defaultRenderingMode,
-		onSelectEntityRecord,
+		onNavigateToEntityRecord,
 		goBack,
 		archiveLabels.archiveTypeLabel,
 		archiveLabels.archiveNameLabel,
diff --git a/packages/editor/src/components/document-bar/index.js b/packages/editor/src/components/document-bar/index.js
index 97e9c8a2cf779c..3f1d8bfe2a6ec6 100644
--- a/packages/editor/src/components/document-bar/index.js
+++ b/packages/editor/src/components/document-bar/index.js
@@ -48,24 +48,28 @@ const icons = {
 };
 
 export default function DocumentBar() {
-	const { postType, postId, goBack } = useSelect( ( select ) => {
-		const {
-			getCurrentPostId,
-			getCurrentPostType,
-			getEditorSettings: getSettings,
-		} = select( editorStore );
-		const back = getSettings().goBack;
-		return {
-			postType: getCurrentPostType(),
-			postId: getCurrentPostId(),
-			goBack: typeof back === 'function' ? back : undefined,
-			getEditorSettings: getSettings,
-		};
-	}, [] );
+	const { postType, postId, onNavigateToPreviousEntityRecord } = useSelect(
+		( select ) => {
+			const {
+				getCurrentPostId,
+				getCurrentPostType,
+				getEditorSettings: getSettings,
+			} = select( editorStore );
+			const back = getSettings().onNavigateToPreviousEntityRecord;
+			return {
+				postType: getCurrentPostType(),
+				postId: getCurrentPostId(),
+				onNavigateToPreviousEntityRecord:
+					typeof back === 'function' ? back : undefined,
+				getEditorSettings: getSettings,
+			};
+		},
+		[]
+	);
 
 	const handleOnBack = () => {
-		if ( goBack ) {
-			goBack();
+		if ( onNavigateToPreviousEntityRecord ) {
+			onNavigateToPreviousEntityRecord();
 		}
 	};
 
@@ -73,7 +77,9 @@ export default function DocumentBar() {
 		<BaseDocumentActions
 			postType={ postType }
 			postId={ postId }
-			onBack={ goBack ? handleOnBack : undefined }
+			onBack={
+				onNavigateToPreviousEntityRecord ? handleOnBack : undefined
+			}
 		/>
 	);
 }
diff --git a/packages/editor/src/components/editor-canvas/index.js b/packages/editor/src/components/editor-canvas/index.js
index 5e6fad9f4eb627..489694bb8adfd5 100644
--- a/packages/editor/src/components/editor-canvas/index.js
+++ b/packages/editor/src/components/editor-canvas/index.js
@@ -139,7 +139,8 @@ function EditorCanvas( {
 			wrapperBlockName: _wrapperBlockName,
 			wrapperUniqueId: getCurrentPostId(),
 			deviceType: getDeviceType(),
-			showEditorPadding: !! editorSettings.goBack,
+			showEditorPadding:
+				!! editorSettings.onNavigateToPreviousEntityRecord,
 		};
 	}, [] );
 	const { isCleanNewPost } = useSelect( editorStore );
diff --git a/packages/editor/src/components/post-template/block-theme.js b/packages/editor/src/components/post-template/block-theme.js
index 6236986883eed6..4e0e821b9b0359 100644
--- a/packages/editor/src/components/post-template/block-theme.js
+++ b/packages/editor/src/components/post-template/block-theme.js
@@ -26,7 +26,7 @@ const POPOVER_PROPS = {
 export default function BlockThemeControl( { id } ) {
 	const {
 		isTemplateHidden,
-		onSelectEntityRecord,
+		onNavigateToEntityRecord,
 		getEditorSettings,
 		hasGoBack,
 	} = useSelect( ( select ) => {
@@ -35,9 +35,11 @@ export default function BlockThemeControl( { id } ) {
 		const editorSettings = _getEditorSettings();
 		return {
 			isTemplateHidden: getRenderingMode() === 'post-only',
-			onSelectEntityRecord: editorSettings.onSelectEntityRecord,
+			onNavigateToEntityRecord: editorSettings.onNavigateToEntityRecord,
 			getEditorSettings: _getEditorSettings,
-			hasGoBack: editorSettings.hasOwnProperty( 'goBack' ),
+			hasGoBack: editorSettings.hasOwnProperty(
+				'onNavigateToPreviousEntityRecord'
+			),
 		};
 	}, [] );
 
@@ -53,18 +55,19 @@ export default function BlockThemeControl( { id } ) {
 		return null;
 	}
 
-	const selectTemplate = onSelectEntityRecord( {
+	const selectTemplate = onNavigateToEntityRecord( {
 		postId: template.id,
 		postType: 'wp_template',
 	} );
 
-	// The site editor does not have a `goBack` setting as it uses its own routing
+	// The site editor does not have a `onNavigateToPreviousEntityRecord` setting as it uses its own routing
 	// and assigns its own backlink to focusMode pages.
 	const notificationAction = hasGoBack
 		? [
 				{
 					label: __( 'Go back' ),
-					onClick: () => getEditorSettings().goBack(),
+					onClick: () =>
+						getEditorSettings().onNavigateToPreviousEntityRecord(),
 				},
 		  ]
 		: undefined;
diff --git a/packages/editor/src/components/post-template/classic-theme.js b/packages/editor/src/components/post-template/classic-theme.js
index 7488e9d961eb7e..3d8bc97b57c7ed 100644
--- a/packages/editor/src/components/post-template/classic-theme.js
+++ b/packages/editor/src/components/post-template/classic-theme.js
@@ -64,7 +64,7 @@ function PostTemplateDropdownContent( { onClose } ) {
 		canCreate,
 		canEdit,
 		currentTemplateId,
-		onSelectEntityRecord,
+		onNavigateToEntityRecord,
 		getEditorSettings,
 	} = useSelect(
 		( select ) => {
@@ -94,7 +94,8 @@ function PostTemplateDropdownContent( { onClose } ) {
 					editorSettings.supportsTemplateMode &&
 					!! _currentTemplateId,
 				currentTemplateId: _currentTemplateId,
-				onSelectEntityRecord: editorSettings.onSelectEntityRecord,
+				onNavigateToEntityRecord:
+					editorSettings.onNavigateToEntityRecord,
 				getEditorSettings: select( editorStore ).getEditorSettings,
 			};
 		},
@@ -102,7 +103,7 @@ function PostTemplateDropdownContent( { onClose } ) {
 	);
 
 	const selectTemplate = currentTemplateId
-		? onSelectEntityRecord( {
+		? onNavigateToEntityRecord( {
 				postId: currentTemplateId,
 				postType: 'wp_template',
 		  } )
@@ -184,7 +185,7 @@ function PostTemplateDropdownContent( { onClose } ) {
 										{
 											label: __( 'Go back' ),
 											onClick: () =>
-												getEditorSettings().goBack(),
+												getEditorSettings().onNavigateToPreviousEntityRecord(),
 										},
 									],
 								}
diff --git a/packages/editor/src/components/post-template/create-new-template-modal.js b/packages/editor/src/components/post-template/create-new-template-modal.js
index c4512ad0a231d2..8c2bd832fbae88 100644
--- a/packages/editor/src/components/post-template/create-new-template-modal.js
+++ b/packages/editor/src/components/post-template/create-new-template-modal.js
@@ -23,13 +23,14 @@ import { store as editorStore } from '../../store';
 const DEFAULT_TITLE = __( 'Custom Template' );
 
 export default function CreateNewTemplateModal( { onClose } ) {
-	const { defaultBlockTemplate, onSelectEntityRecord } = useSelect(
+	const { defaultBlockTemplate, onNavigateToEntityRecord } = useSelect(
 		( select ) => {
 			const { getEditorSettings, getCurrentTemplateId } =
 				select( editorStore );
 			return {
 				defaultBlockTemplate: getEditorSettings().defaultBlockTemplate,
-				onSelectEntityRecord: getEditorSettings().onSelectEntityRecord,
+				onNavigateToEntityRecord:
+					getEditorSettings().onNavigateToEntityRecord,
 				getTemplateId: getCurrentTemplateId,
 			};
 		}
@@ -97,7 +98,7 @@ export default function CreateNewTemplateModal( { onClose } ) {
 		} );
 
 		setIsBusy( false );
-		const selectTemplate = onSelectEntityRecord( {
+		const selectTemplate = onNavigateToEntityRecord( {
 			postId: newTemplate.id,
 			postType: 'wp_template',
 		} );
diff --git a/packages/editor/src/components/provider/use-block-editor-settings.js b/packages/editor/src/components/provider/use-block-editor-settings.js
index dd1aa2bc35c83a..164f925743522c 100644
--- a/packages/editor/src/components/provider/use-block-editor-settings.js
+++ b/packages/editor/src/components/provider/use-block-editor-settings.js
@@ -51,7 +51,7 @@ const BLOCK_EDITOR_SETTINGS = [
 	'fontSizes',
 	'gradients',
 	'generateAnchors',
-	'onSelectEntityRecord',
+	'onNavigateToEntityRecord',
 	'hasInlineToolbar',
 	'imageDefaultSize',
 	'imageDimensions',

From 4fd1e4dff781e37a05b67fc4b82323a4296e1e7f Mon Sep 17 00:00:00 2001
From: Glen Davies <glen.davies@automattic.com>
Date: Wed, 7 Feb 2024 13:24:38 +1300
Subject: [PATCH 04/11] Remove nested callback

---
 packages/block-library/src/block/edit.js         | 16 ++++++----------
 .../src/hooks/use-navigate-to-entity-record.js   | 11 ++++-------
 .../use-navigate-to-entity-record.js             |  6 +-----
 .../src/components/post-template/block-theme.js  | 12 +++++-------
 .../components/post-template/classic-theme.js    | 14 +++++---------
 .../post-template/create-new-template-modal.js   |  3 +--
 6 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/packages/block-library/src/block/edit.js b/packages/block-library/src/block/edit.js
index 2c3148bc56f78e..a17a59c3e8976a 100644
--- a/packages/block-library/src/block/edit.js
+++ b/packages/block-library/src/block/edit.js
@@ -238,13 +238,6 @@ export default function ReusableBlockEdit( {
 		[ patternClientId, ref ]
 	);
 
-	const editOriginal = onNavigateToEntityRecord
-		? onNavigateToEntityRecord( {
-				postId: ref,
-				postType: 'wp_block',
-		  } )
-		: undefined;
-
 	// Sync the editing mode of the pattern block with the inner blocks.
 	useEffect( () => {
 		setBlockEditMode(
@@ -343,8 +336,11 @@ export default function ReusableBlockEdit( {
 		}, blockEditorStore );
 	}, [ syncDerivedUpdates, patternClientId, registry, setAttributes ] );
 
-	const handleEditOriginal = ( event ) => {
-		editOriginal( event );
+	const handleEditOriginal = () => {
+		onNavigateToEntityRecord( {
+			postId: ref,
+			postType: 'wp_block',
+		} );
 	};
 
 	const resetContent = () => {
@@ -381,7 +377,7 @@ export default function ReusableBlockEdit( {
 
 	return (
 		<RecursionProvider uniqueId={ ref }>
-			{ userCanEdit && editOriginal && (
+			{ userCanEdit && onNavigateToEntityRecord && (
 				<BlockControls>
 					<ToolbarGroup>
 						<ToolbarButton onClick={ handleEditOriginal }>
diff --git a/packages/edit-post/src/hooks/use-navigate-to-entity-record.js b/packages/edit-post/src/hooks/use-navigate-to-entity-record.js
index f26fb2a2c4a092..e891e7a3c5e6b0 100644
--- a/packages/edit-post/src/hooks/use-navigate-to-entity-record.js
+++ b/packages/edit-post/src/hooks/use-navigate-to-entity-record.js
@@ -45,13 +45,10 @@ export default function useNavigateToEntityRecord(
 	}, [ initialPostType, initialPostId ] );
 
 	const onNavigateToEntityRecord = useCallback( ( params ) => {
-		return ( event ) => {
-			event?.preventDefault();
-			dispatch( {
-				type: 'push',
-				post: { postId: params.postId, postType: params.postType },
-			} );
-		};
+		dispatch( {
+			type: 'push',
+			post: { postId: params.postId, postType: params.postType },
+		} );
 	}, [] );
 
 	const onNavigateToPreviousEntityRecord = useCallback( () => {
diff --git a/packages/edit-site/src/components/block-editor/use-navigate-to-entity-record.js b/packages/edit-site/src/components/block-editor/use-navigate-to-entity-record.js
index 64ecc81aa1b801..120b15b8551d3d 100644
--- a/packages/edit-site/src/components/block-editor/use-navigate-to-entity-record.js
+++ b/packages/edit-site/src/components/block-editor/use-navigate-to-entity-record.js
@@ -16,11 +16,7 @@ export default function useNavigateToEntityRecord() {
 
 	const onNavigateToEntityRecord = useCallback(
 		( params ) => {
-			return ( event ) => {
-				event?.preventDefault();
-
-				history.push( { ...params, focusMode: true, canvas: 'edit' } );
-			};
+			history.push( { ...params, focusMode: true, canvas: 'edit' } );
 		},
 		[ history ]
 	);
diff --git a/packages/editor/src/components/post-template/block-theme.js b/packages/editor/src/components/post-template/block-theme.js
index 4e0e821b9b0359..88dbebade9c204 100644
--- a/packages/editor/src/components/post-template/block-theme.js
+++ b/packages/editor/src/components/post-template/block-theme.js
@@ -55,11 +55,6 @@ export default function BlockThemeControl( { id } ) {
 		return null;
 	}
 
-	const selectTemplate = onNavigateToEntityRecord( {
-		postId: template.id,
-		postType: 'wp_template',
-	} );
-
 	// The site editor does not have a `onNavigateToPreviousEntityRecord` setting as it uses its own routing
 	// and assigns its own backlink to focusMode pages.
 	const notificationAction = hasGoBack
@@ -86,8 +81,11 @@ export default function BlockThemeControl( { id } ) {
 				<>
 					<MenuGroup>
 						<MenuItem
-							onClick={ ( event ) => {
-								selectTemplate( event );
+							onClick={ () => {
+								onNavigateToEntityRecord( {
+									postId: template.id,
+									postType: 'wp_template',
+								} );
 								onClose();
 								createSuccessNotice(
 									__(
diff --git a/packages/editor/src/components/post-template/classic-theme.js b/packages/editor/src/components/post-template/classic-theme.js
index 3d8bc97b57c7ed..46534db49dcc42 100644
--- a/packages/editor/src/components/post-template/classic-theme.js
+++ b/packages/editor/src/components/post-template/classic-theme.js
@@ -102,13 +102,6 @@ function PostTemplateDropdownContent( { onClose } ) {
 		[ allowSwitchingTemplate ]
 	);
 
-	const selectTemplate = currentTemplateId
-		? onNavigateToEntityRecord( {
-				postId: currentTemplateId,
-				postType: 'wp_template',
-		  } )
-		: undefined;
-
 	const options = useMemo(
 		() =>
 			Object.entries( {
@@ -168,12 +161,15 @@ function PostTemplateDropdownContent( { onClose } ) {
 					}
 				/>
 			) }
-			{ canEdit && selectTemplate && (
+			{ canEdit && onNavigateToEntityRecord && (
 				<p>
 					<Button
 						variant="link"
 						onClick={ () => {
-							selectTemplate();
+							onNavigateToEntityRecord( {
+								postId: currentTemplateId,
+								postType: 'wp_template',
+							} );
 							onClose();
 							createSuccessNotice(
 								__(
diff --git a/packages/editor/src/components/post-template/create-new-template-modal.js b/packages/editor/src/components/post-template/create-new-template-modal.js
index 8c2bd832fbae88..61a192e2a0072d 100644
--- a/packages/editor/src/components/post-template/create-new-template-modal.js
+++ b/packages/editor/src/components/post-template/create-new-template-modal.js
@@ -98,11 +98,10 @@ export default function CreateNewTemplateModal( { onClose } ) {
 		} );
 
 		setIsBusy( false );
-		const selectTemplate = onNavigateToEntityRecord( {
+		onNavigateToEntityRecord( {
 			postId: newTemplate.id,
 			postType: 'wp_template',
 		} );
-		selectTemplate();
 		cancel();
 	};
 

From 8648cbaff31f16769900d2488568eaeebda17322 Mon Sep 17 00:00:00 2001
From: Glen Davies <glen.davies@automattic.com>
Date: Wed, 31 Jan 2024 10:23:46 +1300
Subject: [PATCH 05/11] remove redundant check for function

---
 packages/editor/src/components/document-bar/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/editor/src/components/document-bar/index.js b/packages/editor/src/components/document-bar/index.js
index 3f1d8bfe2a6ec6..2ac03a63e73fbe 100644
--- a/packages/editor/src/components/document-bar/index.js
+++ b/packages/editor/src/components/document-bar/index.js
@@ -55,12 +55,11 @@ export default function DocumentBar() {
 				getCurrentPostType,
 				getEditorSettings: getSettings,
 			} = select( editorStore );
-			const back = getSettings().onNavigateToPreviousEntityRecord;
 			return {
 				postType: getCurrentPostType(),
 				postId: getCurrentPostId(),
 				onNavigateToPreviousEntityRecord:
-					typeof back === 'function' ? back : undefined,
+					getSettings().onNavigateToPreviousEntityRecord,
 				getEditorSettings: getSettings,
 			};
 		},

From d403979802b219da69d4b9d2d832af95c18f01ef Mon Sep 17 00:00:00 2001
From: Glen Davies <glen.davies@automattic.com>
Date: Wed, 31 Jan 2024 11:54:51 +1300
Subject: [PATCH 06/11] Fix e2e tests

---
 test/e2e/specs/editor/various/patterns.spec.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/e2e/specs/editor/various/patterns.spec.js b/test/e2e/specs/editor/various/patterns.spec.js
index a16772ea8e70d8..4364f4f02f256f 100644
--- a/test/e2e/specs/editor/various/patterns.spec.js
+++ b/test/e2e/specs/editor/various/patterns.spec.js
@@ -203,7 +203,9 @@ test.describe( 'Synced pattern', () => {
 		await editor.showBlockToolbar();
 		await page
 			.getByRole( 'toolbar', { name: 'Block tools' } )
-			.getByRole( 'link', { name: 'Edit original' } )
+			.getByRole( 'button', {
+				name: 'Edit original',
+			} )
 			.click();
 
 		const editorTopBar = page.getByRole( 'region', {
@@ -276,7 +278,9 @@ test.describe( 'Synced pattern', () => {
 		);
 		await page
 			.getByRole( 'toolbar', { name: 'Block tools' } )
-			.getByRole( 'link', { name: 'Edit original' } )
+			.getByRole( 'button', {
+				name: 'Edit original',
+			} )
 			.click();
 
 		const editorTopBar = page.getByRole( 'region', {

From 4b72155046b719a351be97ba45116846acbad588 Mon Sep 17 00:00:00 2001
From: Glen Davies <glen.davies@automattic.com>
Date: Fri, 2 Feb 2024 14:23:11 +1300
Subject: [PATCH 07/11] Fix conflicts

---
 .../edit-template-blocks-notification.js      | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/packages/editor/src/components/editor-canvas/edit-template-blocks-notification.js b/packages/editor/src/components/editor-canvas/edit-template-blocks-notification.js
index 86cb3b5c4e5dd7..2000ae5727190c 100644
--- a/packages/editor/src/components/editor-canvas/edit-template-blocks-notification.js
+++ b/packages/editor/src/components/editor-canvas/edit-template-blocks-notification.js
@@ -27,16 +27,15 @@ import { store as editorStore } from '../../store';
  *                                                                  editor iframe canvas.
  */
 export default function EditTemplateBlocksNotification( { contentRef } ) {
-	const editTemplate = useSelect( ( select ) => {
+	const { onNavigateToEntityRecord, templateId } = useSelect( ( select ) => {
 		const { getEditorSettings, getCurrentTemplateId } =
 			select( editorStore );
-		const { getPostLinkProps } = getEditorSettings();
-		return getPostLinkProps
-			? getPostLinkProps( {
-					postId: getCurrentTemplateId(),
-					postType: 'wp_template',
-			  } )
-			: {};
+
+		return {
+			onNavigateToEntityRecord:
+				getEditorSettings().onNavigateToEntityRecord,
+			templateId: getCurrentTemplateId(),
+		};
 	}, [] );
 
 	const { getNotices } = useSelect( noticesStore );
@@ -68,7 +67,11 @@ export default function EditTemplateBlocksNotification( { contentRef } ) {
 					actions: [
 						{
 							label: __( 'Edit template' ),
-							onClick: () => editTemplate(),
+							onClick: () =>
+								onNavigateToEntityRecord( {
+									postId: templateId,
+									postType: 'wp_template',
+								} ),
 						},
 					],
 				}
@@ -93,7 +96,15 @@ export default function EditTemplateBlocksNotification( { contentRef } ) {
 			canvas?.removeEventListener( 'click', handleClick );
 			canvas?.removeEventListener( 'dblclick', handleDblClick );
 		};
-	}, [ lastNoticeId, contentRef.current ] );
+	}, [
+		lastNoticeId,
+		contentRef,
+		getNotices,
+		createInfoNotice,
+		onNavigateToEntityRecord,
+		templateId,
+		removeNotice,
+	] );
 
 	return (
 		<ConfirmDialog
@@ -101,7 +112,10 @@ export default function EditTemplateBlocksNotification( { contentRef } ) {
 			confirmButtonText={ __( 'Edit template' ) }
 			onConfirm={ () => {
 				setIsDialogOpen( false );
-				editTemplate();
+				onNavigateToEntityRecord( {
+					postId: templateId,
+					postType: 'wp_template',
+				} );
 			} }
 			onCancel={ () => setIsDialogOpen( false ) }
 		>

From 76b3e8ab56f1586348c424404f95dfca2f3244bb Mon Sep 17 00:00:00 2001
From: Glen Davies <glen.davies@automattic.com>
Date: Wed, 7 Feb 2024 13:44:50 +1300
Subject: [PATCH 08/11] Fix the goBack option in site editor

---
 .../src/components/block-editor/use-site-editor-settings.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/edit-site/src/components/block-editor/use-site-editor-settings.js b/packages/edit-site/src/components/block-editor/use-site-editor-settings.js
index e416749cf292db..9244523d2238ab 100644
--- a/packages/edit-site/src/components/block-editor/use-site-editor-settings.js
+++ b/packages/edit-site/src/components/block-editor/use-site-editor-settings.js
@@ -133,7 +133,7 @@ export function useSpecificEditorSettings() {
 	);
 	const archiveLabels = useArchiveLabel( templateSlug );
 	const defaultRenderingMode = postWithTemplate ? 'template-locked' : 'all';
-	const goBack = useGoBack();
+	const onNavigateToPreviousEntityRecord = useGoBack();
 	const defaultEditorSettings = useMemo( () => {
 		return {
 			...settings,
@@ -143,7 +143,7 @@ export function useSpecificEditorSettings() {
 			focusMode: canvasMode !== 'view',
 			defaultRenderingMode,
 			onNavigateToEntityRecord,
-			goBack,
+			onNavigateToPreviousEntityRecord,
 			// I wonder if they should be set in the post editor too
 			__experimentalArchiveTitleTypeLabel: archiveLabels.archiveTypeLabel,
 			__experimentalArchiveTitleNameLabel: archiveLabels.archiveNameLabel,
@@ -153,7 +153,7 @@ export function useSpecificEditorSettings() {
 		canvasMode,
 		defaultRenderingMode,
 		onNavigateToEntityRecord,
-		goBack,
+		onNavigateToPreviousEntityRecord,
 		archiveLabels.archiveTypeLabel,
 		archiveLabels.archiveNameLabel,
 	] );

From a8170ae8ab047ad56edc77dcb8e056e2a03929c4 Mon Sep 17 00:00:00 2001
From: Glen Davies <glen.davies@automattic.com>
Date: Wed, 7 Feb 2024 14:31:01 +1300
Subject: [PATCH 09/11] fix e2e

---
 test/e2e/specs/editor/various/patterns.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/e2e/specs/editor/various/patterns.spec.js b/test/e2e/specs/editor/various/patterns.spec.js
index 4364f4f02f256f..a9f74f81b7b5a9 100644
--- a/test/e2e/specs/editor/various/patterns.spec.js
+++ b/test/e2e/specs/editor/various/patterns.spec.js
@@ -555,7 +555,7 @@ test.describe( 'Synced pattern', () => {
 		await editor.showBlockToolbar();
 		await page
 			.getByRole( 'toolbar', { name: 'Block tools' } )
-			.getByRole( 'link', { name: 'Edit original' } )
+			.getByRole( 'button', { name: 'Edit original' } )
 			.click();
 
 		await editor.canvas

From 04fa8edf88208948d27ccccc9529e4bdae3a7962 Mon Sep 17 00:00:00 2001
From: Glen Davies <glen.davies@automattic.com>
Date: Wed, 7 Feb 2024 15:34:10 +1300
Subject: [PATCH 10/11] another e2e fix

---
 test/e2e/specs/editor/various/pattern-overrides.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/e2e/specs/editor/various/pattern-overrides.spec.js b/test/e2e/specs/editor/various/pattern-overrides.spec.js
index c5cb9d2599170a..49d0c3bffd0377 100644
--- a/test/e2e/specs/editor/various/pattern-overrides.spec.js
+++ b/test/e2e/specs/editor/various/pattern-overrides.spec.js
@@ -472,7 +472,7 @@ test.describe( 'Pattern Overrides', () => {
 		await editor.showBlockToolbar();
 		await page
 			.getByRole( 'toolbar', { name: 'Block tools' } )
-			.getByRole( 'link', { name: 'Edit original' } )
+			.getByRole( 'button', { name: 'Edit original' } )
 			.click();
 
 		// The inner paragraph should be editable in the pattern focus mode.

From d4b08fc19ed2c4f6dbd61c83823552c7ff82e59f Mon Sep 17 00:00:00 2001
From: Glen Davies <glen.davies@automattic.com>
Date: Wed, 7 Feb 2024 18:08:43 +1300
Subject: [PATCH 11/11] Rename goBack hook

---
 .../src/components/block-editor/use-site-editor-settings.js  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/edit-site/src/components/block-editor/use-site-editor-settings.js b/packages/edit-site/src/components/block-editor/use-site-editor-settings.js
index 9244523d2238ab..b513e560ec5caa 100644
--- a/packages/edit-site/src/components/block-editor/use-site-editor-settings.js
+++ b/packages/edit-site/src/components/block-editor/use-site-editor-settings.js
@@ -90,7 +90,7 @@ function useArchiveLabel( templateSlug ) {
 	);
 }
 
-function useGoBack() {
+function useNavigateToPreviousEntityRecord() {
 	const location = useLocation();
 	const history = useHistory();
 	const goBack = useMemo( () => {
@@ -133,7 +133,8 @@ export function useSpecificEditorSettings() {
 	);
 	const archiveLabels = useArchiveLabel( templateSlug );
 	const defaultRenderingMode = postWithTemplate ? 'template-locked' : 'all';
-	const onNavigateToPreviousEntityRecord = useGoBack();
+	const onNavigateToPreviousEntityRecord =
+		useNavigateToPreviousEntityRecord();
 	const defaultEditorSettings = useMemo( () => {
 		return {
 			...settings,