feedback

packages/core-data/src/private-selectors.ts

@@ -6,7 +6,12 @@ import { createSelector, createRegistrySelector } from '@wordpress/data';
 /**
  * Internal dependencies
  */
-import { getDefaultTemplateId, getEntityRecord, type State } from './selectors';
+import {
+	canUser,
+	getDefaultTemplateId,
+	getEntityRecord,
+	type State,
+} from './selectors';
 import { STORE_NAME } from './name';
 import { unlock } from './lock-unlock';
 
@@ -134,6 +139,13 @@ interface SiteData {
 export const getHomePage = createRegistrySelector( ( select ) =>
 	createSelector(
 		() => {
+			const canReadSiteData = select( STORE_NAME ).canUser( 'read', {
+				kind: 'root',
+				name: 'site',
+			} );
+			if ( ! canReadSiteData ) {
+				return null;
+			}
 			const siteData = select( STORE_NAME ).getEntityRecord(
 				'root',
 				'site'
@@ -156,6 +168,10 @@ export const getHomePage = createRegistrySelector( ( select ) =>
 			return { postType: 'wp_template', postId: frontPageTemplateId };
 		},
 		( state ) => [
+			canUser( state, 'read', {
+				kind: 'root',
+				name: 'site',
+			} ),
 			getEntityRecord( state, 'root', 'site' ),
 			getDefaultTemplateId( state, {
 				slug: 'front-page',

packages/edit-post/src/components/layout/index.js

@@ -400,10 +400,6 @@ function Layout( {
 				kind: 'postType',
 				name: 'wp_template',
 			} );
-			const canDiscoverTemplate = canUser( 'read', {
-				kind: 'root',
-				name: 'site',
-			} );
 			const { isZoomOut } = unlock( select( blockEditorStore ) );
 			const { getEditorMode, getRenderingMode } = select( editorStore );
 			const isRenderingPostOnly = getRenderingMode() === 'post-only';
@@ -425,7 +421,6 @@ function Layout( {
 					supportsTemplateMode &&
 					isViewable &&
 					canViewTemplate &&
-					canDiscoverTemplate &&
 					! isEditingTemplate
 						? getTemplateId( currentPostType, currentPostId )
 						: null,