From 9cc059b4151d263d88dd5c69be753bd7d3cf1541 Mon Sep 17 00:00:00 2001
From: Souptik Datta <souptikdatta2001@gmail.com>
Date: Sat, 25 May 2024 19:12:07 +0530
Subject: [PATCH 1/3] feat: Add frame subtitle for page active view

Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>
---
 .../src/components/page-pages/index.js        | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/packages/edit-site/src/components/page-pages/index.js b/packages/edit-site/src/components/page-pages/index.js
index 391db38fbc51b6..2182b7c8e05af9 100644
--- a/packages/edit-site/src/components/page-pages/index.js
+++ b/packages/edit-site/src/components/page-pages/index.js
@@ -60,25 +60,28 @@ function useView( postType ) {
 			isCustom === 'false' &&
 			DEFAULT_VIEWS[ postType ].find(
 				( { slug } ) => slug === activeView
-			)?.view;
+			);
 		if ( isCustom === 'false' && layout ) {
 			return {
 				...defaultView,
-				type: layout,
-				layout: {
-					...( DEFAULT_CONFIG_PER_VIEW_TYPE[ layout ] || {} ),
+				view: {
+					...defaultView?.view,
+					type: layout,
+					layout: {
+						...( DEFAULT_CONFIG_PER_VIEW_TYPE[ layout ] || {} ),
+					},
 				},
 			};
 		}
 		return defaultView;
 	}, [ isCustom, activeView, layout, postType ] );
-	const [ view, setView ] = useState( selectedDefaultView );
+	const [ view, setView ] = useState( selectedDefaultView?.view );
 
 	useEffect( () => {
-		if ( selectedDefaultView ) {
-			setView( selectedDefaultView );
+		if ( selectedDefaultView?.view ) {
+			setView( selectedDefaultView.view );
 		}
-	}, [ selectedDefaultView ] );
+	}, [ selectedDefaultView?.view ] );
 	const editedViewRecord = useSelect(
 		( select ) => {
 			if ( isCustom !== 'true' ) {
@@ -141,12 +144,16 @@ function useView( postType ) {
 	);
 
 	if ( isCustom === 'false' ) {
-		return [ view, setDefaultViewAndUpdateUrl ];
+		return [ view, setDefaultViewAndUpdateUrl, selectedDefaultView?.title ];
 	} else if ( isCustom === 'true' && customView ) {
-		return [ customView, setCustomView ];
+		return [ customView, setCustomView, selectedDefaultView?.title ];
 	}
 	// Loading state where no the view was not found on custom views or default views.
-	return [ DEFAULT_VIEWS[ postType ][ 0 ].view, setDefaultViewAndUpdateUrl ];
+	return [
+		DEFAULT_VIEWS[ postType ][ 0 ].view,
+		setDefaultViewAndUpdateUrl,
+		DEFAULT_VIEWS[ postType ][ 0 ].title,
+	];
 }
 
 // See https://github.com/WordPress/gutenberg/issues/55886
@@ -203,7 +210,7 @@ function FeaturedImage( { item, viewType } ) {
 
 export default function PagePages() {
 	const postType = 'page';
-	const [ view, setView ] = useView( postType );
+	const [ view, setView, viewTitle ] = useView( postType );
 	const history = useHistory();
 
 	const onSelectionChange = useCallback(
@@ -495,6 +502,7 @@ export default function PagePages() {
 	return (
 		<Page
 			title={ __( 'Pages' ) }
+			subTitle={ viewTitle }
 			actions={
 				addNewLabel && (
 					<>

From d10acbefa303a1c4b4989c08b05fd14801edf581 Mon Sep 17 00:00:00 2001
From: Souptik Datta <souptikdatta2001@gmail.com>
Date: Wed, 29 May 2024 00:38:43 +0530
Subject: [PATCH 2/3] refactor: Movie viewTitle from subtitle to title of page

Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>
---
 packages/edit-site/src/components/page-pages/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/edit-site/src/components/page-pages/index.js b/packages/edit-site/src/components/page-pages/index.js
index 2182b7c8e05af9..a36d0ed4bedc49 100644
--- a/packages/edit-site/src/components/page-pages/index.js
+++ b/packages/edit-site/src/components/page-pages/index.js
@@ -501,8 +501,7 @@ export default function PagePages() {
 
 	return (
 		<Page
-			title={ __( 'Pages' ) }
-			subTitle={ viewTitle }
+			title={ viewTitle }
 			actions={
 				addNewLabel && (
 					<>

From 3c6ca8cb1d72d2955f1a5fc534143da685edce16 Mon Sep 17 00:00:00 2001
From: Souptik Datta <souptikdatta2001@gmail.com>
Date: Thu, 30 May 2024 00:08:29 +0530
Subject: [PATCH 3/3] feat: Show active view name on templates frame title

Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>
---
 packages/edit-site/src/components/page-templates/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/edit-site/src/components/page-templates/index.js b/packages/edit-site/src/components/page-templates/index.js
index fc9326a2191058..c5121689d33060 100644
--- a/packages/edit-site/src/components/page-templates/index.js
+++ b/packages/edit-site/src/components/page-templates/index.js
@@ -354,7 +354,7 @@ export default function PageTemplates() {
 	return (
 		<Page
 			className="edit-site-page-templates"
-			title={ __( 'Templates' ) }
+			title={ 'all' === activeView ? __( 'All templates' ) : activeView }
 			actions={ <AddNewTemplate /> }
 		>
 			<DataViews