Release 2.6.8

changelog.txt

@@ -1,5 +1,10 @@
 *** WooCommerce Google Listings and Ads Changelog ***
 
+= 2.6.8 - 2024-04-23 =
+* Tweak - Remove deprecated event properties marked as removable after Q1 2024 from the onboarding event tracking.
+* Tweak - Update tags in readme.txt.
+* Update - Restrict product types to be limited to only 10 when converting from categories.
+
 = 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.

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.7
+ * Version: 2.6.8
  * Author: WooCommerce
  * Author URI: https://woo.com/
  * Text Domain: google-listings-and-ads
@@ -30,7 +30,7 @@
 
 defined( 'ABSPATH' ) || exit;
 
-define( 'WC_GLA_VERSION', '2.6.7' ); // WRCS: DEFINED_VERSION.
+define( 'WC_GLA_VERSION', '2.6.8' ); // WRCS: DEFINED_VERSION.
 define( 'WC_GLA_MIN_PHP_VER', '7.4' );
 define( 'WC_GLA_MIN_WC_VER', '6.9' );
 

js/src/components/paid-ads/billing-card/billing-setup-card.test.js

@@ -14,13 +14,6 @@ jest.mock( '.~/hooks/useGoogleAdsAccount', () =>
 	jest.fn().mockName( 'useGoogleAdsAccount' ).mockReturnValue( {} )
 );
 
-jest.mock( '.~/hooks/useDispatchCoreNotices', () =>
-	jest
-		.fn()
-		.mockName( 'useDispatchCoreNotices' )
-		.mockReturnValue( { createNotice: () => {} } )
-);
-
 jest.mock( '.~/hooks/useWindowFocus', () =>
 	jest.fn().mockName( 'useWindowFocus' ).mockReturnValue( true )
 );

js/src/get-started-page/get-started-card/index.js

@@ -17,7 +17,7 @@ import AppButton from '.~/components/app-button';
 import { getSetupMCUrl } from '.~/utils/urls';
 
 /**
- * @fires gla_setup_mc with `{ triggered_by: 'start-onboarding-button', action: 'go-to-onboarding', context: 'get-started', target: 'set_up_free_listings', trigger: 'click' }`.
+ * @fires gla_setup_mc with `{ triggered_by: 'start-onboarding-button', action: 'go-to-onboarding', context: 'get-started' }`.
  * @fires gla_documentation_link_click with `{ context: 'get-started', linkId: 'wp-terms-of-service', href: 'https://wordpress.com/tos/' }`.
  */
 const GetStartedCard = () => {
@@ -55,9 +55,6 @@ const GetStartedCard = () => {
 						triggered_by: 'start-onboarding-button',
 						action: 'go-to-onboarding',
 						context: 'get-started',
-						// 'target' and 'trigger' were deprecated and can be removed after Q1 2024.
-						target: 'set_up_free_listings',
-						trigger: 'click',
 					} }
 				>
 					{ __(

js/src/get-started-page/get-started-with-video-card/index.js

@@ -17,7 +17,7 @@ import { getSetupMCUrl } from '.~/utils/urls';
 import './index.scss';
 
 /**
- * @fires gla_setup_mc with `{ triggered_by: 'start-onboarding-button', action: 'go-to-onboarding', context: 'get-started-with-video', target: 'set_up_free_listings', trigger: 'click' }`.
+ * @fires gla_setup_mc with `{ triggered_by: 'start-onboarding-button', action: 'go-to-onboarding', context: 'get-started-with-video' }`.
  * @fires gla_documentation_link_click with `{ context: 'get-started-with-video', linkId: 'wp-terms-of-service', href: 'https://wordpress.com/tos/' }`.
  */
 const GetStartedWithVideoCard = () => {
@@ -70,9 +70,6 @@ const GetStartedWithVideoCard = () => {
 						triggered_by: 'start-onboarding-button',
 						action: 'go-to-onboarding',
 						context: 'get-started-with-video',
-						// 'target' and 'trigger' were deprecated and can be removed after Q1 2024.
-						target: 'set_up_free_listings',
-						trigger: 'click',
 					} }
 				>
 					{ __(

js/src/product-feed/index.test.js

@@ -27,18 +27,6 @@ jest.mock( '.~/utils/localStorage', () => {
 	};
 } );
 
-jest.mock( '.~/hooks/useDispatchCoreNotices', () => ( {
-	__esModule: true,
-	default: jest
-		.fn()
-		.mockName( 'useDispatchCoreNotices' )
-		.mockImplementation( () => {
-			return {
-				createNotice: jest.fn(),
-			};
-		} ),
-} ) );
-
 jest.mock( '.~/utils/isWCTracksEnabled', () => jest.fn() );
 
 const SUBMISSION_SUCCESS_GUIDE_TEXT =

js/src/product-feed/review-request/index.test.js

@@ -16,13 +16,6 @@ jest.mock( '.~/utils/tracks', () => {
 	};
 } );
 
-jest.mock( '.~/hooks/useDispatchCoreNotices', () => ( {
-	__esModule: true,
-	default: jest.fn().mockName( 'useDispatchCoreNotices' ).mockReturnValue( {
-		createNotice: jest.fn(),
-	} ),
-} ) );
-
 /**
  * External dependencies
  */

js/src/product-feed/review-request/review-request-modal.test.js

@@ -4,18 +4,6 @@ jest.mock( '.~/utils/tracks', () => {
 	};
 } );
 
-jest.mock( '.~/hooks/useDispatchCoreNotices', () => ( {
-	__esModule: true,
-	default: jest
-		.fn()
-		.mockName( 'useDispatchCoreNotices' )
-		.mockImplementation( () => {
-			return {
-				createNotice: jest.fn(),
-			};
-		} ),
-} ) );
-
 jest.mock( '.~/data', () => ( {
 	__esModule: true,
 	useAppDispatch: jest.fn( () => {

js/src/setup-ads/ads-stepper/index.js

@@ -11,7 +11,10 @@ import { useState } from '@wordpress/element';
 import SetupAccounts from './setup-accounts';
 import AdsCampaign from '.~/components/paid-ads/ads-campaign';
 import SetupBilling from './setup-billing';
-import { recordGlaEvent } from '.~/utils/tracks';
+import {
+	recordStepperChangeEvent,
+	recordStepContinueEvent,
+} from '.~/utils/tracks';
 
 /**
  * @param {Object} props React props
@@ -26,10 +29,7 @@ const AdsStepper = ( { formProps } ) => {
 	// Users can only go forward by clicking on the Continue button.
 	const handleStepClick = ( value ) => {
 		if ( value < step ) {
-			recordGlaEvent( 'gla_setup_ads', {
-				triggered_by: `stepper-step${ value }-button`,
-				action: `go-to-step${ value }`,
-			} );
+			recordStepperChangeEvent( 'gla_setup_ads', value );
 			setStep( value );
 		}
 	};
@@ -42,10 +42,7 @@ const AdsStepper = ( { formProps } ) => {
 	const continueStep = ( to ) => {
 		const from = step;
 
-		recordGlaEvent( 'gla_setup_ads', {
-			triggered_by: `step${ from }-continue-button`,
-			action: `go-to-step${ to }`,
-		} );
+		recordStepContinueEvent( 'gla_setup_ads', from, to );
 		setStep( to );
 	};
 

js/src/setup-ads/ads-stepper/index.test.js

@@ -0,0 +1,131 @@
+jest.mock( '@woocommerce/tracks', () => {
+	return {
+		recordEvent: jest.fn().mockName( 'recordEvent' ),
+	};
+} );
+
+jest.mock( './setup-accounts', () => jest.fn().mockName( 'SetupAccounts' ) );
+jest.mock( '.~/components/paid-ads/ads-campaign', () =>
+	jest.fn().mockName( 'AdsCampaign' )
+);
+jest.mock( './setup-billing', () => jest.fn().mockName( 'SetupBilling' ) );
+
+/**
+ * External dependencies
+ */
+import { screen, render } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { recordEvent } from '@woocommerce/tracks';
+
+/**
+ * Internal dependencies
+ */
+import AdsStepper from './';
+import { addBaseEventProperties as withBaseProperties } from '.~/utils/tracks';
+import SetupAccounts from './setup-accounts';
+import AdsCampaign from '.~/components/paid-ads/ads-campaign';
+import SetupBilling from './setup-billing';
+
+describe( 'AdsStepper', () => {
+	let continueToStep2;
+	let continueToStep3;
+
+	beforeEach( () => {
+		SetupAccounts.mockImplementation( ( { onContinue } ) => {
+			continueToStep2 = onContinue;
+			return null;
+		} );
+
+		AdsCampaign.mockImplementation( ( { onContinue } ) => {
+			continueToStep3 = onContinue;
+			return null;
+		} );
+
+		SetupBilling.mockReturnValue( null );
+	} );
+
+	afterEach( () => {
+		jest.clearAllMocks();
+	} );
+
+	function continueUntilStep3() {
+		continueToStep2();
+		continueToStep3();
+	}
+
+	describe( 'tracks', () => {
+		it( 'Should record events after calling back to `onContinue`', () => {
+			render( <AdsStepper /> );
+
+			continueUntilStep3();
+
+			expect( recordEvent ).toHaveBeenCalledTimes( 2 );
+			expect( recordEvent ).toHaveBeenNthCalledWith(
+				1,
+				'gla_setup_ads',
+				withBaseProperties( {
+					action: 'go-to-step2',
+					triggered_by: 'step1-continue-button',
+				} )
+			);
+			expect( recordEvent ).toHaveBeenNthCalledWith(
+				2,
+				'gla_setup_ads',
+				withBaseProperties( {
+					action: 'go-to-step3',
+					triggered_by: 'step2-continue-button',
+				} )
+			);
+		} );
+
+		it( 'Should record events after clicking step navigation buttons', async () => {
+			render( <AdsStepper /> );
+
+			const step1 = screen.getByRole( 'button', { name: /accounts/ } );
+			const step2 = screen.getByRole( 'button', { name: /campaign/ } );
+
+			// Step 3 -> Step 2 -> Step 1
+			continueUntilStep3();
+			recordEvent.mockClear();
+			expect( recordEvent ).toHaveBeenCalledTimes( 0 );
+
+			await userEvent.click( step2 );
+			await userEvent.click( step1 );
+
+			expect( recordEvent ).toHaveBeenCalledTimes( 2 );
+			expect( recordEvent ).toHaveBeenNthCalledWith(
+				1,
+				'gla_setup_ads',
+				withBaseProperties( {
+					action: 'go-to-step2',
+					triggered_by: 'stepper-step2-button',
+				} )
+			);
+			expect( recordEvent ).toHaveBeenNthCalledWith(
+				2,
+				'gla_setup_ads',
+				withBaseProperties( {
+					action: 'go-to-step1',
+					triggered_by: 'stepper-step1-button',
+				} )
+			);
+
+			// Step 3 -> Step 1
+			continueUntilStep3();
+			recordEvent.mockClear();
+			expect( recordEvent ).toHaveBeenCalledTimes( 0 );
+
+			await userEvent.click( step1 );
+
+			expect( recordEvent ).toHaveBeenCalledTimes( 1 );
+			expect( recordEvent ).toHaveBeenNthCalledWith(
+				1,
+				'gla_setup_ads',
+				withBaseProperties( {
+					action: 'go-to-step1',
+					triggered_by: 'stepper-step1-button',
+				} )
+			);
+		} );
+	} );
+} );

js/src/setup-ads/top-bar/index.js

@@ -12,7 +12,7 @@ import HelpIconButton from '.~/components/help-icon-button';
 import { recordGlaEvent } from '.~/utils/tracks';
 
 /**
- * @fires gla_setup_ads with given `{ triggered_by: 'back-button', action: 'leave', target: 'back', trigger: 'click' }` when back button is clicked.
+ * @fires gla_setup_ads with given `{ triggered_by: 'back-button', action: 'leave' }` when back button is clicked.
  */
 const SetupAdsTopBar = () => {
 	// We record the intent to go back or to help - clicking buttons.
@@ -22,9 +22,6 @@ const SetupAdsTopBar = () => {
 		recordGlaEvent( 'gla_setup_ads', {
 			triggered_by: 'back-button',
 			action: 'leave',
-			// 'target' and 'trigger' were deprecated and can be removed after Q1 2024.
-			target: 'back',
-			trigger: 'click',
 		} );
 	};
 

js/src/setup-mc/setup-stepper/saved-setup-stepper.js

@@ -22,12 +22,15 @@ import SetupFreeListings from '.~/components/free-listings/setup-free-listings';
 import StoreRequirements from './store-requirements';
 import SetupPaidAds from './setup-paid-ads';
 import stepNameKeyMap from './stepNameKeyMap';
-import { recordGlaEvent } from '.~/utils/tracks';
+import {
+	recordStepperChangeEvent,
+	recordStepContinueEvent,
+} from '.~/utils/tracks';
 
 /**
  * @param {Object} props React props
  * @param {string} [props.savedStep] A saved step overriding the current step
- * @fires gla_setup_mc with `{ triggered_by: 'step1-continue-button' | 'step2-continue-button', 'step3-continue-button', action: 'go-to-step2' | 'go-to-step3' | 'go-to-step4', target: 'step1_continue' | 'step2_continue' | 'step3_continue', trigger: 'click' }`.
+ * @fires gla_setup_mc with `{ triggered_by: 'step1-continue-button' | 'step2-continue-button', 'step3-continue-button', action: 'go-to-step2' | 'go-to-step3' | 'go-to-step4' }`.
  * @fires gla_setup_mc with `{ triggered_by: 'stepper-step1-button' | 'stepper-step2-button' | 'stepper-step3-button', action: 'go-to-step1' | 'go-to-step2' | 'go-to-step3' }`.
  */
 const SavedSetupStepper = ( { savedStep } ) => {
@@ -82,13 +85,7 @@ const SavedSetupStepper = ( { savedStep } ) => {
 	const continueStep = ( to ) => {
 		const from = step;
 
-		recordGlaEvent( 'gla_setup_mc', {
-			triggered_by: `step${ from }-continue-button`,
-			action: `go-to-step${ to }`,
-			// 'target' and 'trigger' were deprecated and can be removed after Q1 2024.
-			target: `step${ from }_continue`,
-			trigger: 'click',
-		} );
+		recordStepContinueEvent( 'gla_setup_mc', from, to );
 		setStep( to );
 	};
 
@@ -107,10 +104,7 @@ const SavedSetupStepper = ( { savedStep } ) => {
 	const handleStepClick = ( stepKey ) => {
 		// Only allow going back to the previous steps.
 		if ( Number( stepKey ) < Number( step ) ) {
-			recordGlaEvent( 'gla_setup_mc', {
-				triggered_by: `stepper-step${ stepKey }-button`,
-				action: `go-to-step${ stepKey }`,
-			} );
+			recordStepperChangeEvent( 'gla_setup_mc', stepKey );
 			setStep( stepKey );
 		}
 	};