Exclude (not set) with helper function.

google · Jan 3, 2025 · e783211 · e783211
1 parent a4cdb3a
commit e783211
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 10 deletions.
diff --git a/assets/js/modules/analytics-4/components/widgets/TopCitiesWidget.js b/assets/js/modules/analytics-4/components/widgets/TopCitiesWidget.js
@@ -61,7 +61,7 @@ function TopCitiesWidget( { Widget } ) {
 				desc: true,
 			},
 		],
-		limit: 3,
+		limit: 4,
 	};
 
 	const topCitiesReport = useInViewSelect(
@@ -86,6 +86,21 @@ function TopCitiesWidget( { Widget } ) {
 
 	const { rows = [], totals = [] } = topCitiesReport || {};
 
+	const filteredCities = ( cityRows ) => {
+		const notSetRow = cityRows.find(
+			( { dimensionValues } ) =>
+				dimensionValues[ 0 ].value === '(not set)'
+		);
+		if ( notSetRow ) {
+			return cityRows.filter(
+				( { dimensionValues } ) =>
+					dimensionValues[ 0 ].value !== '(not set)'
+			);
+		}
+
+		return cityRows.slice( 0, 3 );
+	};
+
 	const totalUsers = totals[ 0 ]?.metricValues?.[ 0 ]?.value;
 
 	const columns = [
@@ -117,7 +132,7 @@ function TopCitiesWidget( { Widget } ) {
 			Widget={ Widget }
 			widgetSlug={ KM_ANALYTICS_TOP_CITIES }
 			loading={ loading }
-			rows={ rows }
+			rows={ filteredCities( rows ) }
 			columns={ columns }
 			ZeroState={ ZeroDataMessage }
 			error={ error }

diff --git a/assets/js/modules/analytics-4/components/widgets/TopCitiesWidget.stories.js b/assets/js/modules/analytics-4/components/widgets/TopCitiesWidget.stories.js
@@ -46,7 +46,7 @@ const reportOptions = {
 			desc: true,
 		},
 	],
-	limit: 3,
+	limit: 4,
 };
 
 const WidgetWithComponentProps = withWidgetComponentProps(

diff --git a/assets/js/modules/analytics-4/components/widgets/TopCitiesWidget.test.js b/assets/js/modules/analytics-4/components/widgets/TopCitiesWidget.test.js
@@ -57,7 +57,7 @@ describe( 'TopCitiesWidget', () => {
 					desc: true,
 				},
 			],
-			limit: 3,
+			limit: 4,
 		} );
 		const { container, waitForRegistry } = render(
 			<TopCitiesWidget Widget={ Widget } />,

diff --git a/assets/js/modules/analytics-4/components/widgets/TopCountriesWidget.js b/assets/js/modules/analytics-4/components/widgets/TopCountriesWidget.js
@@ -61,7 +61,7 @@ function TopCountriesWidget( { Widget } ) {
 				desc: true,
 			},
 		],
-		limit: 3,
+		limit: 4,
 	};
 
 	const topCountriesReport = useInViewSelect(
@@ -88,6 +88,21 @@ function TopCountriesWidget( { Widget } ) {
 
 	const { rows = [], totals = [] } = topCountriesReport || {};
 
+	const filteredCountries = ( countryRows ) => {
+		const notSetRow = countryRows.find(
+			( { dimensionValues } ) =>
+				dimensionValues[ 0 ].value === '(not set)'
+		);
+		if ( notSetRow ) {
+			return countryRows.filter(
+				( { dimensionValues } ) =>
+					dimensionValues[ 0 ].value !== '(not set)'
+			);
+		}
+
+		return countryRows.slice( 0, 3 );
+	};
+
 	const totalUsers = totals[ 0 ]?.metricValues?.[ 0 ]?.value;
 
 	const columns = [
@@ -119,7 +134,7 @@ function TopCountriesWidget( { Widget } ) {
 			Widget={ Widget }
 			widgetSlug={ KM_ANALYTICS_TOP_COUNTRIES }
 			loading={ loading }
-			rows={ rows }
+			rows={ filteredCountries( rows ) }
 			columns={ columns }
 			ZeroState={ ZeroDataMessage }
 			error={ error }

diff --git a/assets/js/modules/analytics-4/components/widgets/TopCountriesWidget.stories.js b/assets/js/modules/analytics-4/components/widgets/TopCountriesWidget.stories.js
@@ -46,7 +46,7 @@ const reportOptions = {
 			desc: true,
 		},
 	],
-	limit: 3,
+	limit: 4,
 };
 
 const WidgetWithComponentProps = withWidgetComponentProps(

diff --git a/assets/js/modules/analytics-4/components/widgets/TopCountriesWidget.test.js b/assets/js/modules/analytics-4/components/widgets/TopCountriesWidget.test.js
@@ -57,7 +57,7 @@ describe( 'TopCountriesWidget', () => {
 					desc: true,
 				},
 			],
-			limit: 3,
+			limit: 4,
 		} );
 		const { container, waitForRegistry } = render(
 			<TopCountriesWidget Widget={ Widget } />,

diff --git a/assets/js/modules/analytics-4/components/widgets/__snapshots__/TopCitiesWidget.test.js.snap b/assets/js/modules/analytics-4/components/widgets/__snapshots__/TopCitiesWidget.test.js.snap
@@ -61,14 +61,14 @@ exports[`TopCitiesWidget renders correctly with the expected metrics 1`] = `
                 <p
                   class="googlesitekit-km-widget-tile__table-plain-text"
                 >
-                  (not set)
+                  New York
                 </p>
               </div>
               <div
                 class="googlesitekit-table__body-item"
               >
                 <strong>
-                  466.7%
+                  433.3%
                 </strong>
               </div>
             </div>