Merge pull request #6575 from google/fix/6372-getAnalyticsConfigByMea…

…surementIDs Fix typo in the getAnalyticsConfigByMeasurementIDs selector.
google · Feb 10, 2023 · 8f76070 · 8f76070
2 parents 2e7ea25 + 7265b27
commit 8f76070
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 10 deletions.
diff --git a/assets/js/modules/analytics-4/datastore/webdatastreams.js b/assets/js/modules/analytics-4/datastore/webdatastreams.js
@@ -455,13 +455,20 @@ const baseSelectors = {
 				return null;
 			}
 
+			// eslint-disable-next-line @wordpress/no-unused-vars-before-return
 			const datastreams =
 				select( MODULES_ANALYTICS_4 ).getWebDataStreamsBatch(
 					propertyIDs
 				);
 
+			const resolvedDataStreams = select(
+				MODULES_ANALYTICS_4
+			).hasFinishedResolution( 'getWebDataStreamsBatch', [
+				propertyIDs,
+			] );
+
 			// Return undefined if web data streams haven't been resolved yet.
-			if ( datastreams === undefined ) {
+			if ( ! resolvedDataStreams ) {
 				return undefined;
 			}
 
@@ -473,11 +480,11 @@ const baseSelectors = {
 				}
 
 				for ( const datastream of datastreams[ propertyID ] ) {
-					const { _id: webDataStreamID, webDataStream } = datastream;
+					const { _id: webDataStreamID, webStreamData } = datastream;
 					const {
 						defaultUri: defaultURI,
 						measurementId: measurementID, // eslint-disable-line sitekit/acronym-case
-					} = webDataStream;
+					} = webStreamData;
 
 					if ( ! measurementIDs.includes( measurementID ) ) {
 						continue;

diff --git a/assets/js/modules/analytics-4/datastore/webdatastreams.test.js b/assets/js/modules/analytics-4/datastore/webdatastreams.test.js
@@ -645,14 +645,14 @@ describe( 'modules/analytics-4 webdatastreams', () => {
 				1122334455: [
 					{
 						_id: '110',
-						webDataStream: {
+						webStreamData: {
 							defaultUri: 'http://example-1.test',
 							measurementId: 'G-1101', // eslint-disable-line sitekit/acronym-case
 						},
 					},
 					{
 						_id: '111',
-						webDataStream: {
+						webStreamData: {
 							defaultUri: 'http://example-2.test',
 							measurementId: 'G-1102', // eslint-disable-line sitekit/acronym-case
 						},
@@ -661,14 +661,14 @@ describe( 'modules/analytics-4 webdatastreams', () => {
 				1122334465: [
 					{
 						_id: '112',
-						webDataStream: {
+						webStreamData: {
 							defaultUri: 'http://example-3.test',
 							measurementId: 'G-1103', // eslint-disable-line sitekit/acronym-case
 						},
 					},
 					{
 						_id: '113',
-						webDataStream: {
+						webStreamData: {
 							defaultUri: 'http://example-4.test',
 							measurementId: 'G-1104', // eslint-disable-line sitekit/acronym-case
 						},
@@ -677,21 +677,21 @@ describe( 'modules/analytics-4 webdatastreams', () => {
 				1122334475: [
 					{
 						_id: '114',
-						webDataStream: {
+						webStreamData: {
 							defaultUri: 'http://example-5.test',
 							measurementId: 'G-1105', // eslint-disable-line sitekit/acronym-case
 						},
 					},
 					{
 						_id: '115',
-						webDataStream: {
+						webStreamData: {
 							defaultUri: 'http://example.com',
 							measurementId: 'G-1106', // eslint-disable-line sitekit/acronym-case
 						},
 					},
 					{
 						_id: '116',
-						webDataStream: {
+						webStreamData: {
 							defaultUri: 'http://example-7.test',
 							measurementId: 'G-1107', // eslint-disable-line sitekit/acronym-case
 						},
@@ -733,6 +733,11 @@ describe( 'modules/analytics-4 webdatastreams', () => {
 					.receiveGetWebDataStreamsBatch( datastreams, {
 						propertyIDs,
 					} );
+				registry
+					.dispatch( MODULES_ANALYTICS_4 )
+					.finishResolution( 'getWebDataStreamsBatch', [
+						propertyIDs,
+					] );
 
 				const config = registry
 					.select( MODULES_ANALYTICS_4 )
@@ -758,6 +763,11 @@ describe( 'modules/analytics-4 webdatastreams', () => {
 					.receiveGetWebDataStreamsBatch( datastreams, {
 						propertyIDs,
 					} );
+				registry
+					.dispatch( MODULES_ANALYTICS_4 )
+					.finishResolution( 'getWebDataStreamsBatch', [
+						propertyIDs,
+					] );
 
 				const config = registry
 					.select( MODULES_ANALYTICS_4 )
@@ -783,6 +793,11 @@ describe( 'modules/analytics-4 webdatastreams', () => {
 					.receiveGetWebDataStreamsBatch( datastreams, {
 						propertyIDs,
 					} );
+				registry
+					.dispatch( MODULES_ANALYTICS_4 )
+					.finishResolution( 'getWebDataStreamsBatch', [
+						propertyIDs,
+					] );
 
 				const config = registry
 					.select( MODULES_ANALYTICS_4 )
@@ -803,6 +818,11 @@ describe( 'modules/analytics-4 webdatastreams', () => {
 					.receiveGetWebDataStreamsBatch( datastreams, {
 						propertyIDs,
 					} );
+				registry
+					.dispatch( MODULES_ANALYTICS_4 )
+					.finishResolution( 'getWebDataStreamsBatch', [
+						propertyIDs,
+					] );
 
 				const config = registry
 					.select( MODULES_ANALYTICS_4 )