Merge branch 'develop'

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file, per [the Keep a Changelog standard](http://keepachangelog.com/).
 
+## [3.4.1] - 2020-3-31
+
+* Make weighting dashboard flex containers to prevent the slider from changing size. Props [@mlaroy](https://github.com/mlaroy).
+* Fix issue where weightings wouldn't save properly for certain post types. Props [mustafauysal](https://github.com/mustafauysal).
+* Fix bug where terms wouldn't finish syncing in certain scenarios.
+* Properly order WooCommerce products using double to account for decimals. Props [@oscarsanchez](https://github.com/oscarsanchez).
+* Show current indices in index health dashboard. Props [moraleida](https://github.com/moraleida).
+
 ## [3.4]
 
 * Addition of Terms Indexable and Feature. ElasticPress can now integrate with `WP_Term_Query`. Props [dkotter](https://github.com/dkotter).

assets/css/dashboard.css

@@ -628,6 +628,11 @@ h2.ep-list-features {
 
 .weighting-settings .postbox {
 	max-width: 650px;
+	box-sizing: border-box;
+
+	* {
+		box-sizing: border-box;
+	}
 }
 
 .weighting-settings .postbox h2.hndle {
@@ -648,6 +653,7 @@ h2.ep-list-features {
 
 .weighting-settings fieldset p {
 	display: inline-block;
+	float: left;
 	margin: 0;
 }
 
@@ -669,8 +675,14 @@ h2.ep-list-features {
 	width: 120px;
 }
 
+.weighting-settings .weighting {
+	display: flex;
+	align-items: center;
+}
+
 .weighting-settings .weighting label {
-	width: 60px; /* not localization friendly */
+	min-width: 80px;
+	margin-right: 10px;
 }
 
 .weighting-settings input[type=range] {
@@ -1056,4 +1068,4 @@ p.ep-totals-data {
 	.ep-qchart-container {
 		width: 90%;
 	}
-}
+}

elasticpress.php

@@ -2,7 +2,7 @@
 /**
  * Plugin Name: ElasticPress
  * Description: A fast and flexible search and query engine for WordPress.
- * Version:     3.4
+ * Version:     3.4.1
  * Author:      10up
  * Author URI:  http://10up.com
  * License:     GPLv2 or later
@@ -27,7 +27,8 @@
 
 define( 'EP_URL', plugin_dir_url( __FILE__ ) );
 define( 'EP_PATH', plugin_dir_path( __FILE__ ) );
-define( 'EP_VERSION', '3.4' );
+define( 'EP_FILE', plugin_basename( __FILE__ ) );
+define( 'EP_VERSION', '3.4.1' );
 
 /**
  * PSR-4-ish autoloading
@@ -76,7 +77,7 @@ function( $class ) {
 require_once __DIR__ . '/includes/utils.php';
 
 // Define a constant if we're network activated to allow plugin to respond accordingly.
-$network_activated = Utils\is_network_activated( plugin_basename( __FILE__ ) );
+$network_activated = Utils\is_network_activated( EP_FILE );
 
 if ( $network_activated ) {
 	define( 'EP_IS_NETWORK', true );

includes/classes/Feature/Search/Weighting.php

@@ -313,6 +313,33 @@ public function handle_save() {
 			return;
 		}
 
+		$this->save_weighting_configuration( $_POST );
+
+		$redirect_url = admin_url( 'admin.php?page=elasticpress-weighting' );
+		$redirect_url = add_query_arg( 'settings-updated', true, $redirect_url );
+
+		// Do a non-blocking search query to force the autosuggest hash to update
+		$url = add_query_arg( [ 's' => 'search test' ], home_url( '/' ) );
+		wp_remote_get(
+			$url,
+			[
+				'blocking' => false,
+			]
+		);
+
+		wp_safe_redirect( $redirect_url );
+		exit();
+	}
+
+	/**
+	 * Save weighting configuration for each searchable post_type
+	 *
+	 * @param array $settings weighting settings
+	 *
+	 * @return array final settings
+	 * @since 3.4.1
+	 */
+	public function save_weighting_configuration( $settings ) {
 		$new_config                = array();
 		$previous_config_formatted = array();
 		$current_config            = $this->get_weighting_configuration();
@@ -326,22 +353,26 @@ public function handle_save() {
 			// We need a way to know if fields have been explicitly set before, let's compare a previous state against $_POST['weighting']
 			foreach ( $post_type_weighting as $weighting_field => $weighting_values ) {
 				$previous_config_formatted[ $post_type ][ sanitize_text_field( $weighting_field ) ] = [
-					'weight'  => isset( $_POST['weighting'][ $post_type ][ $weighting_field ]['weight'] ) ? intval( $_POST['weighting'][ $post_type ][ $weighting_field ]['weight'] ) : 0,
-					'enabled' => isset( $_POST['weighting'][ $post_type ][ $weighting_field ]['enabled'] ) && 'on' === $_POST['weighting'][ $post_type ][ $weighting_field ]['enabled'] ? true : false,
+					'weight'  => isset( $settings['weighting'][ $post_type ][ $weighting_field ]['weight'] ) ? intval( $settings['weighting'][ $post_type ][ $weighting_field ]['weight'] ) : 0,
+					'enabled' => isset( $settings['weighting'][ $post_type ][ $weighting_field ]['enabled'] ) && 'on' === $settings['weighting'][ $post_type ][ $weighting_field ]['enabled'] ? true : false,
 				];
 			}
 		}
 
-		if ( ! empty( $_POST['weighting'] ) ) {
-			foreach ( $_POST['weighting'] as $post_type => $post_type_weighting ) {
-				// This also ensures the string is safe, since this would return false otherwise
-				if ( ! post_type_exists( $post_type ) ) {
-					continue;
-				}
+		$search     = Features::factory()->get_registered_feature( 'search' );
+		$post_types = $search->get_searchable_post_types();
 
-				$new_config[ $post_type ] = array();
+		foreach ( $post_types as $post_type ) {
+			// This also ensures the string is safe, since this would return false otherwise
+			if ( ! post_type_exists( $post_type ) ) {
+				continue;
+			}
 
-				foreach ( $post_type_weighting as $weighting_field => $weighting_values ) {
+			/** override default post_type settings while saving */
+			$new_config[ $post_type ] = array();
+
+			if ( isset( $settings['weighting'][ $post_type ] ) ) {
+				foreach ( $settings['weighting'][ $post_type ] as $weighting_field => $weighting_values ) {
 					$new_config[ $post_type ][ sanitize_text_field( $weighting_field ) ] = [
 						'weight'  => isset( $weighting_values['weight'] ) ? intval( $weighting_values['weight'] ) : 0,
 						'enabled' => isset( $weighting_values['enabled'] ) && 'on' === $weighting_values['enabled'] ? true : false,
@@ -354,20 +385,7 @@ public function handle_save() {
 
 		update_option( 'elasticpress_weighting', $final_config );
 
-		$redirect_url = admin_url( 'admin.php?page=elasticpress-weighting' );
-		$redirect_url = add_query_arg( 'settings-updated', true, $redirect_url );
-
-		// Do a non-blocking search query to force the autosuggest hash to update
-		$url = add_query_arg( [ 's' => 'search test' ], home_url( '/' ) );
-		wp_remote_get(
-			$url,
-			[
-				'blocking' => false,
-			]
-		);
-
-		wp_safe_redirect( $redirect_url );
-		exit();
+		return $final_config;
 	}
 
 	/**

includes/classes/Feature/WooCommerce/WooCommerce.php

@@ -548,9 +548,9 @@ public function get_orderby_meta_mapping( $meta_key ) {
 				'ID'                 => 'ID',
 				'menu_order'         => 'menu_order title date',
 				'menu_order title'   => 'menu_order title date',
-				'total_sales'        => 'meta.total_sales.long date',
+				'total_sales'        => 'meta.total_sales.double date',
 				'_wc_average_rating' => 'meta._wc_average_rating.double date',
-				'_price'             => 'meta._price.long date',
+				'_price'             => 'meta._price.double date',
 			)
 		);
 

includes/classes/Indexable/Post/DateQuery.php

@@ -11,7 +11,9 @@
 use \WP_Date_Query as WP_Date_Query;
 
 if ( ! defined( 'ABSPATH' ) ) {
+	// @codeCoverageIgnoreStart
 	exit; // Exit if accessed directly.
+	// @codeCoverageIgnoreEnd
 }
 
 /**
@@ -70,9 +72,7 @@ protected function get_es_filter_for_query( $query, $depth = 0 ) {
 					$clause_filter = $this->get_es_filter_for_clause( $clause, $query );
 
 					$filter_count = count( $clause_filter );
-					if ( ! $filter_count ) {
-						$filter_chunks['filters'][] = '';
-					} else {
+					if ( $filter_count ) {
 						$filter_chunks['filters'][] = $clause_filter;
 					}