fix: localAttributes and globalAttributes filtering and returned wron…

…g values. (#757) * fix: Localattribute and globalAttribute filtering. * fixup! fix: Localattribute and globalAttribute filtering. * fixup! fixup! fix: Localattribute and globalAttribute filtering. * fixup! fixup! fixup! fix: Localattribute and globalAttribute filtering.
wp-graphql · Jul 4, 2023 · fedde04 · fedde04
1 parent 9fbf259
commit fedde04
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 13 deletions.
diff --git a/includes/connection/class-product-attributes.php b/includes/connection/class-product-attributes.php
@@ -26,24 +26,28 @@ class Product_Attributes {
 	 */
 	public static function register_connections() {
 		// From Product to ProductAttribute.
-		register_graphql_connection( self::get_connection_config() );
+		register_graphql_connection(
+			self::get_connection_config()
+		);
 
 		// From Product to LocalProductAttribute.
 		register_graphql_connection(
 			self::get_connection_config(
 				[
-					'toType'        => 'LocalProductAttribute',
-					'fromFieldName' => 'localAttributes',
-				]
+					'toType'         => 'LocalProductAttribute',
+					'fromFieldName'  => 'localAttributes',
+					'connectionArgs' => [],
+				],
 			)
 		);
 
 		// From Product to GlobalProductAttribute.
 		register_graphql_connection(
 			self::get_connection_config(
 				[
-					'toType'        => 'GlobalProductAttribute',
-					'fromFieldName' => 'globalAttributes',
+					'toType'         => 'GlobalProductAttribute',
+					'fromFieldName'  => 'globalAttributes',
+					'connectionArgs' => [],
 				]
 			)
 		);
@@ -65,8 +69,15 @@ public static function get_connection_config( $args = [] ): array {
 				'connectionArgs' => self::get_connection_args(),
 				'resolve'        => function ( $source, array $args, AppContext $context, ResolveInfo $info ) {
 					$resolver = new Product_Attribute_Connection_Resolver();
-
-					return $resolver->resolve( $source, $args, $context, $info );
+					// phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+					switch ( $info->fieldName ) {
+						case 'globalAttributes':
+							return $resolver->resolve( $source, $args, $context, $info, 'global' );
+						case 'localAttributes':
+							return $resolver->resolve( $source, $args, $context, $info, 'local' );
+						default:
+							return $resolver->resolve( $source, $args, $context, $info );
+					}
 				},
 			],
 			$args

diff --git a/includes/data/connection/class-product-attribute-connection-resolver.php b/includes/data/connection/class-product-attribute-connection-resolver.php
@@ -30,11 +30,12 @@ class Product_Attribute_Connection_Resolver {
 	 * @param array       $args        Connection arguments.
 	 * @param AppContext  $context     AppContext object.
 	 * @param ResolveInfo $info        ResolveInfo object.
+	 * @param string      $type     Attribute type.
 	 *
 	 * @throws UserError  Invalid product attribute enumeration value.
 	 * @return array
 	 */
-	private function get_items( $attributes, $source, $args, $context, $info ) {
+	private function get_items( $attributes, $source, $args, $context, $info, $type = null ) {
 		$items = [];
 		foreach ( $attributes as $attribute_name => $data ) {
 			// phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_encode
@@ -48,8 +49,10 @@ private function get_items( $attributes, $source, $args, $context, $info ) {
 			$items[]         = $data;
 		}
 
-		if ( ! empty( $args['type'] ) ) {
-			switch ( $args['type'] ) {
+		$type = ! empty( $args['where']['type'] ) ? $args['where']['type'] : $type;
+
+		if ( ! is_null( $type ) ) {
+			switch ( $type ) {
 				case 'local':
 					$items = array_filter(
 						$items,
@@ -81,11 +84,12 @@ function( $item ) {
 	 * @param array       $args     Connection arguments.
 	 * @param AppContext  $context  AppContext object.
 	 * @param ResolveInfo $info     ResolveInfo object.
+	 * @param string      $type     Attribute type.
 	 *
 	 * @return array|null
 	 */
-	public function resolve( $source, array $args, AppContext $context, ResolveInfo $info ) {
-		$attributes = $this->get_items( $source->attributes, $source, $args, $context, $info );
+	public function resolve( $source, array $args, AppContext $context, ResolveInfo $info, $type = null ) {
+		$attributes = $this->get_items( $source->attributes, $source, $args, $context, $info, $type );
 
 		$connection = Relay::connectionFromArray( $attributes, $args );
 		$nodes      = [];