Address merge review comments.

google · Jul 9, 2024 · 2cb081b · 2cb081b
1 parent 2785244
commit 2cb081b
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 31 deletions.
diff --git a/assets/js/consent-mode/consent-mode.js b/assets/js/consent-mode/consent-mode.js
@@ -15,30 +15,31 @@
  */
 
 ( function () {
-	document.addEventListener(
-		'wp_listen_for_consent_change',
-		function ( event ) {
-			if ( event.detail ) {
-				const consentParameters = {};
-				let hasConsentParameters = false;
-				Object.keys( event.detail ).forEach( ( category ) => {
-					if ( global._googlesitekitConsentCategoryMap[ category ] ) {
-						const status = event.detail[ category ];
-						const mappedStatus =
-							status === 'allow' ? 'granted' : 'denied';
-						const parameters =
-							global._googlesitekitConsentCategoryMap[ category ];
-						parameters.forEach( ( parameter ) => {
-							consentParameters[ parameter ] = mappedStatus;
-						} );
-						hasConsentParameters = !! parameters.length;
-					}
-				} );
-				if ( hasConsentParameters ) {
-					global.gtag( 'consent', 'update', consentParameters );
+	function actionConsentChange( event ) {
+		if ( event.detail ) {
+			const consentParameters = {};
+			let hasConsentParameters = false;
+			Object.keys( event.detail ).forEach( ( category ) => {
+				if ( global._googlesitekitConsentCategoryMap[ category ] ) {
+					const status = event.detail[ category ];
+					const mappedStatus =
+						status === 'allow' ? 'granted' : 'denied';
+					const parameters =
+						global._googlesitekitConsentCategoryMap[ category ];
+					parameters.forEach( ( parameter ) => {
+						consentParameters[ parameter ] = mappedStatus;
+					} );
+					hasConsentParameters = !! parameters.length;
 				}
+			} );
+			if ( hasConsentParameters ) {
+				global.gtag( 'consent', 'update', consentParameters );
 			}
 		}
+	}
+	document.addEventListener(
+		'wp_listen_for_consent_change',
+		actionConsentChange
 	);
 
 	function updateGrantedConsent() {

diff --git a/assets/js/consent-mode/consent-mode.test.js b/assets/js/consent-mode/consent-mode.test.js
@@ -32,7 +32,8 @@ describe( 'Consent Mode', () => {
 	} );
 
 	afterEach( () => {
-		jest.restoreAllMocks();
+		delete global.gtag;
+		delete global._googlesitekitConsentCategoryMap;
 	} );
 
 	it( 'should call gtag with the correct parameters when wp_listen_for_consent_change event is triggered', () => {

diff --git a/includes/Core/Consent_Mode/Consent_Mode.php b/includes/Core/Consent_Mode/Consent_Mode.php
@@ -88,8 +88,7 @@ public function register() {
 				1 // Set priority to 1 to ensure the snippet is printed with top priority in the head.
 			);
 
-			// Register the consent mode script.
-			add_action( 'wp_enqueue_scripts', fn () => $this->enqueue_script() );
+			add_action( 'wp_enqueue_scripts', fn () => $this->register_and_enqueue_script() );
 		}
 
 		add_filter(
@@ -103,15 +102,15 @@ function () use ( $consent_mode_enabled ) {
 	}
 
 	/**
-	 * Enqueues the consent mode script.
+	 * Registers and Enqueues the consent mode script.
 	 *
 	 * @since n.e.x.t
 	 */
-	protected function enqueue_script() {
+	protected function register_and_enqueue_script() {
 		$consent_mode_script = new Script(
-			'consent-mode',
+			'googlesitekit-consent-mode',
 			array(
-				'src' => $this->context->url( 'dist/assets/js/consent-mode.js' ),
+				'src' => $this->context->url( 'dist/assets/js/googlesitekit-consent-mode.js' ),
 			)
 		);
 		$consent_mode_script->register( $this->context );

diff --git a/webpack/basicModules.config.js b/webpack/basicModules.config.js
@@ -39,8 +39,6 @@ module.exports = ( mode ) => ( {
 		// Analytics advanced tracking script to be injected in the frontend.
 		'analytics-advanced-tracking':
 			'./assets/js/analytics-advanced-tracking.js',
-		// Consent Mode script.
-		'consent-mode': './assets/js/consent-mode/consent-mode.js',
 	},
 	externals,
 	output: {

diff --git a/webpack/frontendModules.config.js b/webpack/frontendModules.config.js
@@ -36,7 +36,8 @@ const {
 module.exports = ( mode ) => ( {
 	entry: {
 		// Consent Mode
-		'consent-mode': './assets/js/consent-mode/consent-mode.js',
+		'googlesitekit-consent-mode':
+			'./assets/js/consent-mode/consent-mode.js',
 		// Event Providers
 		'googlesitekit-events-provider-contact-form-7':
 			'./assets/js/event-providers/contact-form-7.js',