Site editor: Check template resolution (#33527)

Check template resolution before showing warning notice
WordPress · Jul 23, 2021 · f8d400f · f8d400f
1 parent 0404b55
commit f8d400f
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/packages/edit-site/src/components/editor/index.js b/packages/edit-site/src/components/editor/index.js
@@ -56,6 +56,7 @@ function Editor( { initialSettings } ) {
 		templateType,
 		page,
 		template,
+		templateResolved,
 		isNavigationOpen,
 	} = useSelect( ( select ) => {
 		const {
@@ -67,6 +68,7 @@ function Editor( { initialSettings } ) {
 			getPage,
 			isNavigationOpened,
 		} = select( editSiteStore );
+		const { hasFinishedResolution, getEntityRecord } = select( coreStore );
 		const postType = getEditedPostType();
 		const postId = getEditedPostId();
 
@@ -81,12 +83,15 @@ function Editor( { initialSettings } ) {
 			templateType: postType,
 			page: getPage(),
 			template: postId
-				? select( coreStore ).getEntityRecord(
+				? getEntityRecord( 'postType', postType, postId )
+				: null,
+			templateResolved: postId
+				? hasFinishedResolution( 'getEntityRecord', [
 						'postType',
 						postType,
-						postId
-				  )
-				: null,
+						postId,
+				  ] )
+				: false,
 			entityId: postId,
 			isNavigationOpen: isNavigationOpened(),
 		};
@@ -225,7 +230,8 @@ function Editor( { initialSettings } ) {
 														}
 													/>
 												) }
-												{ ! template &&
+												{ templateResolved &&
+													! template &&
 													settings?.siteUrl &&
 													entityId && (
 														<Notice