From aed99ef68aaea830ea311d6f6f21d6edd6063170 Mon Sep 17 00:00:00 2001 From: Geoff Taylor Date: Fri, 26 Jun 2020 15:51:55 -0400 Subject: [PATCH] "galleryImages" connection refactored. Unneeded "graphql_post_object_connection_query_args" filter removed. --- includes/class-core-schema-filters.php | 9 --- includes/connection/class-posts.php | 15 +++++ .../class-post-connection-resolver.php | 60 ------------------- vendor/composer/autoload_classmap.php | 1 - vendor/composer/autoload_static.php | 1 - 5 files changed, 15 insertions(+), 71 deletions(-) delete mode 100644 includes/data/connection/class-post-connection-resolver.php diff --git a/includes/class-core-schema-filters.php b/includes/class-core-schema-filters.php index 15ec0ae2..53fa3706 100644 --- a/includes/class-core-schema-filters.php +++ b/includes/class-core-schema-filters.php @@ -32,15 +32,6 @@ class Core_Schema_Filters { add_filter( 'graphql_data_loaders', array( __CLASS__, 'graphql_data_loaders' ), 10, 2 ); // Adds connection resolutions for WooGraphQL type to WPGraphQL type connections. - add_filter( - 'graphql_post_object_connection_query_args', - array( - '\WPGraphQL\WooCommerce\Data\Connection\Post_Connection_Resolver', - 'get_query_args', - ), - 10, - 5 - ); add_filter( 'graphql_term_object_connection_query_args', array( diff --git a/includes/connection/class-posts.php b/includes/connection/class-posts.php index df5131e4..1b4bf285 100644 --- a/includes/connection/class-posts.php +++ b/includes/connection/class-posts.php @@ -9,7 +9,10 @@ namespace WPGraphQL\WooCommerce\Connection; +use GraphQL\Type\Definition\ResolveInfo; +use WPGraphQL\AppContext; use WPGraphQL\Connection\PostObjects; +use WPGraphQL\Data\Connection\PostObjectConnectionResolver; /** * Class - Posts @@ -27,6 +30,18 @@ class Posts extends PostObjects { 'fromType' => 'Product', 'toType' => 'MediaItem', 'fromFieldName' => 'galleryImages', + 'resolve' => function ( $source, array $args, AppContext $context, ResolveInfo $info ) { + $resolver = new PostObjectConnectionResolver( $source, $args, $context, $info, 'attachment' ); + $resolver->set_query_arg( 'post_type', 'attachment' ); + $resolver->set_query_arg( 'post__in', $source->gallery_image_ids ); + + // Change default ordering + if ( ! in_array( 'orderby', array_keys( $resolver->get_query_args() ) ) ) { + $resolver->set_query_arg( 'orderby', 'post__in' ); + } + + return $resolver->get_connection(); + }, ) ) ); diff --git a/includes/data/connection/class-post-connection-resolver.php b/includes/data/connection/class-post-connection-resolver.php deleted file mode 100644 index 713e160b..00000000 --- a/includes/data/connection/class-post-connection-resolver.php +++ /dev/null @@ -1,60 +0,0 @@ -source get set, and where mapping the input $args to the actual $query_args occurs. - * - * @param array $query_args - WP_Query args. - * @param mixed $source - Connection parent resolver. - * @param array $args - Connection arguments. - * @param AppContext $context - AppContext object. - * @param ResolveInfo $info - ResolveInfo object. - * - * @return mixed - */ - public static function get_query_args( $query_args, $source, $args, $context, $info ) { - // Determine where we're at in the Graph and adjust the query context appropriately. - if ( true === is_object( $source ) ) { - switch ( true ) { - case is_a( $source, Product::class ): - // @codingStandardsIgnoreLine - if ( 'galleryImages' === $info->fieldName ) { - unset( $query_args['post_parent'] ); - $query_args['post__in'] = $source->gallery_image_ids; - } - break; - default: - break; - } - } - - $query_args = apply_filters( - 'graphql_wc_posts_connection_query_args', - $query_args, - $source, - $args, - $context, - $info - ); - - return $query_args; - } -} diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index b01ae8b0..70039436 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -36,7 +36,6 @@ return array( 'WPGraphQL\\WooCommerce\\Data\\Connection\\Order_Connection_Resolver' => $baseDir . '/includes/data/connection/class-order-connection-resolver.php', 'WPGraphQL\\WooCommerce\\Data\\Connection\\Order_Item_Connection_Resolver' => $baseDir . '/includes/data/connection/class-order-item-connection-resolver.php', 'WPGraphQL\\WooCommerce\\Data\\Connection\\Payment_Gateway_Connection_Resolver' => $baseDir . '/includes/data/connection/class-payment-gateway-connection-resolver.php', - 'WPGraphQL\\WooCommerce\\Data\\Connection\\Post_Connection_Resolver' => $baseDir . '/includes/data/connection/class-post-connection-resolver.php', 'WPGraphQL\\WooCommerce\\Data\\Connection\\Product_Attribute_Connection_Resolver' => $baseDir . '/includes/data/connection/class-product-attribute-connection-resolver.php', 'WPGraphQL\\WooCommerce\\Data\\Connection\\Product_Connection_Resolver' => $baseDir . '/includes/data/connection/class-product-connection-resolver.php', 'WPGraphQL\\WooCommerce\\Data\\Connection\\Product_Review_Connection_Resolver' => $baseDir . '/includes/data/connection/class-product-review-connection-resolver.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 8fdfe49b..eb5e3b15 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -64,7 +64,6 @@ class ComposerStaticInit6ecb3b3e822b795cab805ed5884032b2 'WPGraphQL\\WooCommerce\\Data\\Connection\\Order_Connection_Resolver' => __DIR__ . '/../..' . '/includes/data/connection/class-order-connection-resolver.php', 'WPGraphQL\\WooCommerce\\Data\\Connection\\Order_Item_Connection_Resolver' => __DIR__ . '/../..' . '/includes/data/connection/class-order-item-connection-resolver.php', 'WPGraphQL\\WooCommerce\\Data\\Connection\\Payment_Gateway_Connection_Resolver' => __DIR__ . '/../..' . '/includes/data/connection/class-payment-gateway-connection-resolver.php', - 'WPGraphQL\\WooCommerce\\Data\\Connection\\Post_Connection_Resolver' => __DIR__ . '/../..' . '/includes/data/connection/class-post-connection-resolver.php', 'WPGraphQL\\WooCommerce\\Data\\Connection\\Product_Attribute_Connection_Resolver' => __DIR__ . '/../..' . '/includes/data/connection/class-product-attribute-connection-resolver.php', 'WPGraphQL\\WooCommerce\\Data\\Connection\\Product_Connection_Resolver' => __DIR__ . '/../..' . '/includes/data/connection/class-product-connection-resolver.php', 'WPGraphQL\\WooCommerce\\Data\\Connection\\Product_Review_Connection_Resolver' => __DIR__ . '/../..' . '/includes/data/connection/class-product-review-connection-resolver.php',