Product Query: Add order by “Top rated” as a preset (#7715)

* Add safety guard to `extend_rest_query_allowed_params`

Author: sunyatasattva

assets/js/blocks/product-query/inspector-controls/popular-presets.tsx

@@ -16,6 +16,10 @@ const PRESETS = [
 		key: 'popularity/desc',
 		name: __( 'Best Selling', 'woo-gutenberg-products-block' ),
 	},
+	{
+		key: 'rating/desc',
+		name: __( 'Top Rated', 'woo-gutenberg-products-block' ),
+	},
 ];
 
 export function PopularPresets( props: ProductQueryBlock ) {

src/BlockTypes/ProductQuery.php

@@ -28,7 +28,7 @@ class ProductQuery extends AbstractBlock {
 	 *
 	 * @var array
 	 */
-	protected $custom_order_opts = array( 'popularity' );
+	protected $custom_order_opts = array( 'popularity', 'rating' );
 
 	/**
 	 * All the query args related to the filter by attributes block.
@@ -209,7 +209,9 @@ private function merge_queries( $a, $b ) {
 	 * @return array
 	 */
 	public function extend_rest_query_allowed_params( $params ) {
-		$params['orderby']['enum'] = array_merge( $params['orderby']['enum'], $this->custom_order_opts );
+		$original_enum = isset( $params['orderby']['enum'] ) ? $params['orderby']['enum'] : array();
+
+		$params['orderby']['enum'] = array_merge( $original_enum, $this->custom_order_opts );
 		return $params;
 	}
 
@@ -238,6 +240,7 @@ private function get_custom_orderby_query( $orderby ) {
 
 		$meta_keys = array(
 			'popularity' => 'total_sales',
+			'rating'     => '_wc_average_rating',
 		);
 
 		return array(