Nav sidebar: exclude the latest posts page (#44379)

Automattic · Jul 23, 2020 · 60922eb · 60922eb
1 parent 5012986
commit 60922eb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/...te-editing-plugin/wpcom-block-editor-nav-sidebar/class-wpcom-block-editor-nav-sidebar.php b/...te-editing-plugin/wpcom-block-editor-nav-sidebar/class-wpcom-block-editor-nav-sidebar.php
@@ -59,11 +59,20 @@ public function enqueue_script_and_style() {
 			plugins_url( 'dist/', __FILE__ )
 		);
 
+		$post_ids_to_exclude = array();
+
+		// Only exclude page_for_posts when a static page is being used as the front page, because
+		// page_for_posts can be a valid id even when showing a traditional blog page on front.
+		if ( 'page' === get_option( 'show_on_front' ) ) {
+			$post_ids_to_exclude[] = get_option( 'page_for_posts' );
+		}
+
 		wp_localize_script(
 			'wpcom-block-editor-nav-sidebar-script',
 			'wpcomBlockEditorNavSidebar',
 			array(
-				'homeUrl' => home_url(),
+				'homeUrl'          => home_url(),
+				'postIdsToExclude' => $post_ids_to_exclude,
 			)
 		);
 

diff --git a/...l-site-editing-plugin/wpcom-block-editor-nav-sidebar/src/components/nav-sidebar/index.tsx b/...l-site-editing-plugin/wpcom-block-editor-nav-sidebar/src/components/nav-sidebar/index.tsx
@@ -21,7 +21,7 @@ import { compose } from '@wordpress/compose';
 /**
  * Internal dependencies
  */
-import { STORE_KEY, SITE_HOME_URL } from '../../constants';
+import { STORE_KEY, SITE_HOME_URL, POST_IDS_TO_EXCLUDE } from '../../constants';
 import CreatePage from '../create-page';
 import NavItem from '../nav-item';
 import { Post } from '../../types';
@@ -273,7 +273,7 @@ function useNavItems(): Post[] {
 		const items =
 			select( 'core' ).getEntityRecords( 'postType', currentPostType, {
 				_fields: 'id,status,title',
-				exclude: [ currentPostId ],
+				exclude: [ currentPostId, ...POST_IDS_TO_EXCLUDE ],
 				orderby: 'modified',
 				per_page: 10,
 				status: statusFilter,

diff --git a/...ull-site-editing/full-site-editing-plugin/wpcom-block-editor-nav-sidebar/src/constants.ts b/...ull-site-editing/full-site-editing-plugin/wpcom-block-editor-nav-sidebar/src/constants.ts
@@ -4,8 +4,12 @@ declare global {
 	interface Window {
 		wpcomBlockEditorNavSidebar?: {
 			homeUrl: string;
+			postIdsToExclude: string[];
 		};
 	}
 }
 
 export const SITE_HOME_URL = window.wpcomBlockEditorNavSidebar?.homeUrl;
+export const POST_IDS_TO_EXCLUDE = ( window.wpcomBlockEditorNavSidebar?.postIdsToExclude || [] )
+	.map( ( id ) => parseInt( id, 10 ) )
+	.filter( ( id ) => ! isNaN( id ) );