From 0d2f566dfb7fc209f5e624b07d5f82bb1d31f7fb Mon Sep 17 00:00:00 2001
From: Aki Hamano <tetsuaki.hamano@gmail.com>
Date: Fri, 23 Aug 2024 01:00:55 +0900
Subject: [PATCH 1/2] Template Part: Hide Advanced panel for non-admin users

---
 .../template-part/edit/advanced-controls.js   | 44 ++++++++-----------
 .../src/template-part/edit/index.js           | 21 ++++-----
 2 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/packages/block-library/src/template-part/edit/advanced-controls.js b/packages/block-library/src/template-part/edit/advanced-controls.js
index 0a2b8bebbf4fc..fd6aba819e9c8 100644
--- a/packages/block-library/src/template-part/edit/advanced-controls.js
+++ b/packages/block-library/src/template-part/edit/advanced-controls.js
@@ -35,7 +35,6 @@ const htmlElementMessages = {
 export function TemplatePartAdvancedControls( {
 	tagName,
 	setAttributes,
-	isEntityAvailable,
 	templatePartId,
 	defaultWrapper,
 	hasInnerBlocks,
@@ -70,30 +69,25 @@ export function TemplatePartAdvancedControls( {
 
 	return (
 		<>
-			{ isEntityAvailable && (
-				<>
-					<TextControl
-						__next40pxDefaultSize
-						__nextHasNoMarginBottom
-						label={ __( 'Title' ) }
-						value={ title }
-						onChange={ ( value ) => {
-							setTitle( value );
-						} }
-						onFocus={ ( event ) => event.target.select() }
-					/>
-
-					<SelectControl
-						__next40pxDefaultSize
-						__nextHasNoMarginBottom
-						label={ __( 'Area' ) }
-						labelPosition="top"
-						options={ areaOptions }
-						value={ area }
-						onChange={ setArea }
-					/>
-				</>
-			) }
+			<TextControl
+				__next40pxDefaultSize
+				__nextHasNoMarginBottom
+				label={ __( 'Title' ) }
+				value={ title }
+				onChange={ ( value ) => {
+					setTitle( value );
+				} }
+				onFocus={ ( event ) => event.target.select() }
+			/>
+			<SelectControl
+				__next40pxDefaultSize
+				__nextHasNoMarginBottom
+				label={ __( 'Area' ) }
+				labelPosition="top"
+				options={ areaOptions }
+				value={ area }
+				onChange={ setArea }
+			/>
 			<SelectControl
 				__nextHasNoMarginBottom
 				__next40pxDefaultSize
diff --git a/packages/block-library/src/template-part/edit/index.js b/packages/block-library/src/template-part/edit/index.js
index ba3e8f57136d6..3fde14a556e5b 100644
--- a/packages/block-library/src/template-part/edit/index.js
+++ b/packages/block-library/src/template-part/edit/index.js
@@ -254,16 +254,17 @@ export default function TemplatePartEdit( {
 							</ToolbarButton>
 						</BlockControls>
 					) }
-				<InspectorControls group="advanced">
-					<TemplatePartAdvancedControls
-						tagName={ tagName }
-						setAttributes={ setAttributes }
-						isEntityAvailable={ isEntityAvailable }
-						templatePartId={ templatePartId }
-						defaultWrapper={ areaObject.tagName }
-						hasInnerBlocks={ hasInnerBlocks }
-					/>
-				</InspectorControls>
+				{ isEntityAvailable && canUserEdit && (
+					<InspectorControls group="advanced">
+						<TemplatePartAdvancedControls
+							tagName={ tagName }
+							setAttributes={ setAttributes }
+							templatePartId={ templatePartId }
+							defaultWrapper={ areaObject.tagName }
+							hasInnerBlocks={ hasInnerBlocks }
+						/>
+					</InspectorControls>
+				) }
 				{ isPlaceholder && (
 					<TagName { ...blockProps }>
 						<TemplatePartPlaceholder

From 163f319bd061a23b218d8075e379c014f41f7539 Mon Sep 17 00:00:00 2001
From: Aki Hamano <tetsuaki.hamano@gmail.com>
Date: Fri, 23 Aug 2024 10:24:35 +0900
Subject: [PATCH 2/2] Restore original conditional statement

---
 .../template-part/edit/advanced-controls.js   | 43 +++++++++++--------
 .../src/template-part/edit/index.js           |  3 +-
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/packages/block-library/src/template-part/edit/advanced-controls.js b/packages/block-library/src/template-part/edit/advanced-controls.js
index fd6aba819e9c8..3c319a7ec0fe7 100644
--- a/packages/block-library/src/template-part/edit/advanced-controls.js
+++ b/packages/block-library/src/template-part/edit/advanced-controls.js
@@ -35,6 +35,7 @@ const htmlElementMessages = {
 export function TemplatePartAdvancedControls( {
 	tagName,
 	setAttributes,
+	isEntityAvailable,
 	templatePartId,
 	defaultWrapper,
 	hasInnerBlocks,
@@ -69,25 +70,29 @@ export function TemplatePartAdvancedControls( {
 
 	return (
 		<>
-			<TextControl
-				__next40pxDefaultSize
-				__nextHasNoMarginBottom
-				label={ __( 'Title' ) }
-				value={ title }
-				onChange={ ( value ) => {
-					setTitle( value );
-				} }
-				onFocus={ ( event ) => event.target.select() }
-			/>
-			<SelectControl
-				__next40pxDefaultSize
-				__nextHasNoMarginBottom
-				label={ __( 'Area' ) }
-				labelPosition="top"
-				options={ areaOptions }
-				value={ area }
-				onChange={ setArea }
-			/>
+			{ isEntityAvailable && (
+				<>
+					<TextControl
+						__next40pxDefaultSize
+						__nextHasNoMarginBottom
+						label={ __( 'Title' ) }
+						value={ title }
+						onChange={ ( value ) => {
+							setTitle( value );
+						} }
+						onFocus={ ( event ) => event.target.select() }
+					/>
+					<SelectControl
+						__next40pxDefaultSize
+						__nextHasNoMarginBottom
+						label={ __( 'Area' ) }
+						labelPosition="top"
+						options={ areaOptions }
+						value={ area }
+						onChange={ setArea }
+					/>
+				</>
+			) }
 			<SelectControl
 				__nextHasNoMarginBottom
 				__next40pxDefaultSize
diff --git a/packages/block-library/src/template-part/edit/index.js b/packages/block-library/src/template-part/edit/index.js
index 3fde14a556e5b..951f875143b0f 100644
--- a/packages/block-library/src/template-part/edit/index.js
+++ b/packages/block-library/src/template-part/edit/index.js
@@ -254,11 +254,12 @@ export default function TemplatePartEdit( {
 							</ToolbarButton>
 						</BlockControls>
 					) }
-				{ isEntityAvailable && canUserEdit && (
+				{ canUserEdit && (
 					<InspectorControls group="advanced">
 						<TemplatePartAdvancedControls
 							tagName={ tagName }
 							setAttributes={ setAttributes }
+							isEntityAvailable={ isEntityAvailable }
 							templatePartId={ templatePartId }
 							defaultWrapper={ areaObject.tagName }
 							hasInnerBlocks={ hasInnerBlocks }