From d48192be21853583e04e24105b112ede3eae7557 Mon Sep 17 00:00:00 2001
From: Glen Davies <glen.davies@automattic.com>
Date: Mon, 6 Mar 2023 13:37:31 +1300
Subject: [PATCH 1/3] When clicking on templates in manage templates list go
 direct to edit mode rather than via the view only screen

---
 packages/edit-site/src/components/list/table.js     |  2 ++
 packages/edit-site/src/components/site-hub/index.js | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/packages/edit-site/src/components/list/table.js b/packages/edit-site/src/components/list/table.js
index 8f9c039cb0ce1..26bd2d6216b9f 100644
--- a/packages/edit-site/src/components/list/table.js
+++ b/packages/edit-site/src/components/list/table.js
@@ -89,6 +89,8 @@ export default function Table( { templateType } ) {
 									params={ {
 										postId: template.id,
 										postType: template.type,
+										canvas: 'edit',
+										fromTemplateList: true,
 									} }
 								>
 									{ decodeEntities(
diff --git a/packages/edit-site/src/components/site-hub/index.js b/packages/edit-site/src/components/site-hub/index.js
index dc7ef20bd51c0..e66624157854b 100644
--- a/packages/edit-site/src/components/site-hub/index.js
+++ b/packages/edit-site/src/components/site-hub/index.js
@@ -17,6 +17,7 @@ import { __ } from '@wordpress/i18n';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 import { store as coreStore } from '@wordpress/core-data';
 import { forwardRef } from '@wordpress/element';
+import { getQueryArgs } from '@wordpress/url';
 
 /**
  * Internal dependencies
@@ -24,10 +25,13 @@ import { forwardRef } from '@wordpress/element';
 import { store as editSiteStore } from '../../store';
 import SiteIcon from '../site-icon';
 import { unlock } from '../../private-apis';
+import { useHistory } from '../routes';
 
 const HUB_ANIMATION_DURATION = 0.3;
 
 const SiteHub = forwardRef( ( props, ref ) => {
+	const history = useHistory();
+	const { fromTemplateList } = getQueryArgs( window.location.href );
 	const { canvasMode, dashboardLink } = useSelect( ( select ) => {
 		select( editSiteStore ).getEditedPostType();
 		const { getCanvasMode, getSettings } = unlock(
@@ -52,6 +56,14 @@ const SiteHub = forwardRef( ( props, ref ) => {
 				label: __( 'Open Navigation Sidebar' ),
 				onClick: () => {
 					clearSelectedBlock();
+					if ( fromTemplateList ) {
+						history.push( {
+							path: '/wp_template/all',
+							postType: 'wp_template',
+							postId: undefined,
+							fromTemplateList: undefined,
+						} );
+					}
 					setCanvasMode( 'view' );
 				},
 		  };

From 83e19692eca9f230f4d6586e374b8cc6feba6b5f Mon Sep 17 00:00:00 2001
From: Glen Davies <glen.davies@automattic.com>
Date: Wed, 8 Mar 2023 10:10:28 +1300
Subject: [PATCH 2/3] Remove the redirects to template list from site hub

---
 packages/edit-site/src/components/site-hub/index.js | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/packages/edit-site/src/components/site-hub/index.js b/packages/edit-site/src/components/site-hub/index.js
index e66624157854b..dc7ef20bd51c0 100644
--- a/packages/edit-site/src/components/site-hub/index.js
+++ b/packages/edit-site/src/components/site-hub/index.js
@@ -17,7 +17,6 @@ import { __ } from '@wordpress/i18n';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 import { store as coreStore } from '@wordpress/core-data';
 import { forwardRef } from '@wordpress/element';
-import { getQueryArgs } from '@wordpress/url';
 
 /**
  * Internal dependencies
@@ -25,13 +24,10 @@ import { getQueryArgs } from '@wordpress/url';
 import { store as editSiteStore } from '../../store';
 import SiteIcon from '../site-icon';
 import { unlock } from '../../private-apis';
-import { useHistory } from '../routes';
 
 const HUB_ANIMATION_DURATION = 0.3;
 
 const SiteHub = forwardRef( ( props, ref ) => {
-	const history = useHistory();
-	const { fromTemplateList } = getQueryArgs( window.location.href );
 	const { canvasMode, dashboardLink } = useSelect( ( select ) => {
 		select( editSiteStore ).getEditedPostType();
 		const { getCanvasMode, getSettings } = unlock(
@@ -56,14 +52,6 @@ const SiteHub = forwardRef( ( props, ref ) => {
 				label: __( 'Open Navigation Sidebar' ),
 				onClick: () => {
 					clearSelectedBlock();
-					if ( fromTemplateList ) {
-						history.push( {
-							path: '/wp_template/all',
-							postType: 'wp_template',
-							postId: undefined,
-							fromTemplateList: undefined,
-						} );
-					}
 					setCanvasMode( 'view' );
 				},
 		  };

From 019ac9cd198500ec5e001753474104c48997395d Mon Sep 17 00:00:00 2001
From: Glen Davies <glen.davies@automattic.com>
Date: Thu, 9 Mar 2023 12:05:46 +1300
Subject: [PATCH 3/3] Remove redundant prop

---
 packages/edit-site/src/components/list/table.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/edit-site/src/components/list/table.js b/packages/edit-site/src/components/list/table.js
index 26bd2d6216b9f..1f2b4dc376681 100644
--- a/packages/edit-site/src/components/list/table.js
+++ b/packages/edit-site/src/components/list/table.js
@@ -90,7 +90,6 @@ export default function Table( { templateType } ) {
 										postId: template.id,
 										postType: template.type,
 										canvas: 'edit',
-										fromTemplateList: true,
 									} }
 								>
 									{ decodeEntities(