fix: correctly use filtered form fields when preparing the connection…

… data. (#395)

* fix: correctly use filtered form fields when preparing the connection data.

* tests: fix CaptchaFieldTest::testField

CHANGELOG.md

@@ -3,10 +3,11 @@
 ## Unreleased
 
 - fix: Ensure `EmailField` inputs are hydrated when Email Confirmation is disabled. H/t @gytjarek.
+- fix: Correctly use filtered form fields when preparing the connection data. H/t @samuelhadsall.
 - chore: Update `yahnis-elsts/plugin-update-checker` to v5.3.
 - chore: Update `axepress/wp-graphql-cs` to v2.0.0-beta.2 and fix resulting issues.
 - chore: Update Composer dev deps.
-- chore: Test compatibility with WordPress 6.4.x
+- ci: Test compatibility with WordPress 6.4.x
 - docs: Add docs on troubleshooting i18n issues. H/t @dev-ditrict-web.
 
 ## v0.12.4

src/Data/Connection/FormFieldsConnectionResolver.php

@@ -86,7 +86,7 @@ public static function resolve( $source, array $args, AppContext $context, Resol
 
 		$fields = self::filter_form_fields_by_connection_args( $source, $args );
 
-		$fields = self::prepare_data( $source );
+		$fields = self::prepare_data( $fields );
 
 		$connection = Relay::connectionFromArray( $fields, $args );
 
@@ -172,7 +172,7 @@ private static function filter_form_fields_by_connection_args( $fields, $args ):
 		if ( isset( $args['where']['pageNumber'] ) ) {
 			$page = absint( $args['where']['pageNumber'] );
 
-			$fields = array_filter( $fields, static fn ( $field ) => $page === (int) $field['pageNumber'] );
+			$fields = array_filter( $fields, static fn ( $field ) => $page === (int) $field->pageNumber );
 		}
 
 		return $fields;

tests/wpunit/CaptchaFieldTest.php

@@ -116,7 +116,7 @@ protected function entry_query() : string {
 		return "
 			query getFieldValue(\$id: ID!, \$idType: EntryIdTypeEnum) {
 				gfEntry(id: \$id, idType: \$idType ) {
-					formFields(where:{fieldTypes:CAPTCHA}) {
+					formFields {
 						nodes {
 							{$this->field_query}
 						}