Cleanup

Author: burhandodhy

includes/classes/Feature/WooCommerce/Orders.php

@@ -375,12 +375,12 @@ public function hpos_compatibility_notice( array $notices ): array {
 			return $notices;
 		}
 
-		if ( $this->is_hpos_compatible() ) {
+		if ( ! $this->is_hpos_enabled() || $this->is_hpos_compatible() ) {
 			return $notices;
 		}
 
 		$notices['wc_orders_incompatible'] = [
-			'html'    => esc_html__( "Although the WooCommerce and Protected Content features are enabled, ElasticPress will not integrate with the WooCommerce Orders list if WooCommerce's High-performance order storage is enabled on WooCommerce versions below 9.8.0. HPOS is compatible with ElasticPress on WooCommerce 9.8.0 and greater.", 'elasticpress' ),
+			'html'    => esc_html__( "Although the WooCommerce and Protected Content features are enabled, ElasticPress will not integrate with the WooCommerce Orders list while WooCommerce's High-performance order storage is enabled. HPOS integration requires WooCommerce 9.8.0 or greater.", 'elasticpress' ),
 			'type'    => 'warning',
 			'dismiss' => true,
 			'scope'   => 'site',

includes/classes/Feature/WooCommerce/OrdersAutosuggest.php

@@ -528,6 +528,10 @@ public function is_enabled(): bool {
 	 * @return boolean
 	 */
 	public function is_hpos_compatible() {
+		if ( ! $this->woocommerce->orders->is_hpos_enabled() ) {
+			return true;
+		}
+
 		return $this->woocommerce->orders->is_hpos_compatible();
 	}
 

tests/e2e/src/specs/woocommerce.spec.ts

@@ -916,24 +916,24 @@ test.describe('WooCommerce Feature', { tag: '@group2' }, () => {
 		test('Will show a navigable list of suggested results when searching orders', async ({
 			loggedInPage,
 		}) => {
-			await goToAdminPage(loggedInPage, 'edit.php?post_type=shop_order');
+			await goToAdminPage(loggedInPage, 'admin.php?page=wc-orders');
 
 			// The combobox will not render if not using ElasticPress.io
 			if (!isEpIo()) {
 				await expect(
-					loggedInPage.locator('#posts-filter .ep-combobox__input'),
+					loggedInPage.locator('#wc-orders-filter .ep-combobox__input'),
 				).not.toBeVisible();
 				return;
 			}
 
 			// Prepare aliases
 			const apiRequestPromise = loggedInPage.waitForResponse('**/api/v1/search/orders/*');
-			const input = loggedInPage.locator('#posts-filter .ep-combobox__input');
+			const input = loggedInPage.locator('#wc-orders-filter .ep-combobox__input');
 			const description = loggedInPage.locator(
-				'#posts-filter .ep-combobox > .screen-reader-text',
+				'#wc-orders-filter .ep-combobox > .screen-reader-text',
 			);
-			const listbox = loggedInPage.locator('#posts-filter .ep-combobox__list');
-			const submit = loggedInPage.locator('#posts-filter .search-box .button');
+			const listbox = loggedInPage.locator('#wc-orders-filter .ep-combobox__list');
+			const submit = loggedInPage.locator('#wc-orders-filter .search-box .button');
 
 			// Search for "Antwon". 3 suggestions should appear
 			await input.fill('Antwon');
@@ -1003,7 +1003,7 @@ test.describe('WooCommerce Feature', { tag: '@group2' }, () => {
 			await expect(loggedInPage).toHaveURL(/.*post\.php\?post=/);
 
 			// Test clicking suggestions
-			await goToAdminPage(loggedInPage, 'edit.php?post_type=shop_order');
+			await goToAdminPage(loggedInPage, 'admin.php?page=wc-orders');
 			await input.fill('Antwon');
 			await loggedInPage.waitForResponse('**/api/v1/search/orders/*');
 			await listbox.locator('> *').nth(1).click();

tests/php/features/WooCommerce/TestWooCommerceOrders.php

@@ -356,20 +356,21 @@ public function test_hpos_compatibility_notice() {
 		ElasticPress\Features::factory()->activate_feature( 'protected_content' );
 		$this->assertCount( 1, $this->orders->hpos_compatibility_notice( $notices ) );
 
-		$this->enable_hpos();
-
 		// Force an unsupported WooCommerce version requirement.
-		add_filter(
-			'ep_woocommerce_hpos_min_version',
-			function () {
-				return '99.0.0';
-			}
-		);
+		$change_min_version = function () {
+			return '99.0.0';
+		};
+		add_filter( 'ep_woocommerce_hpos_min_version', $change_min_version );
+
+		// While orders are stored as posts there is nothing to warn about.
+		$this->assertCount( 1, $this->orders->hpos_compatibility_notice( $notices ) );
+
+		$this->enable_hpos();
 
 		$new_notices = $this->orders->hpos_compatibility_notice( $notices );
 		$this->assertCount( 2, $new_notices );
 		$this->assertArrayHasKey( 'wc_orders_incompatible', $new_notices );
-		$this->assertStringContainsString( '9.8.0 and greater', $new_notices['wc_orders_incompatible']['html'] );
+		$this->assertStringContainsString( 'requires WooCommerce 9.8.0 or greater', $new_notices['wc_orders_incompatible']['html'] );
 
 		/**
 		 * Test if the notice is hidden when the user already dismissed it

tests/php/features/WooCommerce/TestWooCommerceOrdersAutosuggest.php

@@ -366,22 +366,34 @@ public function test_is_enabled() {
 	public function test_is_hpos_compatible() {
 		$this->assertTrue( $this->orders_autosuggest->is_hpos_compatible() );
 
+		// Force an unsupported WooCommerce version requirement.
+		$change_min_version = function () {
+			return '99.0.0';
+		};
+		add_filter( 'ep_woocommerce_hpos_min_version', $change_min_version );
+
+		// Orders stored as posts are supported on any WooCommerce version.
+		$this->assertTrue( $this->orders_autosuggest->is_hpos_compatible() );
+
 		// Turn HPOS on
 		$custom_orders_table        = \Automattic\WooCommerce\Internal\DataStores\Orders\CustomOrdersTableController::CUSTOM_ORDERS_TABLE_USAGE_ENABLED_OPTION;
 		$change_custom_orders_table = function () {
 			return 'yes';
 		};
 		add_filter( 'pre_option_' . $custom_orders_table, $change_custom_orders_table );
 
-		// Force an unsupported WooCommerce version requirement.
+		$this->assertFalse( $this->orders_autosuggest->is_hpos_compatible() );
+
+		// HPOS is supported on WooCommerce versions that allow query integration.
+		remove_filter( 'ep_woocommerce_hpos_min_version', $change_min_version );
 		add_filter(
 			'ep_woocommerce_hpos_min_version',
 			function () {
-				return '99.0.0';
+				return '0.0.1';
 			}
 		);
 
-		$this->assertFalse( $this->orders_autosuggest->is_hpos_compatible() );
+		$this->assertTrue( $this->orders_autosuggest->is_hpos_compatible() );
 	}
 
 	/**