@wordpress/edit-site 6.30.1-next.836ecdcae.0 → 6.31.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "6.30.1-next.836ecdcae.0",
+	"version": "6.31.0",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -30,45 +30,45 @@
 	"dependencies": {
 		"@babel/runtime": "7.25.7",
 		"@react-spring/web": "^9.4.5",
-		"@wordpress/a11y": "^4.30.1-next.836ecdcae.0",
-		"@wordpress/api-fetch": "^7.30.1-next.836ecdcae.0",
-		"@wordpress/blob": "^4.30.1-next.836ecdcae.0",
-		"@wordpress/block-editor": "^15.3.1-next.836ecdcae.0",
-		"@wordpress/block-library": "^9.30.1-next.836ecdcae.0",
-		"@wordpress/blocks": "^15.3.1-next.836ecdcae.0",
-		"@wordpress/commands": "^1.30.1-next.836ecdcae.0",
-		"@wordpress/components": "^30.3.2-next.836ecdcae.0",
-		"@wordpress/compose": "^7.30.1-next.836ecdcae.0",
-		"@wordpress/core-data": "^7.30.1-next.836ecdcae.0",
-		"@wordpress/data": "^10.30.1-next.836ecdcae.0",
-		"@wordpress/dataviews": "^8.0.2-next.836ecdcae.0",
-		"@wordpress/date": "^5.30.1-next.836ecdcae.0",
-		"@wordpress/deprecated": "^4.30.1-next.836ecdcae.0",
-		"@wordpress/dom": "^4.30.1-next.836ecdcae.0",
-		"@wordpress/editor": "^14.30.1-next.836ecdcae.0",
-		"@wordpress/element": "^6.30.1-next.836ecdcae.0",
-		"@wordpress/escape-html": "^3.30.1-next.836ecdcae.0",
-		"@wordpress/fields": "^0.22.1-next.836ecdcae.0",
-		"@wordpress/hooks": "^4.30.1-next.836ecdcae.0",
-		"@wordpress/html-entities": "^4.30.1-next.836ecdcae.0",
-		"@wordpress/i18n": "^6.3.1-next.836ecdcae.0",
-		"@wordpress/icons": "^10.30.1-next.836ecdcae.0",
-		"@wordpress/keyboard-shortcuts": "^5.30.1-next.836ecdcae.0",
-		"@wordpress/keycodes": "^4.30.1-next.836ecdcae.0",
-		"@wordpress/media-utils": "^5.30.1-next.836ecdcae.0",
-		"@wordpress/notices": "^5.30.1-next.836ecdcae.0",
-		"@wordpress/patterns": "^2.30.1-next.836ecdcae.0",
-		"@wordpress/plugins": "^7.30.1-next.836ecdcae.0",
-		"@wordpress/preferences": "^4.30.1-next.836ecdcae.0",
-		"@wordpress/primitives": "^4.30.1-next.836ecdcae.0",
-		"@wordpress/private-apis": "^1.30.1-next.836ecdcae.0",
-		"@wordpress/reusable-blocks": "^5.30.1-next.836ecdcae.0",
-		"@wordpress/router": "^1.30.1-next.836ecdcae.0",
-		"@wordpress/style-engine": "^2.30.1-next.836ecdcae.0",
-		"@wordpress/url": "^4.30.1-next.836ecdcae.0",
-		"@wordpress/viewport": "^6.30.1-next.836ecdcae.0",
-		"@wordpress/widgets": "^4.30.1-next.836ecdcae.0",
-		"@wordpress/wordcount": "^4.30.1-next.836ecdcae.0",
+		"@wordpress/a11y": "^4.31.0",
+		"@wordpress/api-fetch": "^7.31.0",
+		"@wordpress/blob": "^4.31.0",
+		"@wordpress/block-editor": "^15.4.0",
+		"@wordpress/block-library": "^9.31.0",
+		"@wordpress/blocks": "^15.4.0",
+		"@wordpress/commands": "^1.31.0",
+		"@wordpress/components": "^30.4.0",
+		"@wordpress/compose": "^7.31.0",
+		"@wordpress/core-data": "^7.31.0",
+		"@wordpress/data": "^10.31.0",
+		"@wordpress/dataviews": "^9.0.0",
+		"@wordpress/date": "^5.31.0",
+		"@wordpress/deprecated": "^4.31.0",
+		"@wordpress/dom": "^4.31.0",
+		"@wordpress/editor": "^14.31.0",
+		"@wordpress/element": "^6.31.0",
+		"@wordpress/escape-html": "^3.31.0",
+		"@wordpress/fields": "^0.23.0",
+		"@wordpress/hooks": "^4.31.0",
+		"@wordpress/html-entities": "^4.31.0",
+		"@wordpress/i18n": "^6.4.0",
+		"@wordpress/icons": "^10.31.0",
+		"@wordpress/keyboard-shortcuts": "^5.31.0",
+		"@wordpress/keycodes": "^4.31.0",
+		"@wordpress/media-utils": "^5.31.0",
+		"@wordpress/notices": "^5.31.0",
+		"@wordpress/patterns": "^2.31.0",
+		"@wordpress/plugins": "^7.31.0",
+		"@wordpress/preferences": "^4.31.0",
+		"@wordpress/primitives": "^4.31.0",
+		"@wordpress/private-apis": "^1.31.0",
+		"@wordpress/reusable-blocks": "^5.31.0",
+		"@wordpress/router": "^1.31.0",
+		"@wordpress/style-engine": "^2.31.0",
+		"@wordpress/url": "^4.31.0",
+		"@wordpress/viewport": "^6.31.0",
+		"@wordpress/widgets": "^4.31.0",
+		"@wordpress/wordcount": "^4.31.0",
 		"change-case": "^4.1.2",
 		"clsx": "^2.1.1",
 		"colord": "^2.9.2",
@@ -83,5 +83,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "3e60b4c1e78d7b27acbf1d7dd172bbd64358a0f2"
+	"gitHead": "d7601d30d49462ea942168e8ab6bf449fb93097e"
 }

package/src/components/add-new-template/add-custom-template-modal-content.js

@@ -172,9 +172,7 @@ function AddCustomTemplateModalContent( {
 	onBack,
 	containerRef,
 } ) {
-	const [ showSearchEntities, setShowSearchEntities ] = useState(
-		entityForSuggestions.hasGeneralTemplate
-	);
+	const [ showSearchEntities, setShowSearchEntities ] = useState();
 
 	// Focus on the first focusable element when the modal opens.
 	// We handle focus management in the parent modal, just need to focus on the first focusable element.

package/src/components/add-new-template/index.js

@@ -53,7 +53,6 @@ import { TEMPLATE_POST_TYPE } from '../../utils/constants';
  */
 import AddCustomTemplateModalContent from './add-custom-template-modal-content';
 import {
-	useExistingTemplates,
 	useDefaultTemplateTypes,
 	useTaxonomiesMenuItems,
 	usePostTypeMenuItems,
@@ -387,15 +386,9 @@ function NewTemplate() {
 }
 
 function useMissingTemplates( setEntityForSuggestions, onClick ) {
-	const existingTemplates = useExistingTemplates();
 	const defaultTemplateTypes = useDefaultTemplateTypes();
-	const existingTemplateSlugs = ( existingTemplates || [] ).map(
-		( { slug } ) => slug
-	);
 	const missingDefaultTemplates = ( defaultTemplateTypes || [] ).filter(
-		( template ) =>
-			DEFAULT_TEMPLATE_SLUGS.includes( template.slug ) &&
-			! existingTemplateSlugs.includes( template.slug )
+		( template ) => DEFAULT_TEMPLATE_SLUGS.includes( template.slug )
 	);
 	const onClickMenuItem = ( _entityForSuggestions ) => {
 		onClick?.();

package/src/components/add-new-template/utils.js

@@ -189,7 +189,6 @@ export function usePostTypeArchiveMenuItems() {
 
 export const usePostTypeMenuItems = ( onClickMenuItem ) => {
 	const publicPostTypes = usePublicPostTypes();
-	const existingTemplates = useExistingTemplates();
 	const defaultTemplateTypes = useDefaultTemplateTypes();
 	// We need to keep track of naming conflicts. If a conflict
 	// occurs, we need to add slug.
@@ -229,9 +228,6 @@ export const usePostTypeMenuItems = ( onClickMenuItem ) => {
 		[ publicPostTypes ]
 	);
 	const postTypesInfo = useEntitiesInfo( 'postType', templatePrefixes );
-	const existingTemplateSlugs = ( existingTemplates || [] ).map(
-		( { slug } ) => slug
-	);
 	const menuItems = ( publicPostTypes || [] ).reduce(
 		( accumulator, postType ) => {
 			const { slug, labels, icon } = postType;
@@ -242,8 +238,6 @@ export const usePostTypeMenuItems = ( onClickMenuItem ) => {
 			const defaultTemplateType = defaultTemplateTypes?.find(
 				( { slug: _slug } ) => _slug === generalTemplateSlug
 			);
-			const hasGeneralTemplate =
-				existingTemplateSlugs?.includes( generalTemplateSlug );
 			const _needsUniqueIdentifier = needsUniqueIdentifier( postType );
 			let menuItemTitle =
 				labels.template_name ||
@@ -321,14 +315,12 @@ export const usePostTypeMenuItems = ( onClickMenuItem ) => {
 							},
 						},
 						labels,
-						hasGeneralTemplate,
 						template,
 					} );
 				};
 			}
-			// We don't need to add the menu item if there are no
-			// entities and the general template exists.
-			if ( ! hasGeneralTemplate || hasEntities ) {
+			// We don't need to add the menu item if there are no entities.
+			if ( hasEntities ) {
 				accumulator.push( menuItem );
 			}
 			return accumulator;
@@ -555,7 +547,11 @@ export function useAuthorMenuItem( onClickMenuItem ) {
 					getSpecificTemplate: ( suggestion ) => {
 						const templateSlug = `author-${ suggestion.slug }`;
 						return {
-							title: templateSlug,
+							title: sprintf(
+								// translators: %s: Name of the author e.g: "Admin".
+								__( 'Author: %s' ),
+								suggestion.name
+							),
 							slug: templateSlug,
 							templatePrefix: 'author',
 						};
@@ -577,91 +573,6 @@ export function useAuthorMenuItem( onClickMenuItem ) {
 	}
 }
 
-/**
- * Helper hook that filters all the existing templates by the given
- * object with the entity's slug as key and the template prefix as value.
- *
- * Example:
- * `existingTemplates` is: [ { slug: 'tag-apple' }, { slug: 'page-about' }, { slug: 'tag' } ]
- * `templatePrefixes` is: { post_tag: 'tag' }
- * It will return: { post_tag: ['apple'] }
- *
- * Note: We append the `-` to the given template prefix in this function for our checks.
- *
- * @param {Record<string,string>} templatePrefixes An object with the entity's slug as key and the template prefix as value.
- * @return {Record<string,string[]>} An object with the entity's slug as key and an array with the existing template slugs as value.
- */
-const useExistingTemplateSlugs = ( templatePrefixes ) => {
-	const existingTemplates = useExistingTemplates();
-	const existingSlugs = useMemo( () => {
-		return Object.entries( templatePrefixes || {} ).reduce(
-			( accumulator, [ slug, prefix ] ) => {
-				const slugsWithTemplates = ( existingTemplates || [] ).reduce(
-					( _accumulator, existingTemplate ) => {
-						const _prefix = `${ prefix }-`;
-						if ( existingTemplate.slug.startsWith( _prefix ) ) {
-							_accumulator.push(
-								existingTemplate.slug.substring(
-									_prefix.length
-								)
-							);
-						}
-						return _accumulator;
-					},
-					[]
-				);
-				if ( slugsWithTemplates.length ) {
-					accumulator[ slug ] = slugsWithTemplates;
-				}
-				return accumulator;
-			},
-			{}
-		);
-	}, [ templatePrefixes, existingTemplates ] );
-	return existingSlugs;
-};
-
-/**
- * Helper hook that finds the existing records with an associated template,
- * as they need to be excluded from the template suggestions.
- *
- * @param {string}                entityName                The entity's name.
- * @param {Record<string,string>} templatePrefixes          An object with the entity's slug as key and the template prefix as value.
- * @param {Record<string,Object>} additionalQueryParameters An object with the entity's slug as key and additional query parameters as value.
- * @return {Record<string,EntitiesInfo>} An object with the entity's slug as key and the existing records as value.
- */
-const useTemplatesToExclude = (
-	entityName,
-	templatePrefixes,
-	additionalQueryParameters = {}
-) => {
-	const slugsToExcludePerEntity =
-		useExistingTemplateSlugs( templatePrefixes );
-	const recordsToExcludePerEntity = useSelect(
-		( select ) => {
-			return Object.entries( slugsToExcludePerEntity || {} ).reduce(
-				( accumulator, [ slug, slugsWithTemplates ] ) => {
-					const entitiesWithTemplates = select(
-						coreStore
-					).getEntityRecords( entityName, slug, {
-						_fields: 'id',
-						context: 'view',
-						slug: slugsWithTemplates,
-						...additionalQueryParameters[ slug ],
-					} );
-					if ( entitiesWithTemplates?.length ) {
-						accumulator[ slug ] = entitiesWithTemplates;
-					}
-					return accumulator;
-				},
-				{}
-			);
-		},
-		[ slugsToExcludePerEntity ]
-	);
-	return recordsToExcludePerEntity;
-};
-
 /**
  * Helper hook that returns information about an entity having
  * records that we can create a specific template for.
@@ -682,26 +593,16 @@ const useEntitiesInfo = (
 	templatePrefixes,
 	additionalQueryParameters = EMPTY_OBJECT
 ) => {
-	const recordsToExcludePerEntity = useTemplatesToExclude(
-		entityName,
-		templatePrefixes,
-		additionalQueryParameters
-	);
 	const entitiesHasRecords = useSelect(
 		( select ) => {
 			return Object.keys( templatePrefixes || {} ).reduce(
 				( accumulator, slug ) => {
-					const existingEntitiesIds =
-						recordsToExcludePerEntity?.[ slug ]?.map(
-							( { id } ) => id
-						) || [];
 					accumulator[ slug ] = !! select(
 						coreStore
 					).getEntityRecords( entityName, slug, {
 						per_page: 1,
 						_fields: 'id',
 						context: 'view',
-						exclude: existingEntitiesIds,
 						...additionalQueryParameters[ slug ],
 					} )?.length;
 					return accumulator;
@@ -709,28 +610,18 @@ const useEntitiesInfo = (
 				{}
 			);
 		},
-		[
-			templatePrefixes,
-			recordsToExcludePerEntity,
-			entityName,
-			additionalQueryParameters,
-		]
+		[ templatePrefixes, entityName, additionalQueryParameters ]
 	);
 	const entitiesInfo = useMemo( () => {
 		return Object.keys( templatePrefixes || {} ).reduce(
 			( accumulator, slug ) => {
-				const existingEntitiesIds =
-					recordsToExcludePerEntity?.[ slug ]?.map(
-						( { id } ) => id
-					) || [];
 				accumulator[ slug ] = {
 					hasEntities: entitiesHasRecords[ slug ],
-					existingEntitiesIds,
 				};
 				return accumulator;
 			},
 			{}
 		);
-	}, [ templatePrefixes, recordsToExcludePerEntity, entitiesHasRecords ] );
+	}, [ templatePrefixes, entitiesHasRecords ] );
 	return entitiesInfo;
 };

package/src/components/dataviews-actions/index.js

@@ -5,6 +5,8 @@ import { __ } from '@wordpress/i18n';
 import { edit } from '@wordpress/icons';
 import { useMemo } from '@wordpress/element';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
+import { useDispatch, useSelect } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
 
 /**
  * Internal dependencies
@@ -14,6 +16,55 @@ import { unlock } from '../../lock-unlock';
 
 const { useHistory } = unlock( routerPrivateApis );
 
+export const useSetActiveTemplateAction = () => {
+	const { getEntityRecord } = useSelect( coreStore );
+	const { editEntityRecord, saveEditedEntityRecord } =
+		useDispatch( coreStore );
+	return useMemo(
+		() => ( {
+			id: 'set-active-template',
+			label( items ) {
+				return items.some( ( item ) => item._isActive )
+					? __( 'Deactivate' )
+					: __( 'Activate' );
+			},
+			isPrimary: true,
+			icon: edit,
+			isEligible( item ) {
+				return ! ( item.slug === 'index' && item.source === 'theme' );
+			},
+			async callback( items ) {
+				const deactivate = items.some( ( item ) => item._isActive );
+				// current active templates
+				const activeTemplates = {
+					...( ( await getEntityRecord( 'root', 'site' )
+						.active_templates ) ?? {} ),
+				};
+				for ( const item of items ) {
+					if ( deactivate ) {
+						if ( item.source === 'theme' ) {
+							activeTemplates[ item.slug ] = false;
+						} else {
+							delete activeTemplates[ item.slug ];
+						}
+					} else {
+						activeTemplates[ item.slug ] = item.id;
+					}
+				}
+				// To do: figure out why the REST API deletes the option when
+				// it's set to an empty object. That would trigger the migration
+				// function, which will make all templates in the database active.
+				activeTemplates.__preventCollapse = 0;
+				await editEntityRecord( 'root', 'site', undefined, {
+					active_templates: activeTemplates,
+				} );
+				await saveEditedEntityRecord( 'root', 'site' );
+			},
+		} ),
+		[ editEntityRecord, saveEditedEntityRecord, getEntityRecord ]
+	);
+};
+
 export const useEditPostAction = () => {
 	const history = useHistory();
 	return useMemo(

package/src/components/editor/index.js

@@ -110,6 +110,7 @@ function getNavigationPath( location, postType ) {
 			'template-part-item',
 			'page-item',
 			'template-item',
+			'static-template-item',
 			'post-item',
 		].includes( name )
 	) {

package/src/components/editor/use-resolve-edited-entity.js

@@ -25,13 +25,12 @@ const postTypesWithoutParentTemplate = [
 	TEMPLATE_PART_POST_TYPE,
 	NAVIGATION_POST_TYPE,
 	PATTERN_TYPES.user,
+	'wp_registered_template',
 ];
 
 const authorizedPostTypes = [ 'page', 'post' ];
 
-export function useResolveEditedEntity() {
-	const { name, params = {}, query } = useLocation();
-	const { postId = query?.postId } = params; // Fallback to query param for postId for list view routes.
+function getPostType( name, postId ) {
 	let postType;
 	if ( name === 'navigation-item' ) {
 		postType = NAVIGATION_POST_TYPE;
@@ -39,19 +38,48 @@ export function useResolveEditedEntity() {
 		postType = PATTERN_TYPES.user;
 	} else if ( name === 'template-part-item' ) {
 		postType = TEMPLATE_PART_POST_TYPE;
-	} else if ( name === 'template-item' || name === 'templates' ) {
+	} else if ( name === 'templates' ) {
+		postType = /^\d+$/.test( postId )
+			? TEMPLATE_POST_TYPE
+			: 'wp_registered_template';
+	} else if ( name === 'template-item' ) {
 		postType = TEMPLATE_POST_TYPE;
+	} else if ( name === 'static-template-item' ) {
+		postType = 'wp_registered_template';
 	} else if ( name === 'page-item' || name === 'pages' ) {
 		postType = 'page';
 	} else if ( name === 'post-item' || name === 'posts' ) {
 		postType = 'post';
 	}
 
+	return postType;
+}
+
+export function useResolveEditedEntity() {
+	const { name, params = {}, query } = useLocation();
+	const { postId: _postId = query?.postId } = params; // Fallback to query param for postId for list view routes.
+	const _postType = getPostType( name, _postId ) ?? query?.postType;
+
 	const homePage = useSelect( ( select ) => {
 		const { getHomePage } = unlock( select( coreDataStore ) );
 		return getHomePage();
 	}, [] );
 
+	const [ postType, postId ] = useSelect(
+		( select ) => {
+			if ( _postType !== 'wp_registered_template' ) {
+				return [ _postType, _postId ];
+			}
+			return [
+				TEMPLATE_POST_TYPE,
+				unlock( select( coreDataStore ) ).getTemplateAutoDraftId(
+					_postId
+				),
+			];
+		},
+		[ _postType, _postId ]
+	);
+
 	/**
 	 * This is a hook that recreates the logic to resolve a template for a given WordPress postID postTypeId
 	 * in order to match the frontend as closely as possible in the site editor.
@@ -98,6 +126,18 @@ export function useResolveEditedEntity() {
 		[ homePage, postId, postType ]
 	);
 
+	const editableResolvedTemplateId = useSelect(
+		( select ) => {
+			if ( typeof resolvedTemplateId !== 'string' ) {
+				return resolvedTemplateId;
+			}
+			return unlock( select( coreDataStore ) ).getTemplateAutoDraftId(
+				resolvedTemplateId
+			);
+		},
+		[ resolvedTemplateId ]
+	);
+
 	const context = useMemo( () => {
 		if ( postTypesWithoutParentTemplate.includes( postType ) && postId ) {
 			return {};
@@ -121,9 +161,9 @@ export function useResolveEditedEntity() {
 
 	if ( !! homePage ) {
 		return {
-			isReady: resolvedTemplateId !== undefined,
+			isReady: editableResolvedTemplateId !== undefined,
 			postType: TEMPLATE_POST_TYPE,
-			postId: resolvedTemplateId,
+			postId: editableResolvedTemplateId,
 			context,
 		};
 	}
@@ -141,7 +181,14 @@ export function useSyncDeprecatedEntityIntoState( {
 
 	useEffect( () => {
 		if ( isReady ) {
-			setEditedEntity( postType, postId, context );
+			// setEditedEntity expects a string (because the postId used to be
+			// the template slug, even for edited templates). Now the postId can
+			// be a number (either because it's an auto-draft or edited
+			// template). Passing a number could break plugins doing things like
+			// `id.includes`. It would be way more complex to keep passing the
+			// template slug, while also being incorrect, so the easiest
+			// solution is to cast the postId to a string.
+			setEditedEntity( postType, String( postId ), context );
 		}
 	}, [ isReady, postType, postId, context, setEditedEntity ] );
 }

package/src/components/global-styles/screen-root.js

@@ -16,7 +16,6 @@ import { isRTL, __ } from '@wordpress/i18n';
 import { chevronLeft, chevronRight } from '@wordpress/icons';
 import { useSelect } from '@wordpress/data';
 import { store as coreStore } from '@wordpress/core-data';
-import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
@@ -25,13 +24,8 @@ import { IconWithCurrentColor } from './icon-with-current-color';
 import { NavigationButtonAsItem } from './navigation-button';
 import RootMenu from './root-menu';
 import PreviewStyles from './preview-styles';
-import { unlock } from '../../lock-unlock';
-
-const { useGlobalStyle } = unlock( blockEditorPrivateApis );
 
 function ScreenRoot() {
-	const [ customCSS ] = useGlobalStyle( 'css' );
-
 	const { hasVariations, canEditCSS } = useSelect( ( select ) => {
 		const {
 			getEntityRecord,
@@ -116,7 +110,7 @@ function ScreenRoot() {
 				</ItemGroup>
 			</CardBody>
 
-			{ canEditCSS && !! customCSS && (
+			{ canEditCSS && (
 				<>
 					<CardDivider />
 					<CardBody>

package/src/components/page-templates/fields.js

@@ -6,7 +6,11 @@ import clsx from 'clsx';
 /**
  * WordPress dependencies
  */
-import { Icon, __experimentalHStack as HStack } from '@wordpress/components';
+import {
+	Icon,
+	__experimentalHStack as HStack,
+	privateApis as componentsPrivateApis,
+} from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { useState, useMemo } from '@wordpress/element';
 import { decodeEntities } from '@wordpress/html-entities';
@@ -16,15 +20,40 @@ import {
 	privateApis as blockEditorPrivateApis,
 } from '@wordpress/block-editor';
 import { EditorProvider } from '@wordpress/editor';
+import { privateApis as corePrivateApis } from '@wordpress/core-data';
 
 /**
  * Internal dependencies
  */
 import { useAddedBy } from './hooks';
+import { useDefaultTemplateTypes } from '../add-new-template/utils';
 import usePatternSettings from '../page-patterns/use-pattern-settings';
 import { unlock } from '../../lock-unlock';
 
 const { useGlobalStyle } = unlock( blockEditorPrivateApis );
+const { Badge } = unlock( componentsPrivateApis );
+const { useEntityRecordsWithPermissions } = unlock( corePrivateApis );
+
+function useAllDefaultTemplateTypes() {
+	const defaultTemplateTypes = useDefaultTemplateTypes();
+	const { records: staticRecords } = useEntityRecordsWithPermissions(
+		'postType',
+		'wp_registered_template',
+		{ per_page: -1 }
+	);
+	return [
+		...defaultTemplateTypes,
+		...staticRecords
+			?.filter( ( record ) => ! record.is_custom )
+			.map( ( record ) => {
+				return {
+					slug: record.slug,
+					title: record.title.rendered,
+					description: record.description,
+				};
+			} ),
+	];
+}
 
 function PreviewField( { item } ) {
 	const settings = usePatternSettings();
@@ -68,8 +97,14 @@ export const previewField = {
 export const descriptionField = {
 	label: __( 'Description' ),
 	id: 'description',
-	render: ( { item } ) => {
-		return item.description && decodeEntities( item.description );
+	render: function RenderDescription( { item } ) {
+		const defaultTemplateTypes = useAllDefaultTemplateTypes();
+		const defaultTemplateType = defaultTemplateTypes.find(
+			( type ) => type.slug === item.slug
+		);
+		return item.description
+			? decodeEntities( item.description )
+			: defaultTemplateType?.description;
 	},
 	enableSorting: false,
 	enableGlobalSearch: true,
@@ -107,6 +142,37 @@ function AuthorField( { item } ) {
 export const authorField = {
 	label: __( 'Author' ),
 	id: 'author',
-	getValue: ( { item } ) => item.author_text,
+	getValue: ( { item } ) => item.author_text ?? item.author,
 	render: AuthorField,
 };
+
+export const activeField = {
+	label: __( 'Status' ),
+	id: 'active',
+	getValue: ( { item } ) => item._isActive,
+	render: function Render( { item } ) {
+		const isActive = item._isActive;
+		return (
+			<Badge intent={ isActive ? 'success' : 'default' }>
+				{ isActive ? __( 'Active' ) : __( 'Inactive' ) }
+			</Badge>
+		);
+	},
+};
+
+export const slugField = {
+	label: __( 'Template Type' ),
+	id: 'slug',
+	getValue: ( { item } ) => item.slug,
+	render: function Render( { item } ) {
+		const defaultTemplateTypes = useAllDefaultTemplateTypes();
+		const defaultTemplateType = defaultTemplateTypes.find(
+			( type ) => type.slug === item.slug
+		);
+		return (
+			defaultTemplateType?.title ||
+			// translators: %s is the slug of a custom template.
+			__( 'Custom' )
+		);
+	},
+};

package/src/components/page-templates/hooks.js

@@ -89,7 +89,7 @@ export function useAddedBy( postType, postId ) {
 						type: 'user',
 						icon: authorIcon,
 						imageUrl: user?.avatar_urls?.[ 48 ],
-						text: authorText,
+						text: authorText ?? user?.name,
 						isCustomized: false,
 					};
 				}