Add template details to template parts

WordPress · Oct 8, 2021 · 2863123 · 2863123
1 parent 1264b12
commit 2863123
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 25 deletions.
diff --git a/packages/edit-site/src/components/header/index.js b/packages/edit-site/src/components/header/index.js
@@ -141,27 +141,22 @@ export default function Header( {
 			</div>
 
 			<div className="edit-site-header_center">
-				{ 'wp_template' === templateType && (
-					<DocumentActions
-						entityTitle={ entityTitle }
-						entityLabel="template"
-						isLoaded={ isLoaded }
-					>
-						{ ( { onClose } ) => (
-							<TemplateDetails
-								template={ template }
-								onClose={ onClose }
-							/>
-						) }
-					</DocumentActions>
-				) }
-				{ 'wp_template_part' === templateType && (
-					<DocumentActions
-						entityTitle={ entityTitle }
-						entityLabel="template part"
-						isLoaded={ isLoaded }
-					/>
-				) }
+				<DocumentActions
+					entityTitle={ entityTitle }
+					entityLabel={
+						templateType === 'wp_template_part'
+							? 'template part'
+							: 'template'
+					}
+					isLoaded={ isLoaded }
+				>
+					{ ( { onClose } ) => (
+						<TemplateDetails
+							template={ template }
+							onClose={ onClose }
+						/>
+					) }
+				</DocumentActions>
 			</div>
 
 			<div className="edit-site-header_end">

diff --git a/packages/edit-site/src/components/sidebar/template-card/template-areas.js b/packages/edit-site/src/components/sidebar/template-card/template-areas.js
@@ -46,6 +46,10 @@ export default function TemplateAreas() {
 		[]
 	);
 
+	if ( ! Object.keys( templateAreaBlocks ).length ) {
+		return null;
+	}
+
 	return (
 		<section className="edit-site-template-card__template-areas">
 			<Heading

diff --git a/packages/edit-site/src/store/actions.js b/packages/edit-site/src/store/actions.js
@@ -391,7 +391,7 @@ export function* revertTemplate( template ) {
 			coreStore,
 			'getEditedEntityRecord',
 			'postType',
-			'wp_template',
+			template.type,
 			template.id
 		);
 		// We are fixing up the undo level here to make sure we can undo
@@ -400,7 +400,7 @@ export function* revertTemplate( template ) {
 			coreStore,
 			'editEntityRecord',
 			'postType',
-			'wp_template',
+			template.type,
 			template.id,
 			{
 				content: serializeBlocks, // required to make the `undo` behave correctly
@@ -417,7 +417,7 @@ export function* revertTemplate( template ) {
 			coreStore,
 			'editEntityRecord',
 			'postType',
-			'wp_template',
+			template.type,
 			fileTemplate.id,
 			{
 				content: serializeBlocks,
@@ -429,7 +429,7 @@ export function* revertTemplate( template ) {
 		const undoRevert = async () => {
 			await dispatch( coreStore ).editEntityRecord(
 				'postType',
-				'wp_template',
+				template.type,
 				edited.id,
 				{
 					content: serializeBlocks,