Optimize utility functions.

google · Jan 3, 2025 · af58eb8 · af58eb8
1 parent 5d5f75e
commit af58eb8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 24 deletions.
diff --git a/assets/js/modules/analytics-4/components/widgets/TopCitiesWidget.js b/assets/js/modules/analytics-4/components/widgets/TopCitiesWidget.js
@@ -86,20 +86,16 @@ function TopCitiesWidget( { Widget } ) {
 
 	const { rows = [], totals = [] } = topCitiesReport || {};
 
-	const filteredCities = ( cityRows ) => {
-		const notSetRow = cityRows.find(
+	const filteredCities = ( cityRows ) =>
+		cityRows.some(
 			( { dimensionValues } ) =>
 				dimensionValues[ 0 ].value === '(not set)'
-		);
-		if ( notSetRow ) {
-			return cityRows.filter(
-				( { dimensionValues } ) =>
-					dimensionValues[ 0 ].value !== '(not set)'
-			);
-		}
-
-		return cityRows.slice( 0, 3 );
-	};
+		)
+			? cityRows.filter(
+					( { dimensionValues } ) =>
+						dimensionValues[ 0 ].value !== '(not set)'
+			  )
+			: cityRows.slice( 0, 3 );
 
 	const totalUsers = totals[ 0 ]?.metricValues?.[ 0 ]?.value;
 

diff --git a/assets/js/modules/analytics-4/components/widgets/TopCountriesWidget.js b/assets/js/modules/analytics-4/components/widgets/TopCountriesWidget.js
@@ -88,20 +88,16 @@ function TopCountriesWidget( { Widget } ) {
 
 	const { rows = [], totals = [] } = topCountriesReport || {};
 
-	const filteredCountries = ( countryRows ) => {
-		const notSetRow = countryRows.find(
+	const filteredCountries = ( countryRows ) =>
+		countryRows.some(
 			( { dimensionValues } ) =>
 				dimensionValues[ 0 ].value === '(not set)'
-		);
-		if ( notSetRow ) {
-			return countryRows.filter(
-				( { dimensionValues } ) =>
-					dimensionValues[ 0 ].value !== '(not set)'
-			);
-		}
-
-		return countryRows.slice( 0, 3 );
-	};
+		)
+			? countryRows.filter(
+					( { dimensionValues } ) =>
+						dimensionValues[ 0 ].value !== '(not set)'
+			  )
+			: countryRows.slice( 0, 3 );
 
 	const totalUsers = totals[ 0 ]?.metricValues?.[ 0 ]?.value;