Template activation: redirect to 'Create Templates' after duplication (#72727)

ellatrix · mcsf · gutenbergplugin · commit 76842c49fce7 · 2025-10-29T16:32:03.000Z
Co-authored-by: ellatrix &lt;ellatrix@git.wordpress.org&gt;
Co-authored-by: mcsf &lt;mcsf@git.wordpress.org&gt;
diff --git a/packages/edit-site/src/components/page-templates/index.js b/packages/edit-site/src/components/page-templates/index.js
@@ -39,7 +39,8 @@ import {
 } from './fields';
 import { defaultLayouts, getDefaultView } from './view-utils';
 
-const { usePostActions, templateTitleField } = unlock( editorPrivateApis );
+const { usePostActions, usePostFields, templateTitleField } =
+	unlock( editorPrivateApis );
 const { useHistory, useLocation } = unlock( routerPrivateApis );
 const { useEntityRecordsWithPermissions } = unlock( corePrivateApis );
 
@@ -210,6 +211,10 @@ export default function PageTemplates() {
 		[ history, path, view?.type ]
 	);
 
+	const postTypeFields = usePostFields( {
+		postType: TEMPLATE_POST_TYPE,
+	} );
+	const dateField = postTypeFields.find( ( field ) => field.id === 'date' );
 	const themeField = useThemeField();
 	const fields = useMemo( () => {
 		const _fields = [
@@ -221,6 +226,9 @@ export default function PageTemplates() {
 		];
 		if ( activeView === 'user' ) {
 			_fields.push( themeField );
+			if ( dateField ) {
+				_fields.push( dateField );
+			}
 		}
 		const elements = [];
 		for ( const author in users ) {
@@ -234,7 +242,7 @@ export default function PageTemplates() {
 			elements,
 		} );
 		return _fields;
-	}, [ users, activeView, themeField ] );
+	}, [ users, activeView, themeField, dateField ] );
 
 	const { data, paginationInfo } = useMemo( () => {
 		return filterSortAndPaginate( records, view, fields );
@@ -251,6 +259,7 @@ export default function PageTemplates() {
 							typeof newItem.title === 'string'
 								? newItem.title
 								: newItem.title?.rendered;
+						history.navigate( `/template?activeView=user` );
 						createSuccessNotice(
 							sprintf(
 								// translators: %s: Title of the created post or template, e.g: "Hello world".
@@ -358,11 +367,6 @@ export default function PageTemplates() {
 					<duplicateAction.RenderModal
 						items={ [ selectedRegisteredTemplate ] }
 						closeModal={ () => setSelectedRegisteredTemplate() }
-						onActionPerformed={ ( [ item ] ) => {
-							history.navigate(
-								`/${ item.type }/${ item.id }?canvas=edit`
-							);
-						} }
 					/>
 				</Modal>
 			) }
diff --git a/packages/edit-site/src/components/page-templates/view-utils.js b/packages/edit-site/src/components/page-templates/view-utils.js
@@ -28,6 +28,13 @@ const DEFAULT_VIEW = {
 export function getDefaultView( activeView ) {
 	return {
 		...DEFAULT_VIEW,
+		sort:
+			activeView === 'user'
+				? {
+						field: 'date',
+						direction: 'desc',
+				  }
+				: DEFAULT_VIEW.sort,
 		filters: ! [ 'active', 'user' ].includes( activeView )
 			? [
 					{
diff --git a/test/e2e/specs/site-editor/browser-history.spec.js b/test/e2e/specs/site-editor/browser-history.spec.js
@@ -23,18 +23,29 @@ test.describe( 'Site editor browser history', () => {
 			.locator( '.fields-field__title', { hasText: 'Index' } )
 			.click();
 		await page.getByRole( 'button', { name: 'Duplicate' } ).click();
+		await expect( page ).toHaveURL(
+			'/wp-admin/site-editor.php?p=%2Ftemplate&activeView=user'
+		);
+		await page
+			.getByRole( 'button', { name: 'Index (Copy)' } )
+			.first()
+			.click();
 		await expect( page ).toHaveURL(
 			/\/wp-admin\/site-editor\.php\?p=%2Fwp_template%2F\d+&canvas=edit$/
 		);
 
 		// Navigate back to the template list
 		await page.goBack();
+		await expect( page ).toHaveURL(
+			'/wp-admin/site-editor.php?p=%2Ftemplate&activeView=user'
+		);
+		await page.goBack();
 		await expect( page ).toHaveURL(
 			'/wp-admin/site-editor.php?p=%2Ftemplate'
 		);
-
 		// Navigate back to the dashboard
 		await page.goBack();
+		await expect( page ).toHaveURL( '/wp-admin/site-editor.php' );
 		await page.goBack();
 		await expect( page ).toHaveURL( '/wp-admin/index.php' );
 	} );
diff --git a/test/e2e/specs/site-editor/template-registration.spec.js b/test/e2e/specs/site-editor/template-registration.spec.js
@@ -54,6 +54,13 @@ test.describe( 'Block template registration', () => {
 		// Verify the template contents are rendered in the editor.
 		await page.getByText( 'Plugin Template' ).click();
 		await page.getByRole( 'button', { name: 'Duplicate' } ).click();
+		await page.waitForURL(
+			'/wp-admin/site-editor.php?p=%2Ftemplate&activeView=user'
+		);
+		await page
+			.getByRole( 'button', { name: 'Plugin Template (Copy)' } )
+			.first()
+			.click();
 		await expect(
 			editor.canvas.getByText( 'This is a plugin-registered template.' )
 		).toBeVisible();
@@ -196,6 +203,13 @@ test.describe( 'Block template registration', () => {
 		);
 		await page.getByText( 'Plugin Template' ).click();
 		await page.getByRole( 'button', { name: 'Duplicate' } ).click();
+		await page.waitForURL(
+			'/wp-admin/site-editor.php?p=%2Ftemplate&activeView=user'
+		);
+		await page
+			.getByRole( 'button', { name: 'Plugin Template (Copy)' } )
+			.first()
+			.click();
 		await expect(
 			editor.canvas.getByText( 'This is a plugin-registered template.' )
 		).toBeVisible();
