Merge pull request #5916 from google/followup/5621-alt

Fix GA4 issues when connecting after initial setup
google · Sep 27, 2022 · 5a442c2 · 5a442c2
2 parents 91a5f1d + c89702b
commit 5a442c2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/assets/js/modules/analytics-4/datastore/settings.js b/assets/js/modules/analytics-4/datastore/settings.js
@@ -45,6 +45,7 @@ import {
 	PROPERTY_CREATE,
 	WEBDATASTREAM_CREATE,
 } from './constants';
+import { CORE_MODULES } from '../../../googlesitekit/modules/datastore/constants';
 
 // Invariant error messages.
 export const INVARIANT_INVALID_PROPERTY_SELECTION =
@@ -96,6 +97,14 @@ export async function submitChanges( { select, dispatch } ) {
 		if ( error ) {
 			return { error };
 		}
+
+		if (
+			select( CORE_MODULES ).isModuleConnected( 'analytics' ) &&
+			! select( CORE_MODULES ).isModuleConnected( 'analytics-4' )
+		) {
+			// Refresh modules from server if GA4 was connected after initial setup.
+			await dispatch( CORE_MODULES ).fetchGetModules();
+		}
 	}
 
 	await API.invalidateCache( 'modules', 'analytics-4' );

diff --git a/assets/js/modules/analytics/components/settings/GA4SettingsControls.js b/assets/js/modules/analytics/components/settings/GA4SettingsControls.js
@@ -160,10 +160,21 @@ export default function GA4SettingsControls( { hasModuleAccess } ) {
 
 	useEffect( () => {
 		// Ensure preselection of the GA4 property works when navigating from the "Connect Google Analytics 4" CTA button.
-		if ( enableGA4 && ! propertyID && matchedProperty ) {
+		if (
+			enableGA4 &&
+			! propertyID &&
+			matchedProperty &&
+			matchedWebDataStream
+		) {
 			onActivate();
 		}
-	}, [ enableGA4, matchedProperty, onActivate, propertyID ] );
+	}, [
+		enableGA4,
+		matchedProperty,
+		matchedWebDataStream,
+		onActivate,
+		propertyID,
+	] );
 
 	if ( isAdminAPIWorking === undefined ) {
 		return <ProgressBar height={ isDisabled ? 180 : 212 } small />;