Merge pull request #2490 from jasonbahl/bugfix/#2486-page-by-uri-for-…

…posts-page fix: bug when querying page set as "Posts Page"
wp-graphql · Sep 6, 2022 · b89a31f · b89a31f
2 parents e2509d6 + e4c4e28
commit b89a31f
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 5 deletions.
diff --git a/src/Data/NodeResolver.php b/src/Data/NodeResolver.php
@@ -367,7 +367,7 @@ public function resolve_uri( string $uri, $extra_query_vars = '' ) {
 
 			} else {
 
-				if ( isset( $this->wp->query_vars['nodeType'] ) && 'Page' === $this->wp->query_vars['nodeType'] ) {
+				if ( isset( $this->wp->query_vars['nodeType'] ) && 'ContentNode' === $this->wp->query_vars['nodeType'] ) {
 					return null;
 				}
 
@@ -424,6 +424,11 @@ public function resolve_uri( string $uri, $extra_query_vars = '' ) {
 			}
 
 			if ( (int) get_option( 'page_for_posts', 0 ) === $post->ID ) {
+
+				if ( isset( $extra_query_vars['nodeType'] ) && 'ContentNode' === $extra_query_vars['nodeType'] ) {
+					return null;
+				}
+
 				return $this->context->get_loader( 'post_type' )->load_deferred( 'post' );
 			}
 
@@ -443,7 +448,7 @@ public function resolve_uri( string $uri, $extra_query_vars = '' ) {
 		} elseif ( isset( $this->wp->query_vars['post_type'] ) ) {
 
 			// If the query is asking for a Page nodeType with the home uri, try and resolve it.
-			if ( '/' === $this->wp->query_vars['uri'] && ( isset( $this->wp->query_vars['nodeType'] ) && 'Page' === $this->wp->query_vars['nodeType'] ) ) {
+			if ( '/' === $this->wp->query_vars['uri'] && ( isset( $this->wp->query_vars['nodeType'] ) && 'ContentNode' === $this->wp->query_vars['nodeType'] ) ) {
 
 				// If the post type is not a page, but the uri is for the home page, we can return null now
 				if ( 'page' !== $this->wp->query_vars['post_type'] ) {
@@ -456,7 +461,7 @@ public function resolve_uri( string $uri, $extra_query_vars = '' ) {
 			}
 
 			// If the query is asking for a Page nodeType with the uri, try and resolve it.
-			if ( isset( $this->wp->query_vars['nodeType'] ) && 'Page' === $this->wp->query_vars['nodeType'] && isset( $this->wp->query_vars['uri'] ) ) {
+			if ( isset( $this->wp->query_vars['nodeType'] ) && 'ContentNode' === $this->wp->query_vars['nodeType'] && isset( $this->wp->query_vars['uri'] ) ) {
 				$post_type = $this->wp->query_vars['post_type'];
 
 				$post = get_page_by_path( $this->wp->query_vars['uri'], 'OBJECT', $post_type ); // phpcs:ignore WordPressVIPMinimum.Functions.RestrictedFunctions.get_page_by_path_get_page_by_path

diff --git a/src/Model/Post.php b/src/Model/Post.php
@@ -692,6 +692,15 @@ protected function init() {
 						return '/';
 					}
 
+					// if the page is set as the posts page
+					// the page node itself is not identifiable
+					// by URI. Instead, the uri would return the
+					// Post content type as that uri
+					// represents the blog archive instead of a page
+					if ( true === $this->isPostsPage ) {
+						return null;
+					}
+
 					return ! empty( $uri ) ? str_ireplace( home_url(), '', $uri ) : null;
 				},
 				'commentCount'              => function () {

diff --git a/src/Type/ObjectType/RootQuery.php b/src/Type/ObjectType/RootQuery.php
@@ -693,7 +693,7 @@ public static function register_post_object_fields() {
 									[
 										'post_type' => $post_type_object->name,
 										'archive'   => false,
-										'nodeType'  => 'Page',
+										'nodeType'  => 'ContentNode',
 									]
 								);
 							case 'database_id':
@@ -801,7 +801,7 @@ function ( $post ) use ( $post_type_object ) {
 								[
 									'post_type' => $post_type_object->name,
 									'archive'   => false,
-									'nodeType'  => 'Page',
+									'nodeType'  => 'ContentNode',
 								]
 							);
 						} elseif ( ! empty( $args['slug'] ) ) {

diff --git a/tests/wpunit/PageByUriTest.php b/tests/wpunit/PageByUriTest.php
@@ -72,4 +72,43 @@ function testPageByUriWithCustomPermalinks() {
 		$this->assertSame( $this->page, $actual['data']['page']['databaseId'] );
 		$this->assertSame( str_ireplace( home_url(), '', get_permalink( $this->page ) ), $actual['data']['page']['uri'] );
 	}
+
+	public function testQueryPageForPostsByUriReturnsNull() {
+
+
+		$query = '
+		query GetPageByUri($id:ID!) {
+			page(id: $id, idType: URI) {
+				__typename
+			}
+		}
+		';
+
+		$actual = $this->graphql([
+			'query' => $query,
+			'variables' => [
+				'id' => '/' . get_post( $this->page )->post_name,
+			]
+		]);
+
+		$this->assertQuerySuccessful( $actual, [
+			$this->expectedField( 'page.__typename', 'Page' ),
+		]);
+
+		// set the page as the page_for_posts
+		update_option( 'page_for_posts', $this->page );
+
+		$actual = $this->graphql([
+			'query' => $query,
+			'variables' => [
+				'id' => '/' . get_post( $this->page )->post_name,
+			]
+		]);
+
+		$this->assertQuerySuccessful( $actual, [
+			$this->expectedField( 'page', self::IS_NULL ),
+		]);
+
+	}
+
 }