Merge branch 'develop' into feature/3853-v2

10up · Dec 5, 2024 · 14d1b30 · 14d1b30
2 parents c61fa80 + 7a2bcf4
commit 14d1b30
Show file tree

Hide file tree

Showing 15 changed files with 401 additions and 291 deletions.
diff --git a/.github/workflows/cypress-tests.yml b/.github/workflows/cypress-tests.yml
@@ -42,7 +42,6 @@ jobs:
         key: npm-${{ env.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
         restore-keys: |
           npm-${{ env.NODE_VERSION }}-
-
     - name: Prepare composer cache
       uses: actions/cache@v4
       with:
@@ -131,7 +130,6 @@ jobs:
         key: npm-${{ env.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
         restore-keys: |
           npm-${{ env.NODE_VERSION }}-
-
     - name: Prepare composer cache
       uses: actions/cache@v4
       with:

diff --git a/assets/css/ordering.css b/assets/css/ordering.css
@@ -57,6 +57,10 @@
 			color: #0073aa;
 		}
 
+		& .removed .title {
+			color: #999;
+		}
+
 		& .pointer-actions {
 			float: right;
 
@@ -65,7 +69,7 @@
 			}
 
 			& .delete-pointer {
-				margin-left: 10px;
+				margin-right: 10px;
 			}
 		}
 

diff --git a/assets/js/instant-results/components/common/result.js b/assets/js/instant-results/components/common/result.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies.
  */
-import { React, WPElement } from '@wordpress/element';
+import { Component, FunctionComponent, WPElement } from '@wordpress/element';
 import { applyFilters } from '@wordpress/hooks';
 
 /**
@@ -80,7 +80,7 @@ const Result = ({ averageRating = 0, date, excerpt, priceHtml, thumbnail, title,
  * @filter ep.InstantResults.Result
  * @since 4.4.0
  *
- * @param {React.Component|React.FunctionComponent} Result Result component.
- * @returns {React.Component|React.FunctionComponent} Result component.
+ * @param {Component|FunctionComponent} Result Result component.
+ * @returns {Component|FunctionComponent} Result component.
  */
 export default applyFilters('ep.InstantResults.Result', Result);
diff --git a/assets/js/ordering/pointers.js b/assets/js/ordering/pointers.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies.
  */
-import { DragDropContext, Droppable, Draggable } from 'react-beautiful-dnd';
+import { DragDropContext, Droppable, Draggable } from '@hello-pangea/dnd';
 
 /**
  * WordPress dependencies.
@@ -63,6 +63,7 @@ export class Pointers extends Component {
 			defaultResults: {},
 			searchText: '',
 			searchResults: {},
+			removedPointers: [],
 		};
 	}
 
@@ -101,9 +102,11 @@ export class Pointers extends Component {
 
 	removePointer = (pointer) => {
 		let { pointers } = this.state;
+		const { removedPointers } = this.state;
 
 		delete pointers[pointers.indexOf(pointer)];
 		pointers = pointers.filter((item) => item !== null);
+		removedPointers.push(pointer.ID);
 
 		this.setState({ pointers });
 	};
@@ -116,7 +119,7 @@ export class Pointers extends Component {
 		pointers = pointers.sort((a, b) => {
 			return a.order > b.order ? 1 : -1;
 		});
-		const pointersIds = pointers.map((pointer) => pointer.ID);
+		const pointersIds = pluck(pointers, 'ID');
 
 		// Remove all custom pointers from the default results
 		merged = merged.filter((item) => pointersIds.indexOf(item.ID) === -1);
@@ -183,6 +186,7 @@ export class Pointers extends Component {
 		pointers.push({
 			ID: id,
 			order: position,
+			type: 'custom-result',
 		});
 
 		this.setState({ pointers });
@@ -220,17 +224,12 @@ export class Pointers extends Component {
 		const pointers = [];
 
 		items.forEach((item, index) => {
-			if (item.order) {
-				// Reordering an existing pointer
-				pointers.push({
-					ID: item.ID,
-					order: index + 1,
-				});
-			} else if (item.ID === result.draggableId) {
-				// Adding a default post to the pointers array
+			// Reordering an existing pointer or adding a default post to the pointers array
+			if (item.order || item.ID === result.draggableId) {
 				pointers.push({
 					ID: item.ID,
 					order: index + 1,
+					type: item?.type || 'reordered',
 				});
 			}
 		});
@@ -293,6 +292,7 @@ export class Pointers extends Component {
 			defaultResults,
 			title,
 			pointers,
+			removedPointers,
 			searchText,
 			searchResults: searchResultsFromState,
 		} = this.state;
@@ -352,6 +352,8 @@ export class Pointers extends Component {
 											? index + 1
 											: index;
 
+									const isRemoved = removedPointers.includes(item.ID);
+
 									let { title } = item;
 									if (undefined === title) {
 										title =
@@ -361,10 +363,9 @@ export class Pointers extends Component {
 									}
 
 									// Determine if this result is part of default search results or not
-									const isDefaultResult =
-										undefined !== defaultResultsById[item.ID];
+									const itemType = item?.type || 'reordered';
 									const tooltipText =
-										isDefaultResult === true
+										itemType === 'reordered'
 											? __('Return to original position', 'elasticpress')
 											: __(
 													'Remove custom result from results list',
@@ -401,34 +402,25 @@ export class Pointers extends Component {
 
 											<Draggable
 												key={item.ID}
-												draggableId={item.ID}
+												draggableId={String(item.ID)}
 												index={draggableIndex}
 											>
 												{(provided2) => (
 													<div
-														className={`pointer ${draggableIndex}`}
+														className={`pointer ${draggableIndex} ${
+															isRemoved ? 'removed' : ''
+														}`}
 														ref={provided2.innerRef}
 														{...provided2.draggableProps}
 													>
-														{item.order && isDefaultResult === true && (
+														{item.order && itemType === 'reordered' && (
 															<span className="pointer-type">RD</span>
 														)}
-														{item.order &&
-															isDefaultResult === false && (
-																<span className="pointer-type">
-																	CR
-																</span>
-															)}
+														{item.order && itemType !== 'reordered' && (
+															<span className="pointer-type">CR</span>
+														)}
 														<strong className="title">{title}</strong>
 														<div className="pointer-actions">
-															<span
-																className="dashicons dashicons-menu handle"
-																{...provided2.dragHandleProps}
-																title={__(
-																	'Drag post up or down to reposition',
-																	'elasticpress',
-																)}
-															/>
 															{item.order && (
 																<span
 																	role="button"
@@ -449,6 +441,14 @@ export class Pointers extends Component {
 																	</span>
 																</span>
 															)}
+															<span
+																className="dashicons dashicons-menu handle"
+																{...provided2.dragHandleProps}
+																title={__(
+																	'Drag post up or down to reposition',
+																	'elasticpress',
+																)}
+															/>
 														</div>
 													</div>
 												)}

diff --git a/includes/classes/Elasticsearch.php b/includes/classes/Elasticsearch.php
@@ -1744,7 +1744,7 @@ protected function add_query_log( $query ) {
 		 * @hook ep_disable_query_logging
 		 * @param  {bool} Whether to log to the queries property. Defaults to false.
 		 * @return {bool} New value
-		 * @since  5.2.0
+		 * @since  5.1.4
 		 */
 		$disable_query_logging = apply_filters( 'ep_disable_query_logging', false );
 

diff --git a/includes/classes/Feature/Facets/Facets.php b/includes/classes/Feature/Facets/Facets.php
@@ -449,7 +449,7 @@ public function get_selected() {
 		 * Filter selected filters.
 		 *
 		 * @hook ep_facet_selected_filters
-		 * @since 5.2.0
+		 * @since 5.1.4
 		 * @param  {array} $filters Current filters
 		 * @return {array} New filters
 		 */

diff --git a/includes/classes/Feature/ProtectedContent/ProtectedContent.php b/includes/classes/Feature/ProtectedContent/ProtectedContent.php
@@ -64,6 +64,7 @@ public function setup() {
 			add_filter( 'ep_admin_wp_query_integration', '__return_true' );
 			add_action( 'pre_get_posts', [ $this, 'integrate' ] );
 			add_filter( 'ep_post_query_db_args', [ $this, 'query_password_protected_posts' ] );
+			add_filter( 'ep_set_sort', [ $this, 'maybe_change_sort' ] );
 		}
 
 		if ( Features::factory()->get_registered_feature( 'comments' )->is_active() ) {
@@ -427,4 +428,52 @@ public function requirements_status() {
 	public function sync_password_protected( $new_skip, bool $skip ) : bool {
 		return $skip;
 	}
+
+	/**
+	 * Maybe change the sort order for the WP Dashboard.
+	 *
+	 * If the admin user has enabled the setting to use the default WordPress sort order,
+	 * we will change the sort order to (somewhat) match the default WP behavior.
+	 *
+	 * @since 5.1.4
+	 *
+	 * @param array $default_sort The previous value of the `ep_set_sort` filter
+	 * @return array
+	 */
+	public function maybe_change_sort( $default_sort ) {
+		if ( ! function_exists( '\get_current_screen' ) ) {
+			return $default_sort;
+		}
+
+		$screen = get_current_screen();
+		if ( 'edit' !== $screen->base ) {
+			return $default_sort;
+		}
+
+		if ( ! $this->get_setting( 'use_default_wp_sort' ) ) {
+			return $default_sort;
+		}
+
+		return [
+			[ 'post_date' => [ 'order' => 'desc' ] ],
+			[ 'post_title.sortable' => [ 'order' => 'asc' ] ],
+		];
+	}
+
+	/**
+	 * Set the `settings_schema` attribute
+	 *
+	 * @since 5.1.4
+	 */
+	protected function set_settings_schema() {
+		$this->settings_schema = [
+			[
+				'default' => '0',
+				'key'     => 'use_default_wp_sort',
+				'help'    => __( 'Enable to use WordPress default sort for searches inside the WP Dashboard.', 'elasticpress' ),
+				'label'   => __( 'Use default WordPress sort on the WP Dashboard', 'elasticpress' ),
+				'type'    => 'checkbox',
+			],
+		];
+	}
 }
diff --git a/includes/classes/Feature/Search/Search.php b/includes/classes/Feature/Search/Search.php
@@ -738,7 +738,8 @@ public function enqueue_block_editor_assets() {
 	 * @param WP_Query $query WP Query object
 	 */
 	public function exclude_posts_from_search( $filters, $args, $query ) {
-		$bypass_exclusion_from_search = is_admin() || ! $query->is_search();
+		$bypass_exclusion_from_search = ( is_admin() && ! wp_doing_ajax() ) || ! $query->is_search();
+
 		/**
 		 * Filter whether the exclusion from the "exclude from search" checkbox should be applied
 		 *

diff --git a/includes/classes/Feature/SearchOrdering/SearchOrdering.php b/includes/classes/Feature/SearchOrdering/SearchOrdering.php
@@ -492,6 +492,7 @@ public function save_post( $post_id, $post ) {
 				$final_order_data[] = [
 					'ID'    => intval( $order_data['ID'] ),
 					'order' => intval( $order_data['order'] ),
+					'type'  => ! empty( $order_data['type'] ) ? sanitize_text_field( $order_data['type'] ) : 'reordered',
 				];
 			} else {
 				$previous_post_ids[ intval( $order_data['ID'] ) ] = true;