Merge pull request #10028 from google/bug/9967-custom-dimensions-error

Fix loading state.
google · Jan 17, 2025 · 390cbd5 · 390cbd5
2 parents 3b4df98 + cdd3333
commit 390cbd5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/assets/js/modules/analytics-4/datastore/custom-dimensions.js b/assets/js/modules/analytics-4/datastore/custom-dimensions.js
@@ -340,7 +340,10 @@ const baseSelectors = {
 			const availableCustomDimensions =
 				select( MODULES_ANALYTICS_4 ).getAvailableCustomDimensions();
 
-			if ( availableCustomDimensions === undefined ) {
+			if (
+				availableCustomDimensions === undefined ||
+				availableCustomDimensions === null
+			) {
 				return undefined;
 			}
 

diff --git a/assets/js/modules/analytics-4/datastore/custom-dimensions.test.js b/assets/js/modules/analytics-4/datastore/custom-dimensions.test.js
@@ -472,7 +472,7 @@ describe( 'modules/analytics-4 custom-dimensions', () => {
 				expect( hasCustomDimensions ).toBe( undefined );
 			} );
 
-			it( 'returns false when available custom dimensions are null or not set', () => {
+			it( 'returns undefined when available custom dimensions are null', () => {
 				provideUserAuthentication( registry, { authenticated: false } );
 				registry.dispatch( CORE_USER ).receiveCapabilities( {
 					googlesitekit_manage_options: false,
@@ -481,6 +481,22 @@ describe( 'modules/analytics-4 custom-dimensions', () => {
 					availableCustomDimensions: null,
 				} );
 
+				const hasCustomDimensions = registry
+					.select( MODULES_ANALYTICS_4 )
+					.hasCustomDimensions( [ 'googlesitekit_post_author' ] );
+
+				expect( hasCustomDimensions ).toBe( undefined );
+			} );
+
+			it( 'returns false when available custom dimensions are empty or not set', () => {
+				provideUserAuthentication( registry, { authenticated: false } );
+				registry.dispatch( CORE_USER ).receiveCapabilities( {
+					googlesitekit_manage_options: false,
+				} );
+				registry.dispatch( MODULES_ANALYTICS_4 ).setSettings( {
+					availableCustomDimensions: [],
+				} );
+
 				const hasCustomDimensions = registry
 					.select( MODULES_ANALYTICS_4 )
 					.hasCustomDimensions( [ 'googlesitekit_post_author' ] );