Merge pull request #9232 from google/enhancement/#8144-handle-new-and…

…-returning-visitors Enhancement/#8144 - Handle “new visitors” and “returning visitors” to avoid the “partial data” state
google · Sep 10, 2024 · 0023bde · 0023bde
2 parents 437d64b + 357eea2
commit 0023bde
Show file tree

Hide file tree

Showing 26 changed files with 1,506 additions and 396 deletions.
diff --git a/...tics-4/components/audience-segmentation/dashboard/AudienceSelectionPanel/AudienceItems.js b/...tics-4/components/audience-segmentation/dashboard/AudienceSelectionPanel/AudienceItems.js
@@ -81,7 +81,7 @@ export default function AudienceItems( { savedItemSlugs = [] } ) {
 			getConfigurableAudiences,
 			getReport,
 			getAudiencesUserCountReportOptions,
-			getConfiguredSiteKitAndOtherAudiences,
+			getConfigurableSiteKitAndOtherAudiences,
 			hasAudiencePartialData,
 		} = select( MODULES_ANALYTICS_4 );
 
@@ -97,7 +97,7 @@ export default function AudienceItems( { savedItemSlugs = [] } ) {
 
 		// eslint-disable-next-line @wordpress/no-unused-vars-before-return -- We might return before `otherAudiences` is used.
 		const [ siteKitAudiences, otherAudiences ] =
-			getConfiguredSiteKitAndOtherAudiences();
+			getConfigurableSiteKitAndOtherAudiences();
 
 		const isSiteKitAudiencePartialData =
 			hasAudiencePartialData( siteKitAudiences );
@@ -122,7 +122,9 @@ export default function AudienceItems( { savedItemSlugs = [] } ) {
 
 		// Get the user count for the available audiences using the `audienceResourceName` dimension.
 		const audienceResourceNameReport =
-			isSiteKitAudiencePartialData === false || otherAudiences?.length > 0
+			isSiteKitAudiencePartialData === false ||
+			( isSiteKitAudiencePartialData === true &&
+				otherAudiences?.length > 0 )
 				? getReport(
 						getAudiencesUserCountReportOptions(
 							isSiteKitAudiencePartialData

diff --git a/...cs-4/components/audience-segmentation/dashboard/AudienceTilesWidget/AudienceTile/index.js b/...cs-4/components/audience-segmentation/dashboard/AudienceTilesWidget/AudienceTile/index.js
@@ -30,7 +30,7 @@ import { __, sprintf } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import { useInViewSelect } from 'googlesitekit-data';
+import { useInViewSelect, useSelect } from 'googlesitekit-data';
 import {
 	BREAKPOINT_SMALL,
 	BREAKPOINT_TABLET,
@@ -86,15 +86,25 @@ export default function AudienceTile( {
 			propertyID &&
 			select( MODULES_ANALYTICS_4 ).isPropertyPartialData( propertyID )
 		);
-	}, [] );
+	} );
+	const isSiteKitAudience = useSelect( ( select ) =>
+		select( MODULES_ANALYTICS_4 ).isSiteKitAudience( audienceResourceName )
+	);
 	const isAudiencePartialData = useInViewSelect(
-		( select ) =>
-			! isPropertyPartialData &&
-			audienceResourceName &&
-			select( MODULES_ANALYTICS_4 ).isAudiencePartialData(
-				audienceResourceName
-			),
-		[ isPropertyPartialData, audienceResourceName ]
+		( select ) => {
+			if ( isSiteKitAudience ) {
+				return false;
+			}
+
+			return (
+				! isPropertyPartialData &&
+				audienceResourceName &&
+				select( MODULES_ANALYTICS_4 ).isAudiencePartialData(
+					audienceResourceName
+				)
+			);
+		},
+		[ isPropertyPartialData, isSiteKitAudience, audienceResourceName ]
 	);
 	const isTopContentPartialData = useInViewSelect(
 		( select ) =>

diff --git a/...ponents/audience-segmentation/dashboard/AudienceTilesWidget/AudienceTile/index.stories.js b/...ponents/audience-segmentation/dashboard/AudienceTilesWidget/AudienceTile/index.stories.js
@@ -311,7 +311,7 @@ ViewOnlyNoDimensions.args = {
 	viewContext: VIEW_CONTEXT_MAIN_DASHBOARD_VIEW_ONLY,
 	setupRegistry: ( registry ) => {
 		registry.dispatch( MODULES_ANALYTICS_4 ).setSettings( {
-			availableAudiences: null,
+			availableAudiences: [],
 			availableCustomDimensions: [],
 			propertyID: '123456789',
 		} );