From 974f7ff210431c65be681e38ebc1e191f080e3d5 Mon Sep 17 00:00:00 2001
From: Jacopo Tomasone <Copons@users.noreply.github.com>
Date: Tue, 24 Nov 2020 18:37:22 +0000
Subject: [PATCH] Site Editor: Update the new templates dropdown list (#27235)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update the new template dropdown list to only show a hand-picked list of templates — if they are missing from the current site/theme.
Also hide the new template button if there are no more missing templates to be added.
---
 .../navigation-sidebar/navigation-panel/constants.js   | 10 ++++++++++
 .../navigation-panel/new-template-dropdown.js          | 10 ++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/packages/edit-site/src/components/navigation-sidebar/navigation-panel/constants.js b/packages/edit-site/src/components/navigation-sidebar/navigation-panel/constants.js
index 5738942e4779d..e0201af342097 100644
--- a/packages/edit-site/src/components/navigation-sidebar/navigation-panel/constants.js
+++ b/packages/edit-site/src/components/navigation-sidebar/navigation-panel/constants.js
@@ -11,6 +11,16 @@ export const TEMPLATES_POSTS = [ 'home', 'single' ];
 
 export const TEMPLATES_STATUSES = [ 'publish', 'draft', 'auto-draft' ];
 
+export const TEMPLATES_NEW_OPTIONS = [
+	'front-page',
+	'single-post',
+	'page',
+	'archive',
+	'search',
+	'404',
+	'index',
+];
+
 export const MENU_ROOT = 'root';
 export const MENU_CONTENT_CATEGORIES = 'content-categories';
 export const MENU_CONTENT_PAGES = 'content-pages';
diff --git a/packages/edit-site/src/components/navigation-sidebar/navigation-panel/new-template-dropdown.js b/packages/edit-site/src/components/navigation-sidebar/navigation-panel/new-template-dropdown.js
index c20afcf5f0e8c..c428472a051f2 100644
--- a/packages/edit-site/src/components/navigation-sidebar/navigation-panel/new-template-dropdown.js
+++ b/packages/edit-site/src/components/navigation-sidebar/navigation-panel/new-template-dropdown.js
@@ -20,7 +20,7 @@ import { Icon, plus } from '@wordpress/icons';
  * Internal dependencies
  */
 import getClosestAvailableTemplate from '../../../utils/get-closest-available-template';
-import { TEMPLATES_STATUSES } from './constants';
+import { TEMPLATES_NEW_OPTIONS, TEMPLATES_STATUSES } from './constants';
 
 export default function NewTemplateDropdown() {
 	const { defaultTemplateTypes, templates } = useSelect( ( select ) => {
@@ -59,9 +59,15 @@ export default function NewTemplateDropdown() {
 
 	const missingTemplates = filter(
 		defaultTemplateTypes,
-		( template ) => ! includes( existingTemplateSlugs, template.slug )
+		( template ) =>
+			includes( TEMPLATES_NEW_OPTIONS, template.slug ) &&
+			! includes( existingTemplateSlugs, template.slug )
 	);
 
+	if ( ! missingTemplates.length ) {
+		return null;
+	}
+
 	return (
 		<DropdownMenu
 			className="edit-site-navigation-panel__new-template-dropdown"