Merge branch 'feature/google-api-project' into tweak/prevent-notification-erorrs-deleted-products

Author: puntope

.gitattributes

@@ -6,6 +6,7 @@ bin export-ignore
 tests export-ignore
 js/src export-ignore
 js/build-dev export-ignore
+docs export-ignore
 README.md export-ignore
 package.json export-ignore
 package-lock.json export-ignore
@@ -20,6 +21,7 @@ webpack.config.js export-ignore
 webpack-development.config.js export-ignore
 jest.config.js export-ignore
 wordpress_org_assets export-ignore
+.codecov.yml export-ignore
 .editorconfig export-ignore
 .externalized.json export-ignore
 .prettierrc.js export-ignore
@@ -28,5 +30,7 @@ wordpress_org_assets export-ignore
 .eslintrc.js export-ignore
 .stylelintignore export-ignore
 .stylelintrc.json export-ignore
+.npmrc export-ignore
 .nvmrc export-ignore
 .jsdocrc.json export-ignore
+.wp-env.json export-ignore

.wp-env.json

@@ -1,6 +1,7 @@
 {
 	"phpVersion": "8.0",
 	"plugins": [
+		"https://downloads.wordpress.org/plugin/woocommerce.latest-stable.zip",
 		"https://github.com/WP-API/Basic-Auth/archive/master.zip",
 		"./tests/e2e/test-data",
 		"./tests/e2e/test-snippets",

changelog.txt

@@ -1,5 +1,18 @@
 *** WooCommerce Google Listings and Ads Changelog ***
 
+= 2.6.7 - 2024-04-16 =
+* Dev - Add E2E tests for the integration in the classic product editor.
+* Dev - Update e2e test environment to install WooCommerce earlier.
+* Fix - Exception in request review.
+
+= 2.6.6 - 2024-04-09 =
+* Dev - Add snippet to bypass WooCommerce dependency in E2E tests.
+* Tweak - WC 8.8 compatibility.
+
+= 2.6.5 - 2024-04-04 =
+* Dev - Update test proxy port.
+* Tweak - Show Review Inbox Notices when 11 clicks and 1 Conversion.
+
 = 2.6.4 - 2024-03-26 =
 * Add - Filter WC REST API responses for gla_syncable param.
 * Add - Missing functions for the WPCOM OAuth flow.

google-listings-and-ads.php

@@ -3,7 +3,7 @@
  * Plugin Name: Google Listings and Ads
  * Plugin URL: https://wordpress.org/plugins/google-listings-and-ads/
  * Description: Native integration with Google that allows merchants to easily display their products across Google’s network.
- * Version: 2.6.4
+ * Version: 2.6.7
  * Author: WooCommerce
  * Author URI: https://woo.com/
  * Text Domain: google-listings-and-ads
@@ -13,7 +13,7 @@
  * Requires PHP Architecture: 64 bits
  * Requires Plugins: woocommerce
  * WC requires at least: 6.9
- * WC tested up to: 8.7
+ * WC tested up to: 8.8
  * Woo:
  *
  * @package WooCommerce\Admin
@@ -30,7 +30,7 @@
 
 defined( 'ABSPATH' ) || exit;
 
-define( 'WC_GLA_VERSION', '2.6.4' ); // WRCS: DEFINED_VERSION.
+define( 'WC_GLA_VERSION', '2.6.7' ); // WRCS: DEFINED_VERSION.
 define( 'WC_GLA_MIN_PHP_VER', '7.4' );
 define( 'WC_GLA_MIN_WC_VER', '6.9' );
 

js/src/product-feed/review-request/review-request-notice.js

@@ -64,7 +64,8 @@ const ReviewRequestNotice = ( {
 			<FlexItem className="gla-review-request-notice__button">
 				{ accountReviewStatus.requestButton &&
 					( account.cooldown ||
-						account.reviewEligibleRegions.length > 0 ) && (
+						Object.keys( account.reviewEligibleRegions )?.length >
+							0 ) && (
 						<AppButton
 							isPrimary
 							onClick={ onRequestReviewClick }