- fix options pages to resolve when set with a custom post_id

- update tests (one still failing)

Author: jasonbahl

src/Registry.php

@@ -356,6 +356,7 @@ public function register_options_pages():void {
 		);
 
 		foreach ( $graphql_options_pages as $graphql_options_page ) {
+			$graphql_options_page['is_options_page'] = true;
 			if ( ! $this->should_field_group_show_in_graphql( $graphql_options_page ) ) {
 				continue;
 			}

src/Utils.php

@@ -56,12 +56,12 @@ public static function get_node_acf_id( $node ) {
 				// @phpstan-ignore-next-line
 				$id = 'comment_' . absint( $node->databaseId );
 				break;
-			case is_array( $node ) && isset( $node['post_id'] ) && 'options' === $node['post_id']:
-				$id = $node['post_id'];
-				break;
 			case $node instanceof AcfOptionsPage:
 				$id = $node->acfId;
 				break;
+			case is_array( $node ) && isset( $node['post_id'] ):
+				$id = $node['post_id'];
+				break;
 			default:
 				$id = 0;
 				break;
@@ -282,7 +282,7 @@ public static function should_field_group_show_in_graphql( array $acf_field_grou
 		// if the field group was configured with no "show_in_graphql" value, default to the "show_in_rest" value
 		// to determine if the group should be available in an API
 		if (
-			( isset( $acf_field_group['post_id'] ) && 'options' !== $acf_field_group['post_id'] ) &&
+			( isset( $acf_field_group['is_options_page'] ) && false === $acf_field_group['is_options_page'] ) &&
 			! isset( $acf_field_group['show_in_graphql'] ) ) {
 			$acf_field_group['show_in_graphql'] = $show_in_rest ?? false;
 		}

tests/wpunit/OptionsPageTest.php

@@ -2,8 +2,8 @@
 
 class OptionsPageTest extends \Tests\WPGraphQL\Acf\WPUnit\WPGraphQLAcfTestCase {
 
-
 	public function setUp():void {
+
 		if ( ! function_exists( 'acf_add_options_page' ) ) {
 			$this->markTestSkipped( 'ACF Options Pages are not available in this test environment' );
 		}
@@ -15,13 +15,14 @@ public function tearDown(): void {
 		parent::tearDown();
 	}
 
-	public function registerOptionsPage( $title = 'My Options Page', $config = [] ) {
 
 
+	public function registerOptionsPage( $config = [] ) {
+
 		// register options page
 		acf_add_options_page(
 			array_merge( [
-				'page_title' => $title,
+				'page_title' => 'My Options Page',
 				'menu_title' => __( 'My Options Page' ),
 				'menu_slug'  => 'my-options-page',
 				'capability' => 'edit_posts',
@@ -40,7 +41,7 @@ public function testAcfOptionsPageIsQueryableInSchema() {
 		// Save a value to the ACF Option Field
 		// see: https://www.advancedcustomfields.com/resources/update_field/#update-a-value-from-different-objects
 		if ( function_exists( 'update_field' ) ) {
-			update_field( 'text', $expected_value, 'option' );
+			update_field( 'text', $expected_value, 'options' );
 		}
 
 		$this->register_acf_field( [], [
@@ -103,7 +104,7 @@ public function testAcfOptionsPageIsQueryableInSchema() {
 	 */
 	public function testOptionsPageNotInSchemaIfShowInGraphqlIsFalse() {
 
-		acf_add_options_page(
+		$this->registerOptionsPage(
 			[
 				'page_title' => 'ShowInGraphQLFalse',
 				'menu_title' => __( 'Show in GraphQL False' ),
@@ -175,24 +176,44 @@ public function testOptionsPageNotInSchemaIfShowInGraphqlIsFalse() {
 
 	// - options page shows with different name if "graphql_field_name" is set
 	public function testOptionsPageRespectsGraphqlFieldName() {
-		acf_add_options_page(
+
+		$this->registerOptionsPage(
 			[
 				'page_title' => 'CustomGraphqlName',
-				'menu_title' => __( 'Show in GraphQL False' ),
+				'menu_title' => __( 'Custom GraphQL Name' ),
 				'menu_slug'  => 'custom-graphql-name',
 				'capability' => 'edit_posts',
+				'post_id'   => 'custom-graphql-name',
 				// options pages will show in the Schema unless set to false
 				'graphql_type_name'   => 'MyCustomOptionsName',
 			]
 		);
 
-		$expected_value = uniqid( 'test', true );
+		$expected_value = 'test value';
 
 		// Save a value to the ACF Option Field
 		// see: https://www.advancedcustomfields.com/resources/update_field/#update-a-value-from-different-objects
-		if ( function_exists( 'update_field' ) ) {
-			update_field( 'text', $expected_value, 'option' );
-		}
+		update_field( 'text', $expected_value, 'custom-graphql-name' );
+		$get_field = get_field( 'text', 'custom-graphql-name' );
+
+		codecept_debug( [
+			'$get_field' => $get_field,
+			'$options_pages' => acf_get_options_pages(),
+		]);
+
+		$this->assertSame( $expected_value, $get_field );
+
+		$this->registerOptionsPage(
+			[
+				'page_title' => 'CustomGraphqlName',
+				'menu_title' => __( 'Custom GraphQL Name' ),
+				'menu_slug'  => 'custom-graphql-name',
+				'capability' => 'edit_posts',
+				'post_id'   => 'custom-graphql-name',
+				// options pages will show in the Schema unless set to false
+				'graphql_type_name'   => 'MyCustomOptionsName',
+			]
+		);
 
 		$this->register_acf_field( [], [
 			'graphql_field_name' => 'OptionsFields',
@@ -221,6 +242,10 @@ public function testOptionsPageRespectsGraphqlFieldName() {
 			'query' => $query,
 		]);
 
+		codecept_debug( [
+			'$get_field' => $get_field,
+		]);
+
 		self::assertQuerySuccessful( $actual, [
 			// the instructions should be used for the description
 			$this->expectedField( 'myCustomOptionsName.optionsFields.text', $expected_value ),
@@ -248,7 +273,7 @@ public function testOptionsPageRespectsGraphqlFieldName() {
 
 	public function testQueryOptionsPageAsNode() {
 
-		acf_add_options_page(
+		$this->registerOptionsPage(
 			[
 				'page_title' => 'OptionsPageNode',
 				'menu_title' => __( 'Options Page Node' ),