Merge pull request #3201 from wp-graphql/fix/3200-connectedTerms-resolver

jasonbahl · web-flow · commit d3542efe5e71 · 2024-09-04T09:53:29.000-06:00
fix: ensure connectedTerms returns terms for the specified taxonomy only
diff --git a/src/Data/Connection/TermObjectConnectionResolver.php b/src/Data/Connection/TermObjectConnectionResolver.php
@@ -35,7 +35,12 @@ public function __construct( $source, array $args, AppContext $context, ResolveI
 	 */
 	protected function prepare_query_args( array $args ): array {
 		$all_taxonomies = \WPGraphQL::get_allowed_taxonomies();
-		$taxonomy       = ! empty( $this->taxonomy ) && in_array( $this->taxonomy, $all_taxonomies, true ) ? [ $this->taxonomy ] : $all_taxonomies;
+
+		if ( ! is_array( $this->taxonomy ) ) {
+			$taxonomy = ! empty( $this->taxonomy ) && in_array( $this->taxonomy, $all_taxonomies, true ) ? [ $this->taxonomy ] : $all_taxonomies;
+		} else {
+			$taxonomy = $this->taxonomy;
+		}
 
 		if ( ! empty( $args['where']['taxonomies'] ) ) {
 			/**
diff --git a/tests/wpunit/TermObjectConnectionQueriesTest.php b/tests/wpunit/TermObjectConnectionQueriesTest.php
@@ -109,6 +109,62 @@ public function getQuery() {
 		';
 	}
 
+	public function testConnectedTermsConnectionReturnsTermNodesOfExpectedTaxonomies() {
+		$term_one_id = self::factory()->term->create(
+			[
+				'taxonomy' => 'category',
+				'name'     => 'Term One',
+			]
+		);
+
+		$term_two_id = self::factory()->term->create(
+			[
+				'taxonomy' => 'post_tag',
+				'name'     => 'Term Two',
+			]
+		);
+
+		$query = '
+		query GetConnectedTerms {
+			taxonomies {
+				nodes {
+					name
+					connectedTerms {
+						nodes {
+							__typename
+							databaseId
+							name
+							uri
+						}
+					}
+				}
+			} 
+		}
+		';
+
+		$actual = $this->graphql([
+			'query' => $query
+		]);
+
+		// codecept_debug( [ '$actual' => $actual ]);
+		$this->assertArrayNotHasKey( 'errors', $actual );
+
+		// map over the connected terms nodes and assert that all of them are category
+		$connected_categories = $actual['data']['taxonomies']['nodes'][0]['connectedTerms']['nodes'];
+		foreach ( $connected_categories as $connected_category ) {
+			$this->assertEquals( 'Category', $connected_category['__typename'] );
+		}
+
+		// map over the connected terms nodes and assert that all of them are tags
+		$connected_tags = $actual['data']['taxonomies']['nodes'][1]['connectedTerms']['nodes'];
+		foreach ( $connected_tags as $connected_tag ) {
+			$this->assertEquals( 'Tag', $connected_tag['__typename'] );			
+		}
+
+		wp_delete_term( $term_one_id, 'category' );
+		wp_delete_term( $term_two_id, 'post_tag' );
+	}
+
 	public function testForwardPagination() {
 		$query    = $this->getQuery();
 		$wp_query = new WP_Term_Query();
@@ -945,4 +1001,5 @@ public function testPaginateTermsWithDuplicateNamesAndOrderbyName() {
 
 		wp_delete_term( $parent_category, 'category' );
 	}
+
 }
