From 01daa62add627982684a24f13aebceb7c317fc10 Mon Sep 17 00:00:00 2001
From: Addison-Stavlo <stavz01@gmail.com>
Date: Tue, 11 May 2021 14:46:57 -0400
Subject: [PATCH 1/9] filter out current entity, apply message where necessary

---
 .../src/template-part/edit/index.js           |  1 +
 .../src/template-part/edit/selection/index.js |  2 +
 .../edit/selection/template-part-previews.js  | 48 ++++++++++++++-----
 3 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/packages/block-library/src/template-part/edit/index.js b/packages/block-library/src/template-part/edit/index.js
index ca7ff8aded12a7..84508d297c6b00 100644
--- a/packages/block-library/src/template-part/edit/index.js
+++ b/packages/block-library/src/template-part/edit/index.js
@@ -164,6 +164,7 @@ export default function TemplatePartEdit( {
 									setAttributes={ setAttributes }
 									onClose={ onClose }
 									area={ area }
+									templatePartId={ templatePartId }
 								/>
 							) }
 						/>
diff --git a/packages/block-library/src/template-part/edit/selection/index.js b/packages/block-library/src/template-part/edit/selection/index.js
index 93a39b8c3bec21..2ed5ac835f81f2 100644
--- a/packages/block-library/src/template-part/edit/selection/index.js
+++ b/packages/block-library/src/template-part/edit/selection/index.js
@@ -26,6 +26,7 @@ export default function TemplatePartSelection( {
 	setAttributes,
 	onClose,
 	area,
+	templatePartId = null,
 } ) {
 	const [ filterValue, setFilterValue ] = useState( '' );
 	return (
@@ -44,6 +45,7 @@ export default function TemplatePartSelection( {
 					filterValue={ filterValue }
 					onClose={ onClose }
 					area={ area }
+					templatePartId={ templatePartId }
 				/>
 			</div>
 		</div>
diff --git a/packages/block-library/src/template-part/edit/selection/template-part-previews.js b/packages/block-library/src/template-part/edit/selection/template-part-previews.js
index 90509ce3eda162..96ee91f057c54c 100644
--- a/packages/block-library/src/template-part/edit/selection/template-part-previews.js
+++ b/packages/block-library/src/template-part/edit/selection/template-part-previews.js
@@ -111,23 +111,37 @@ function TemplatePartsByArea( {
 	area = 'uncategorized',
 	labelsByArea,
 } ) {
+	const templatePartsToShow =
+		templateParts.filter(
+			( templatePart ) =>
+				'uncategorized' === area || templatePart.area === area
+		) || [];
 	const templatePartsByArea = useMemo( () => {
-		return Object.values( groupBy( templateParts, 'area' ) );
+		return Object.values( groupBy( templatePartsToShow, 'area' ) );
 	}, [ templateParts, area ] );
+
 	const currentShownTPs = useAsyncList( templateParts );
 
+	if ( ! templatePartsToShow.length ) {
+		return (
+			<PanelGroup
+				title={ `${ __( 'Area' ) }: ${ labelsByArea[ area ] }` }
+			>
+				{ __(
+					'There are no other template parts of this area. If you are looking for another type of template part, try searchnig for it using the input above.'
+				) }
+			</PanelGroup>
+		);
+	}
+
 	return templatePartsByArea.map( ( templatePartList ) => {
-		// Only return corresponding area if block/entity is not uncategorized/general version.
-		if ( 'uncategorized' !== area && templatePartList[ 0 ].area !== area ) {
-			return null;
-		}
 		return (
 			<PanelGroup
 				key={ templatePartList[ 0 ].area }
-				title={
+				title={ `${ __( 'Area' ) }: ${
 					labelsByArea[ templatePartList[ 0 ].area ] ||
 					__( 'General' )
-				}
+				}` }
 			>
 				{ templatePartList.map( ( templatePart ) => {
 					return currentShownTPs.includes( templatePart ) ? (
@@ -222,7 +236,9 @@ function TemplatePartSearchResults( {
 	return groupedResults.map( ( group ) => (
 		<PanelGroup
 			key={ group[ 0 ].id }
-			title={ labelsByArea[ group[ 0 ].area ] || __( 'General' ) }
+			title={ `${ __( 'Area' ) }: ${
+				labelsByArea[ group[ 0 ].area ] || __( 'General' )
+			}` }
 		>
 			{ group.map( ( templatePart ) =>
 				currentShownTPs.includes( templatePart ) ? (
@@ -246,18 +262,24 @@ export default function TemplatePartPreviews( {
 	filterValue,
 	onClose,
 	area,
+	templatePartId,
 } ) {
 	const composite = useCompositeState();
 
 	const { templateParts, labelsByArea } = useSelect( ( select ) => {
-		const _templateParts =
+		const _templateParts = (
 			select( coreStore ).getEntityRecords(
 				'postType',
 				'wp_template_part',
 				{
 					per_page: -1,
 				}
-			) || [];
+			) || []
+		).filter(
+			( templatePart ) =>
+				`${ templatePart.theme }//${ templatePart.slug }` !==
+				templatePartId
+		);
 
 		const definedAreas = select(
 			editorStore
@@ -274,7 +296,11 @@ export default function TemplatePartPreviews( {
 	}, [] );
 
 	if ( ! templateParts || ! templateParts.length ) {
-		return null;
+		return (
+			<PanelGroup>
+				{ __( 'There are no existing template parts to select.' ) }
+			</PanelGroup>
+		);
 	}
 
 	if ( filterValue ) {

From a47dad825fd8e90c13b31a2ff41da6ee9f33df51 Mon Sep 17 00:00:00 2001
From: Addison-Stavlo <stavz01@gmail.com>
Date: Thu, 13 May 2021 10:32:21 -0400
Subject: [PATCH 2/9] hide replace button when no options exist

---
 .../src/template-part/edit/index.js           | 29 +++++++--
 .../template-part/edit/placeholder/index.js   | 17 ++---
 .../edit/selection/template-part-previews.js  | 63 ++++++++++---------
 .../edit/utils/create-template-part-id.js     | 10 +++
 4 files changed, 78 insertions(+), 41 deletions(-)
 create mode 100644 packages/block-library/src/template-part/edit/utils/create-template-part-id.js

diff --git a/packages/block-library/src/template-part/edit/index.js b/packages/block-library/src/template-part/edit/index.js
index 84508d297c6b00..e4767271d83cad 100644
--- a/packages/block-library/src/template-part/edit/index.js
+++ b/packages/block-library/src/template-part/edit/index.js
@@ -26,6 +26,7 @@ import TemplatePartPlaceholder from './placeholder';
 import TemplatePartSelection from './selection';
 import { TemplatePartAdvancedControls } from './advanced-controls';
 import TemplatePartInnerBlocks from './inner-blocks';
+import { createTemplatePartId } from './utils/create-template-part-id';
 
 export default function TemplatePartEdit( {
 	attributes,
@@ -33,7 +34,7 @@ export default function TemplatePartEdit( {
 	clientId,
 } ) {
 	const { slug, theme, tagName, layout = {} } = attributes;
-	const templatePartId = theme && slug ? theme + '//' + slug : null;
+	const templatePartId = createTemplatePartId( slug, theme );
 
 	const [ hasAlreadyRendered, RecursionProvider ] = useNoRecursiveRenders(
 		templatePartId
@@ -48,11 +49,14 @@ export default function TemplatePartEdit( {
 		isMissing,
 		defaultWrapper,
 		area,
+		enableSelection,
 	} = useSelect(
 		( select ) => {
-			const { getEditedEntityRecord, hasFinishedResolution } = select(
-				coreStore
-			);
+			const {
+				getEditedEntityRecord,
+				getEntityRecords,
+				hasFinishedResolution,
+			} = select( coreStore );
 			const { getBlocks } = select( blockEditorStore );
 
 			const getEntityArgs = [
@@ -65,6 +69,19 @@ export default function TemplatePartEdit( {
 				: null;
 			const _area = entityRecord?.area || attributes.area;
 
+			// Check whether other entities exist for switching/selection.
+			const availableReplacementArgs = [
+				'postType',
+				'wp_template_part',
+				_area && 'uncategorized' !== _area && { area: _area },
+			];
+			const matchingReplacements = getEntityRecords(
+				...availableReplacementArgs
+			);
+			const _enableSelection = templatePartId
+				? matchingReplacements?.length > 1
+				: matchingReplacements?.length;
+
 			const hasResolvedEntity = templatePartId
 				? hasFinishedResolution(
 						'getEditedEntityRecord',
@@ -82,6 +99,7 @@ export default function TemplatePartEdit( {
 				isMissing: hasResolvedEntity && ! entityRecord,
 				defaultWrapper: defaultWrapperElement || 'div',
 				area: _area,
+				enableSelection: _enableSelection,
 			};
 		},
 		[ templatePartId, clientId ]
@@ -138,10 +156,11 @@ export default function TemplatePartEdit( {
 						area={ attributes.area }
 						clientId={ clientId }
 						setAttributes={ setAttributes }
+						enableSelection={ enableSelection }
 					/>
 				</TagName>
 			) }
-			{ isEntityAvailable && (
+			{ isEntityAvailable && enableSelection && (
 				<BlockControls>
 					<ToolbarGroup className="wp-block-template-part__block-control-group">
 						<Dropdown
diff --git a/packages/block-library/src/template-part/edit/placeholder/index.js b/packages/block-library/src/template-part/edit/placeholder/index.js
index 8de0d6e731fa6c..074107935949d1 100644
--- a/packages/block-library/src/template-part/edit/placeholder/index.js
+++ b/packages/block-library/src/template-part/edit/placeholder/index.js
@@ -24,6 +24,7 @@ export default function TemplatePartPlaceholder( {
 	area,
 	clientId,
 	setAttributes,
+	enableSelection,
 } ) {
 	const { saveEntityRecord } = useDispatch( coreStore );
 	const [ step, setStep ] = useState( PLACEHOLDER_STEPS.initial );
@@ -72,13 +73,15 @@ export default function TemplatePartPlaceholder( {
 						position="bottom right left"
 						renderToggle={ ( { isOpen, onToggle } ) => (
 							<>
-								<Button
-									isPrimary
-									onClick={ onToggle }
-									aria-expanded={ isOpen }
-								>
-									{ __( 'Choose existing' ) }
-								</Button>
+								{ enableSelection && (
+									<Button
+										isPrimary
+										onClick={ onToggle }
+										aria-expanded={ isOpen }
+									>
+										{ __( 'Choose existing' ) }
+									</Button>
+								) }
 								<Button
 									isTertiary
 									onClick={ () =>
diff --git a/packages/block-library/src/template-part/edit/selection/template-part-previews.js b/packages/block-library/src/template-part/edit/selection/template-part-previews.js
index 96ee91f057c54c..669a9358f14e64 100644
--- a/packages/block-library/src/template-part/edit/selection/template-part-previews.js
+++ b/packages/block-library/src/template-part/edit/selection/template-part-previews.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { groupBy, deburr } from 'lodash';
+import { groupBy, deburr, flatten } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -22,6 +22,10 @@ import { useAsyncList } from '@wordpress/compose';
 import { store as noticesStore } from '@wordpress/notices';
 import { store as coreStore } from '@wordpress/core-data';
 import { store as editorStore } from '@wordpress/editor';
+/**
+ * Internal dependencies
+ */
+import { createTemplatePartId } from '../utils/create-template-part-id';
 
 function PreviewPlaceholder() {
 	return (
@@ -111,37 +115,34 @@ function TemplatePartsByArea( {
 	area = 'uncategorized',
 	labelsByArea,
 } ) {
-	const templatePartsToShow =
-		templateParts.filter(
-			( templatePart ) =>
-				'uncategorized' === area || templatePart.area === area
-		) || [];
-	const templatePartsByArea = useMemo( () => {
-		return Object.values( groupBy( templatePartsToShow, 'area' ) );
+	const { templatePartsByArea, templatePartsToShow } = useMemo( () => {
+		const _templatePartsToShow =
+			templateParts.filter(
+				( templatePart ) =>
+					'uncategorized' === area || templatePart.area === area
+			) || [];
+		const _templatePartsByArea = Object.values(
+			groupBy( _templatePartsToShow, 'area' )
+		);
+		const orderedTemplatePartsToShow = flatten( _templatePartsToShow );
+		return {
+			templatePartsByArea: _templatePartsByArea,
+			templatePartsToShow: orderedTemplatePartsToShow,
+		};
 	}, [ templateParts, area ] );
 
-	const currentShownTPs = useAsyncList( templateParts );
-
-	if ( ! templatePartsToShow.length ) {
-		return (
-			<PanelGroup
-				title={ `${ __( 'Area' ) }: ${ labelsByArea[ area ] }` }
-			>
-				{ __(
-					'There are no other template parts of this area. If you are looking for another type of template part, try searchnig for it using the input above.'
-				) }
-			</PanelGroup>
-		);
-	}
+	const currentShownTPs = useAsyncList( templatePartsToShow );
 
 	return templatePartsByArea.map( ( templatePartList ) => {
 		return (
 			<PanelGroup
 				key={ templatePartList[ 0 ].area }
-				title={ `${ __( 'Area' ) }: ${
+				title={ sprintf(
+					// Translators: for the area the template part is assigned to (Header, Footer, General, etc.)
+					__( 'Area: %s' ),
 					labelsByArea[ templatePartList[ 0 ].area ] ||
-					__( 'General' )
-				}` }
+						labelsByArea.uncategorized
+				) }
 			>
 				{ templatePartList.map( ( templatePart ) => {
 					return currentShownTPs.includes( templatePart ) ? (
@@ -236,9 +237,11 @@ function TemplatePartSearchResults( {
 	return groupedResults.map( ( group ) => (
 		<PanelGroup
 			key={ group[ 0 ].id }
-			title={ `${ __( 'Area' ) }: ${
-				labelsByArea[ group[ 0 ].area ] || __( 'General' )
-			}` }
+			title={ sprintf(
+				// Translators: for the area the template part is assigned to (Header, Footer, General, etc.)
+				__( 'Area: %s' ),
+				labelsByArea[ group[ 0 ].area ] || labelsByArea.uncategorized
+			) }
 		>
 			{ group.map( ( templatePart ) =>
 				currentShownTPs.includes( templatePart ) ? (
@@ -277,8 +280,10 @@ export default function TemplatePartPreviews( {
 			) || []
 		).filter(
 			( templatePart ) =>
-				`${ templatePart.theme }//${ templatePart.slug }` !==
-				templatePartId
+				createTemplatePartId(
+					templatePart.slug,
+					templatePart.theme
+				) !== templatePartId
 		);
 
 		const definedAreas = select(
diff --git a/packages/block-library/src/template-part/edit/utils/create-template-part-id.js b/packages/block-library/src/template-part/edit/utils/create-template-part-id.js
new file mode 100644
index 00000000000000..fff472b7fa79c4
--- /dev/null
+++ b/packages/block-library/src/template-part/edit/utils/create-template-part-id.js
@@ -0,0 +1,10 @@
+/**
+ * Generates a template part Id based on slug and theme inputs.
+ *
+ * @param {string} slug the template part's slug
+ * @param {string} theme the template part's theme.
+ * @return {string|null} the template part's Id.
+ */
+export function createTemplatePartId( slug, theme ) {
+	return theme && slug ? theme + '//' + slug : null;
+}

From ab3294471c11d7530b96ea8bc2c38cf3917c1369 Mon Sep 17 00:00:00 2001
From: Addison-Stavlo <stavz01@gmail.com>
Date: Thu, 13 May 2021 13:47:10 -0400
Subject: [PATCH 3/9] ensure boolean for enableSelection

---
 packages/block-library/src/template-part/edit/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/template-part/edit/index.js b/packages/block-library/src/template-part/edit/index.js
index e4767271d83cad..32e9dac6279b25 100644
--- a/packages/block-library/src/template-part/edit/index.js
+++ b/packages/block-library/src/template-part/edit/index.js
@@ -80,7 +80,7 @@ export default function TemplatePartEdit( {
 			);
 			const _enableSelection = templatePartId
 				? matchingReplacements?.length > 1
-				: matchingReplacements?.length;
+				: matchingReplacements?.length > 0;
 
 			const hasResolvedEntity = templatePartId
 				? hasFinishedResolution(

From 25b777f921ae8900bb1d90f87a6a0e6850e20541 Mon Sep 17 00:00:00 2001
From: Addison-Stavlo <stavz01@gmail.com>
Date: Thu, 13 May 2021 13:53:50 -0400
Subject: [PATCH 4/9] reverse params on createTemplatePartId function

---
 packages/block-library/src/template-part/edit/index.js        | 2 +-
 .../template-part/edit/selection/template-part-previews.js    | 4 ++--
 .../src/template-part/edit/utils/create-template-part-id.js   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/block-library/src/template-part/edit/index.js b/packages/block-library/src/template-part/edit/index.js
index 32e9dac6279b25..a4b6a62767cff2 100644
--- a/packages/block-library/src/template-part/edit/index.js
+++ b/packages/block-library/src/template-part/edit/index.js
@@ -34,7 +34,7 @@ export default function TemplatePartEdit( {
 	clientId,
 } ) {
 	const { slug, theme, tagName, layout = {} } = attributes;
-	const templatePartId = createTemplatePartId( slug, theme );
+	const templatePartId = createTemplatePartId( theme, slug );
 
 	const [ hasAlreadyRendered, RecursionProvider ] = useNoRecursiveRenders(
 		templatePartId
diff --git a/packages/block-library/src/template-part/edit/selection/template-part-previews.js b/packages/block-library/src/template-part/edit/selection/template-part-previews.js
index 669a9358f14e64..06dafee1b83aaa 100644
--- a/packages/block-library/src/template-part/edit/selection/template-part-previews.js
+++ b/packages/block-library/src/template-part/edit/selection/template-part-previews.js
@@ -281,8 +281,8 @@ export default function TemplatePartPreviews( {
 		).filter(
 			( templatePart ) =>
 				createTemplatePartId(
-					templatePart.slug,
-					templatePart.theme
+					templatePart.theme,
+					templatePart.slug
 				) !== templatePartId
 		);
 
diff --git a/packages/block-library/src/template-part/edit/utils/create-template-part-id.js b/packages/block-library/src/template-part/edit/utils/create-template-part-id.js
index fff472b7fa79c4..1612fa32f9c403 100644
--- a/packages/block-library/src/template-part/edit/utils/create-template-part-id.js
+++ b/packages/block-library/src/template-part/edit/utils/create-template-part-id.js
@@ -1,10 +1,10 @@
 /**
  * Generates a template part Id based on slug and theme inputs.
  *
- * @param {string} slug the template part's slug
  * @param {string} theme the template part's theme.
+ * @param {string} slug the template part's slug
  * @return {string|null} the template part's Id.
  */
-export function createTemplatePartId( slug, theme ) {
+export function createTemplatePartId( theme, slug ) {
 	return theme && slug ? theme + '//' + slug : null;
 }

From 26f3c5c5719a3b9a15e51dfa0b77a32821ac8c4b Mon Sep 17 00:00:00 2001
From: Addison-Stavlo <stavz01@gmail.com>
Date: Thu, 13 May 2021 14:32:13 -0400
Subject: [PATCH 5/9] refactor group title translation to helper function,
 re-add fallback we should never see

---
 .../edit/selection/template-part-previews.js  | 33 +++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/packages/block-library/src/template-part/edit/selection/template-part-previews.js b/packages/block-library/src/template-part/edit/selection/template-part-previews.js
index 06dafee1b83aaa..8c0da142d339fb 100644
--- a/packages/block-library/src/template-part/edit/selection/template-part-previews.js
+++ b/packages/block-library/src/template-part/edit/selection/template-part-previews.js
@@ -27,6 +27,13 @@ import { store as editorStore } from '@wordpress/editor';
  */
 import { createTemplatePartId } from '../utils/create-template-part-id';
 
+function getAreaGroupTitle( areaLabel ) {
+	return sprintf(
+		// Translators: %s for the area the template part is assigned to (Header, Footer, General, etc.)
+		__( 'Area: %s' ),
+		areaLabel
+	);
+}
 function PreviewPlaceholder() {
 	return (
 		<div
@@ -133,13 +140,29 @@ function TemplatePartsByArea( {
 
 	const currentShownTPs = useAsyncList( templatePartsToShow );
 
+	if ( ! templatePartsToShow.length ) {
+		return (
+			<PanelGroup
+				title={ getAreaGroupTitle(
+					labelsByArea[ area ] || labelsByArea.uncategorized
+				) }
+			>
+				{ sprintf(
+					// Translators: %s for the template part variation ("Header", "Footer", "Template Part").
+					'There is no other %s available. If you are looking for another type of template part, try searching for it using the input above.',
+					area && area !== 'uncategorized'
+						? labelsByArea[ area ] || area
+						: __( 'Template Part' )
+				) }
+			</PanelGroup>
+		);
+	}
+
 	return templatePartsByArea.map( ( templatePartList ) => {
 		return (
 			<PanelGroup
 				key={ templatePartList[ 0 ].area }
-				title={ sprintf(
-					// Translators: for the area the template part is assigned to (Header, Footer, General, etc.)
-					__( 'Area: %s' ),
+				title={ getAreaGroupTitle(
 					labelsByArea[ templatePartList[ 0 ].area ] ||
 						labelsByArea.uncategorized
 				) }
@@ -237,9 +260,7 @@ function TemplatePartSearchResults( {
 	return groupedResults.map( ( group ) => (
 		<PanelGroup
 			key={ group[ 0 ].id }
-			title={ sprintf(
-				// Translators: for the area the template part is assigned to (Header, Footer, General, etc.)
-				__( 'Area: %s' ),
+			title={ getAreaGroupTitle(
 				labelsByArea[ group[ 0 ].area ] || labelsByArea.uncategorized
 			) }
 		>

From 36119e8912b796f402965ceb15a936180cb03fcb Mon Sep 17 00:00:00 2001
From: Addison-Stavlo <stavz01@gmail.com>
Date: Fri, 14 May 2021 10:05:43 -0400
Subject: [PATCH 6/9] make new button primary when the only button

---
 .../block-library/src/template-part/edit/placeholder/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/template-part/edit/placeholder/index.js b/packages/block-library/src/template-part/edit/placeholder/index.js
index 074107935949d1..8acc8ebec7b572 100644
--- a/packages/block-library/src/template-part/edit/placeholder/index.js
+++ b/packages/block-library/src/template-part/edit/placeholder/index.js
@@ -83,7 +83,9 @@ export default function TemplatePartPlaceholder( {
 									</Button>
 								) }
 								<Button
-									isTertiary
+									{ ...( enableSelection
+										? { isTertiary: true }
+										: { isPrimary: true } ) }
 									onClick={ () =>
 										setStep( PLACEHOLDER_STEPS.patterns )
 									}

From 395715622f96d730e4e30c95db3b7f5241f49584 Mon Sep 17 00:00:00 2001
From: Addison-Stavlo <stavz01@gmail.com>
Date: Fri, 14 May 2021 13:12:37 -0400
Subject: [PATCH 7/9] contextual instructions based on options

---
 .../src/template-part/edit/placeholder/index.js        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/block-library/src/template-part/edit/placeholder/index.js b/packages/block-library/src/template-part/edit/placeholder/index.js
index 8acc8ebec7b572..f5ab2d48308b70 100644
--- a/packages/block-library/src/template-part/edit/placeholder/index.js
+++ b/packages/block-library/src/template-part/edit/placeholder/index.js
@@ -64,9 +64,13 @@ export default function TemplatePartPlaceholder( {
 				<Placeholder
 					icon={ blockDefault }
 					label={ __( 'Template Part' ) }
-					instructions={ __(
-						'Create a new template part or pick an existing one from the list.'
-					) }
+					instructions={
+						enableSelection
+							? __(
+									'Create a new template part or pick an existing one from the list.'
+							  )
+							: __( 'Create a new template part.' )
+					}
 				>
 					<Dropdown
 						contentClassName="wp-block-template-part__placeholder-preview-dropdown-content"

From 247023214127cc1c5fe09aca98c370266464a377 Mon Sep 17 00:00:00 2001
From: Addison-Stavlo <stavz01@gmail.com>
Date: Fri, 14 May 2021 15:19:02 -0400
Subject: [PATCH 8/9] fix test

---
 packages/e2e-tests/specs/experiments/template-part.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/e2e-tests/specs/experiments/template-part.test.js b/packages/e2e-tests/specs/experiments/template-part.test.js
index ea6a3fa74caf35..6c0bf3a4b26440 100644
--- a/packages/e2e-tests/specs/experiments/template-part.test.js
+++ b/packages/e2e-tests/specs/experiments/template-part.test.js
@@ -297,7 +297,7 @@ describe( 'Template Part', () => {
 			await createNewPost();
 			// Try to insert the template part we created.
 			await insertBlock( 'Template Part' );
-			const [ chooseExistingButton ] = await page.$x(
+			const chooseExistingButton = await page.waitForXPath(
 				chooseExistingButtonSelector
 			);
 			await chooseExistingButton.click();

From 6726ea12b3322c2b80b93f7ae36755ce0182b3ed Mon Sep 17 00:00:00 2001
From: Addison-Stavlo <stavz01@gmail.com>
Date: Fri, 14 May 2021 16:07:34 -0400
Subject: [PATCH 9/9] fix other test

---
 packages/e2e-tests/specs/experiments/template-part.test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/e2e-tests/specs/experiments/template-part.test.js b/packages/e2e-tests/specs/experiments/template-part.test.js
index 6c0bf3a4b26440..4f86248fd79b5e 100644
--- a/packages/e2e-tests/specs/experiments/template-part.test.js
+++ b/packages/e2e-tests/specs/experiments/template-part.test.js
@@ -277,6 +277,7 @@ describe( 'Template Part', () => {
 			await disablePrePublishChecks();
 			// Create new template part.
 			await insertBlock( 'Template Part' );
+			await page.waitForXPath( chooseExistingButtonSelector );
 			const [ createNewButton ] = await page.$x(
 				createNewButtonSelector
 			);