From cbf464cec275e5ca67b21a771d3e71adfd2da121 Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Mon, 8 Nov 2021 19:08:09 +0400
Subject: [PATCH 1/2] Site Editor: Update back button URL

---
 .../header/navigation-link/index.js           | 43 ++++++++++++-------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/packages/edit-site/src/components/header/navigation-link/index.js b/packages/edit-site/src/components/header/navigation-link/index.js
index da7baa39dd50b..95f99304ae0e7 100644
--- a/packages/edit-site/src/components/header/navigation-link/index.js
+++ b/packages/edit-site/src/components/header/navigation-link/index.js
@@ -11,22 +11,33 @@ import { __ } from '@wordpress/i18n';
 import { wordpress } from '@wordpress/icons';
 import { store as coreDataStore } from '@wordpress/core-data';
 import { useReducedMotion } from '@wordpress/compose';
+import { addQueryArgs } from '@wordpress/url';
+
+/**
+ * Internal dependencies
+ */
+import { store as editSiteStore } from '../../../store';
 
 function NavigationLink( { icon } ) {
-	const { isRequestingSiteIcon, siteIconUrl } = useSelect( ( select ) => {
-		const { getEntityRecord, isResolving } = select( coreDataStore );
-		const siteData =
-			getEntityRecord( 'root', '__unstableBase', undefined ) || {};
+	const { isRequestingSiteIcon, postType, siteIconUrl } = useSelect(
+		( select ) => {
+			const { getEditedPostType } = select( editSiteStore );
+			const { getEntityRecord, isResolving } = select( coreDataStore );
+			const siteData =
+				getEntityRecord( 'root', '__unstableBase', undefined ) || {};
 
-		return {
-			isRequestingSiteIcon: isResolving( 'core', 'getEntityRecord', [
-				'root',
-				'__unstableBase',
-				undefined,
-			] ),
-			siteIconUrl: siteData.site_icon_url,
-		};
-	}, [] );
+			return {
+				isRequestingSiteIcon: isResolving( 'core', 'getEntityRecord', [
+					'root',
+					'__unstableBase',
+					undefined,
+				] ),
+				postType: getEditedPostType(),
+				siteIconUrl: siteData.site_icon_url,
+			};
+		},
+		[]
+	);
 
 	const disableMotion = useReducedMotion();
 
@@ -59,8 +70,10 @@ function NavigationLink( { icon } ) {
 		<motion.div className="edit-site-navigation-link" whileHover="expand">
 			<Button
 				className="edit-site-navigation-link__button has-icon"
-				label={ __( 'Dashboard' ) }
-				href="index.php"
+				label={ __( 'Back' ) }
+				href={ addQueryArgs( 'edit.php', {
+					post_type: postType,
+				} ) }
 			>
 				{ buttonIcon }
 			</Button>

From 509fcb4175df8f59b7583e4c241a5149f131b157 Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Tue, 9 Nov 2021 16:07:49 +0400
Subject: [PATCH 2/2] Update labels

---
 lib/full-site-editing/template-parts.php      |  1 +
 lib/full-site-editing/templates.php           |  1 +
 .../header/navigation-link/index.js           | 21 ++++++++++++++-----
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/lib/full-site-editing/template-parts.php b/lib/full-site-editing/template-parts.php
index 3b3dd6fa16e4d..1e67ae7a6fd2d 100644
--- a/lib/full-site-editing/template-parts.php
+++ b/lib/full-site-editing/template-parts.php
@@ -22,6 +22,7 @@ function gutenberg_register_template_part_post_type() {
 		'new_item'              => __( 'New Template Part', 'gutenberg' ),
 		'edit_item'             => __( 'Edit Template Part', 'gutenberg' ),
 		'view_item'             => __( 'View Template Part', 'gutenberg' ),
+		'view_items'            => __( 'View Template Parts', 'gutenberg' ),
 		'all_items'             => __( 'All Template Parts', 'gutenberg' ),
 		'search_items'          => __( 'Search Template Parts', 'gutenberg' ),
 		'parent_item_colon'     => __( 'Parent Template Part:', 'gutenberg' ),
diff --git a/lib/full-site-editing/templates.php b/lib/full-site-editing/templates.php
index 85cb8ce47a77a..e4c7ca09dbb33 100644
--- a/lib/full-site-editing/templates.php
+++ b/lib/full-site-editing/templates.php
@@ -22,6 +22,7 @@ function gutenberg_register_template_post_type() {
 		'new_item'              => __( 'New Template', 'gutenberg' ),
 		'edit_item'             => __( 'Edit Template', 'gutenberg' ),
 		'view_item'             => __( 'View Template', 'gutenberg' ),
+		'view_items'            => __( 'View Templates', 'gutenberg' ),
 		'all_items'             => __( 'All Templates', 'gutenberg' ),
 		'search_items'          => __( 'Search Templates', 'gutenberg' ),
 		'parent_item_colon'     => __( 'Parent Template:', 'gutenberg' ),
diff --git a/packages/edit-site/src/components/header/navigation-link/index.js b/packages/edit-site/src/components/header/navigation-link/index.js
index 95f99304ae0e7..9154cb1ae53c3 100644
--- a/packages/edit-site/src/components/header/navigation-link/index.js
+++ b/packages/edit-site/src/components/header/navigation-link/index.js
@@ -1,3 +1,8 @@
+/**
+ * External dependencies
+ */
+import { get } from 'lodash';
+
 /**
  * WordPress dependencies
  */
@@ -19,10 +24,12 @@ import { addQueryArgs } from '@wordpress/url';
 import { store as editSiteStore } from '../../../store';
 
 function NavigationLink( { icon } ) {
-	const { isRequestingSiteIcon, postType, siteIconUrl } = useSelect(
+	const { isRequestingSiteIcon, templateType, siteIconUrl } = useSelect(
 		( select ) => {
 			const { getEditedPostType } = select( editSiteStore );
-			const { getEntityRecord, isResolving } = select( coreDataStore );
+			const { getEntityRecord, getPostType, isResolving } = select(
+				coreDataStore
+			);
 			const siteData =
 				getEntityRecord( 'root', '__unstableBase', undefined ) || {};
 
@@ -32,7 +39,7 @@ function NavigationLink( { icon } ) {
 					'__unstableBase',
 					undefined,
 				] ),
-				postType: getEditedPostType(),
+				templateType: getPostType( getEditedPostType() ),
 				siteIconUrl: siteData.site_icon_url,
 			};
 		},
@@ -70,10 +77,14 @@ function NavigationLink( { icon } ) {
 		<motion.div className="edit-site-navigation-link" whileHover="expand">
 			<Button
 				className="edit-site-navigation-link__button has-icon"
-				label={ __( 'Back' ) }
 				href={ addQueryArgs( 'edit.php', {
-					post_type: postType,
+					post_type: templateType?.slug,
 				} ) }
+				label={ get(
+					templateType,
+					[ 'labels', 'view_items' ],
+					__( 'Back' )
+				) }
 			>
 				{ buttonIcon }
 			</Button>