Merge pull request #9984 from google/enhancement/9604-hide-not-set-au…

…dience-segmentation
google · Jan 24, 2025 · 37b72fa · 37b72fa
2 parents c2e2533 + e69555a
commit 37b72fa
Show file tree

Hide file tree

Showing 34 changed files with 30 additions and 36 deletions.
diff --git a/...alytics-4/components/audience-segmentation/dashboard/AudienceTilesWidget/AudienceTiles.js b/...alytics-4/components/audience-segmentation/dashboard/AudienceTilesWidget/AudienceTiles.js
@@ -56,6 +56,7 @@ import { isInvalidCustomDimensionError } from '../../../../utils/custom-dimensio
 import useViewContext from '../../../../../../hooks/useViewContext';
 import useViewOnly from '../../../../../../hooks/useViewOnly';
 import { trackEvent } from '../../../../../../util';
+import { reportRowsWithSetValues } from '../../../../utils/report-rows-with-set-values';
 
 const hasZeroDataForAudience = ( report, dimensionName ) => {
 	const audienceData = report?.rows?.find(
@@ -566,6 +567,11 @@ export default function AudienceTiles( { Widget, widgetLoading } ) {
 							isPartialData,
 						} = getAudienceTileData( audienceResourceName, index );
 
+						// Filter (not set) value from the top countries report if present.
+						const filteredTopCitiesRows = topCities?.rows
+							? reportRowsWithSetValues( topCities.rows )
+							: [];
+
 						// Return loading tile if data is not yet loaded.
 						if (
 							loading ||
@@ -632,19 +638,19 @@ export default function AudienceTiles( { Widget, widgetLoading } ) {
 								}
 								topCities={ {
 									dimensionValues: [
-										topCities?.rows?.[ 0 ]
+										filteredTopCitiesRows?.[ 0 ]
 											?.dimensionValues?.[ 0 ],
-										topCities?.rows?.[ 1 ]
+										filteredTopCitiesRows?.[ 1 ]
 											?.dimensionValues?.[ 0 ],
-										topCities?.rows?.[ 2 ]
+										filteredTopCitiesRows?.[ 2 ]
 											?.dimensionValues?.[ 0 ],
 									],
 									metricValues: [
-										topCities?.rows?.[ 0 ]
+										filteredTopCitiesRows?.[ 0 ]
 											?.metricValues?.[ 0 ],
-										topCities?.rows?.[ 1 ]
+										filteredTopCitiesRows?.[ 1 ]
 											?.metricValues?.[ 0 ],
-										topCities?.rows?.[ 2 ]
+										filteredTopCitiesRows?.[ 2 ]
 											?.metricValues?.[ 0 ],
 									],
 									total: visitors,

diff --git a/...ents/audience-segmentation/dashboard/AudienceTilesWidget/__snapshots__/index.test.js.snap b/...ents/audience-segmentation/dashboard/AudienceTilesWidget/__snapshots__/index.test.js.snap
@@ -224,12 +224,12 @@ exports[`AudienceTilesWidget should not render audiences that are not available
                         <div
                           class="googlesitekit-audience-segmentation-tile-metric__cities-metric-name"
                         >
-                          (not set)
+                          New York
                         </div>
                         <div
                           class="googlesitekit-audience-segmentation-tile-metric__cities-metric-value"
                         >
-                          99%
+                          71.1%
                         </div>
                       </div>
                       <div
@@ -640,12 +640,12 @@ exports[`AudienceTilesWidget should render correctly when there is partial data
                         <div
                           class="googlesitekit-audience-segmentation-tile-metric__cities-metric-name"
                         >
-                          (not set)
+                          New York
                         </div>
                         <div
                           class="googlesitekit-audience-segmentation-tile-metric__cities-metric-value"
                         >
-                          78.6%
+                          392.9%
                         </div>
                       </div>
                     </div>
@@ -1153,12 +1153,12 @@ exports[`AudienceTilesWidget should render when all configured audiences are mat
                         <div
                           class="googlesitekit-audience-segmentation-tile-metric__cities-metric-name"
                         >
-                          (not set)
+                          New York
                         </div>
                         <div
                           class="googlesitekit-audience-segmentation-tile-metric__cities-metric-value"
                         >
-                          106.7%
+                          76.7%
                         </div>
                       </div>
                       <div
@@ -1513,12 +1513,12 @@ exports[`AudienceTilesWidget should render when configured audience is matching
                         <div
                           class="googlesitekit-audience-segmentation-tile-metric__cities-metric-name"
                         >
-                          (not set)
+                          New York
                         </div>
                         <div
                           class="googlesitekit-audience-segmentation-tile-metric__cities-metric-value"
                         >
-                          145.5%
+                          104.5%
                         </div>
                       </div>
                       <div

diff --git a/...alytics-4/components/audience-segmentation/dashboard/AudienceTilesWidget/index.stories.js b/...alytics-4/components/audience-segmentation/dashboard/AudienceTilesWidget/index.stories.js
@@ -75,7 +75,7 @@ const topCitiesReportOptions = {
 			desc: true,
 		},
 	],
-	limit: 3,
+	limit: 4,
 };
 
 const topContentReportOptions = {
@@ -127,9 +127,7 @@ Default.args = {
 		'properties/12345/audiences/4', // Returning visitors
 	],
 };
-Default.scenario = {
-	label: 'Modules/Analytics4/Components/AudienceSegmentation/Dashboard/AudienceTilesWidget/Default',
-};
+Default.scenario = {};
 
 export const DefaultWithMissingCustomDimension = Template.bind( {} );
 DefaultWithMissingCustomDimension.storyName =
@@ -146,9 +144,7 @@ DefaultWithMissingCustomDimension.args = {
 		} );
 	},
 };
-DefaultWithMissingCustomDimension.scenario = {
-	label: 'Modules/Analytics4/Components/AudienceSegmentation/Dashboard/AudienceTilesWidget/DefaultWithMissingCustomDimension',
-};
+DefaultWithMissingCustomDimension.scenario = {};
 
 export const DefaultViewOnlyWithCustomDimensionError = Template.bind( {} );
 DefaultViewOnlyWithCustomDimensionError.storyName =
@@ -245,9 +241,7 @@ DefaultWithZeroTile.args = {
 			} );
 	},
 };
-DefaultWithZeroTile.scenario = {
-	label: 'Modules/Analytics4/Components/AudienceSegmentation/Dashboard/AudienceTilesWidget/DefaultWithZeroTile',
-};
+DefaultWithZeroTile.scenario = {};
 
 export const TwoTiles = Template.bind( {} );
 TwoTiles.storyName = 'Two Tiles';
@@ -257,9 +251,7 @@ TwoTiles.args = {
 		'properties/12345/audiences/3', // New visitors
 	],
 };
-TwoTiles.scenario = {
-	label: 'Modules/Analytics4/Components/AudienceSegmentation/Dashboard/AudienceTilesWidget/TwoTiles',
-};
+TwoTiles.scenario = {};
 
 export const TwoTilesWithMissingCustomDimension = Template.bind( {} );
 TwoTilesWithMissingCustomDimension.storyName =
@@ -367,9 +359,7 @@ TwoTilesWithZeroTile.args = {
 			} );
 	},
 };
-TwoTilesWithZeroTile.scenario = {
-	label: 'Modules/Analytics4/Components/AudienceSegmentation/Dashboard/AudienceTilesWidget/TwoTilesWithZeroTile',
-};
+TwoTilesWithZeroTile.scenario = {};
 
 export const ZeroTileWithPlaceholder = Template.bind( {} );
 ZeroTileWithPlaceholder.storyName = 'ZeroTileWithPlaceholder';
@@ -426,9 +416,7 @@ ZeroTileWithPlaceholder.args = {
 			} );
 	},
 };
-ZeroTileWithPlaceholder.scenario = {
-	label: 'Modules/Analytics4/Components/AudienceSegmentation/Dashboard/AudienceTilesWidget/ZeroTileWithPlaceholder',
-};
+ZeroTileWithPlaceholder.scenario = {};
 
 export const DefaultAudiencesPartialData = Template.bind( {} );
 DefaultAudiencesPartialData.storyName = 'DefaultAudiencesPartialData';
@@ -625,7 +613,7 @@ SingleTileErrored.args = {
 					desc: true,
 				},
 			],
-			limit: 3,
+			limit: 4,
 		};
 
 		const errorReport = {

diff --git a/.../analytics-4/components/audience-segmentation/dashboard/AudienceTilesWidget/index.test.js b/.../analytics-4/components/audience-segmentation/dashboard/AudienceTilesWidget/index.test.js
@@ -163,7 +163,7 @@ function provideAudienceTilesMockReport(
 				desc: true,
 			},
 		],
-		limit: 3,
+		limit: 4,
 	};
 
 	const topContentReportOptions = {

diff --git a/assets/js/modules/analytics-4/hooks/useAudienceTilesReports.js b/assets/js/modules/analytics-4/hooks/useAudienceTilesReports.js
@@ -305,7 +305,7 @@ export default function useAudienceTilesReports( {
 				desc: true,
 			},
 		],
-		limit: 3,
+		limit: 4, // Limit is set to 4 so that (not set) can be filtered out and 3 cities remain to display.
 	};
 
 	const topCitiesReport = useInViewSelect( ( select ) =>

diff --git a/...ashboard_AudienceTilesWidget_DefaultAudiencesPartialData_0_document_0_small.png b/...ashboard_AudienceTilesWidget_DefaultAudiencesPartialData_0_document_0_small.png
diff --git a/...shboard_AudienceTilesWidget_DefaultAudiencesPartialData_0_document_1_medium.png b/...shboard_AudienceTilesWidget_DefaultAudiencesPartialData_0_document_1_medium.png
diff --git a/...ashboard_AudienceTilesWidget_DefaultAudiencesPartialData_0_document_2_large.png b/...ashboard_AudienceTilesWidget_DefaultAudiencesPartialData_0_document_2_large.png
diff --git a/...ienceTilesWidget_DefaultViewOnlyWithCustomDimensionError_0_document_0_small.png b/...ienceTilesWidget_DefaultViewOnlyWithCustomDimensionError_0_document_0_small.png
diff --git a/...enceTilesWidget_DefaultViewOnlyWithCustomDimensionError_0_document_1_medium.png b/...enceTilesWidget_DefaultViewOnlyWithCustomDimensionError_0_document_1_medium.png
diff --git a/...ienceTilesWidget_DefaultViewOnlyWithCustomDimensionError_0_document_2_large.png b/...ienceTilesWidget_DefaultViewOnlyWithCustomDimensionError_0_document_2_large.png
diff --git a/...rd_AudienceTilesWidget_DefaultWithMissingCustomDimension_0_document_0_small.png b/...rd_AudienceTilesWidget_DefaultWithMissingCustomDimension_0_document_0_small.png
diff --git a/...d_AudienceTilesWidget_DefaultWithMissingCustomDimension_0_document_1_medium.png b/...d_AudienceTilesWidget_DefaultWithMissingCustomDimension_0_document_1_medium.png
diff --git a/...rd_AudienceTilesWidget_DefaultWithMissingCustomDimension_0_document_2_large.png b/...rd_AudienceTilesWidget_DefaultWithMissingCustomDimension_0_document_2_large.png
diff --git a/...tation_Dashboard_AudienceTilesWidget_DefaultWithZeroTile_0_document_2_large.png b/...tation_Dashboard_AudienceTilesWidget_DefaultWithZeroTile_0_document_2_large.png
diff --git a/...dienceSegmentation_Dashboard_AudienceTilesWidget_Default_0_document_0_small.png b/...dienceSegmentation_Dashboard_AudienceTilesWidget_Default_0_document_0_small.png
diff --git a/...ienceSegmentation_Dashboard_AudienceTilesWidget_Default_0_document_1_medium.png b/...ienceSegmentation_Dashboard_AudienceTilesWidget_Default_0_document_1_medium.png
diff --git a/...dienceSegmentation_Dashboard_AudienceTilesWidget_Default_0_document_2_large.png b/...dienceSegmentation_Dashboard_AudienceTilesWidget_Default_0_document_2_large.png
diff --git a/...entation_Dashboard_AudienceTilesWidget_SingleTileErrored_0_document_0_small.png b/...entation_Dashboard_AudienceTilesWidget_SingleTileErrored_0_document_0_small.png
diff --git a/...ntation_Dashboard_AudienceTilesWidget_SingleTileErrored_0_document_1_medium.png b/...ntation_Dashboard_AudienceTilesWidget_SingleTileErrored_0_document_1_medium.png
diff --git a/...entation_Dashboard_AudienceTilesWidget_SingleTileErrored_0_document_2_large.png b/...entation_Dashboard_AudienceTilesWidget_SingleTileErrored_0_document_2_large.png
diff --git a/...ashboard_AudienceTilesWidget_SiteKitAudiencesPartialData_0_document_0_small.png b/...ashboard_AudienceTilesWidget_SiteKitAudiencesPartialData_0_document_0_small.png
diff --git a/...shboard_AudienceTilesWidget_SiteKitAudiencesPartialData_0_document_1_medium.png b/...shboard_AudienceTilesWidget_SiteKitAudiencesPartialData_0_document_1_medium.png
diff --git a/...ashboard_AudienceTilesWidget_SiteKitAudiencesPartialData_0_document_2_large.png b/...ashboard_AudienceTilesWidget_SiteKitAudiencesPartialData_0_document_2_large.png
diff --git a/...enceTilesWidget_TwoTilesViewOnlyWithCustomDimensionError_0_document_0_small.png b/...enceTilesWidget_TwoTilesViewOnlyWithCustomDimensionError_0_document_0_small.png
diff --git a/...nceTilesWidget_TwoTilesViewOnlyWithCustomDimensionError_0_document_1_medium.png b/...nceTilesWidget_TwoTilesViewOnlyWithCustomDimensionError_0_document_1_medium.png
diff --git a/...enceTilesWidget_TwoTilesViewOnlyWithCustomDimensionError_0_document_2_large.png b/...enceTilesWidget_TwoTilesViewOnlyWithCustomDimensionError_0_document_2_large.png
diff --git a/...ation_Dashboard_AudienceTilesWidget_TwoTilesWithZeroTile_0_document_2_large.png b/...ation_Dashboard_AudienceTilesWidget_TwoTilesWithZeroTile_0_document_2_large.png
diff --git a/...ienceSegmentation_Dashboard_AudienceTilesWidget_TwoTiles_0_document_0_small.png b/...ienceSegmentation_Dashboard_AudienceTilesWidget_TwoTiles_0_document_0_small.png
diff --git a/...enceSegmentation_Dashboard_AudienceTilesWidget_TwoTiles_0_document_1_medium.png b/...enceSegmentation_Dashboard_AudienceTilesWidget_TwoTiles_0_document_1_medium.png
diff --git a/...ienceSegmentation_Dashboard_AudienceTilesWidget_TwoTiles_0_document_2_large.png b/...ienceSegmentation_Dashboard_AudienceTilesWidget_TwoTiles_0_document_2_large.png
diff --git a/...enceSegmentation_Dashboard_AudienceTilesWidget_Two_Tiles_0_document_0_small.png b/...enceSegmentation_Dashboard_AudienceTilesWidget_Two_Tiles_0_document_0_small.png
diff --git a/...nceSegmentation_Dashboard_AudienceTilesWidget_Two_Tiles_0_document_1_medium.png b/...nceSegmentation_Dashboard_AudienceTilesWidget_Two_Tiles_0_document_1_medium.png
diff --git a/...enceSegmentation_Dashboard_AudienceTilesWidget_Two_Tiles_0_document_2_large.png b/...enceSegmentation_Dashboard_AudienceTilesWidget_Two_Tiles_0_document_2_large.png