Merge pull request #1910 from google/fix/1456-map-on-undefined

Add checks to ensure Array.map is not called on undefined

Author: felixarntz

assets/js/modules/analytics/components/dashboard/AdSenseDashboardWidgetTopPagesTableSmall.js

@@ -65,6 +65,10 @@ class AdSenseDashboardWidgetTopPagesTableSmall extends Component {
 			return null;
 		}
 
+		if ( ! Array.isArray( data[ 0 ].data.rows ) ) {
+			return null;
+		}
+
 		const headers = [
 			{
 				title: __( 'Top Earning Pages', 'google-site-kit' ),

assets/js/modules/analytics/components/dashboard/AnalyticsAdSenseDashboardWidgetTopPagesTable.js

@@ -52,6 +52,14 @@ const AnalyticsAdSenseDashboardWidgetTopPagesTable = ( { data } ) => {
 		return null;
 	}
 
+	if ( ! data || ! data.length ) {
+		return null;
+	}
+
+	if ( ! Array.isArray( data[ 0 ].data.rows ) ) {
+		return null;
+	}
+
 	const headers = [
 		{
 			title: __( 'Page Title', 'google-site-kit' ),

assets/js/modules/analytics/components/dashboard/AnalyticsAllTrafficDashboardWidgetTopAcquisitionSources.js

@@ -39,6 +39,12 @@ class AnalyticsAllTrafficDashboardWidgetTopAcquisitionSources extends Component
 		if ( ! data || ! data.length ) {
 			return null;
 		}
+		if ( ! Array.isArray( data[ 0 ].data.totals ) || ! data[ 0 ].data.totals.length ) {
+			return null;
+		}
+		if ( ! Array.isArray( data[ 0 ].data.rows ) || ! data[ 0 ].data.rows.length ) {
+			return null;
+		}
 
 		const headers = [
 			{

assets/js/modules/analytics/components/dashboard/AnalyticsDashboardWidgetPopularPagesTable.js

@@ -61,6 +61,10 @@ class AnalyticsDashboardWidgetPopularPagesTable extends Component {
 			return null;
 		}
 
+		if ( ! Array.isArray( data[ 0 ].data.rows ) ) {
+			return null;
+		}
+
 		const headers = [
 			{
 				title: __( 'Most popular content', 'google-site-kit' ),

assets/js/modules/analytics/components/dashboard/AnalyticsDashboardWidgetTopAcquisitionSources.js

@@ -46,6 +46,12 @@ function AnalyticsDashboardWidgetTopAcquisitionSources( { data } ) {
 	if ( ! data || ! data.length ) {
 		return null;
 	}
+	if ( ! Array.isArray( data[ 0 ].data.totals ) || ! data[ 0 ].data.totals.length ) {
+		return null;
+	}
+	if ( ! Array.isArray( data[ 0 ].data.rows ) || ! data[ 0 ].data.rows.length ) {
+		return null;
+	}
 
 	const currentRange = getCurrentDateRange( dateRange );
 	const headers = [

assets/js/modules/analytics/components/dashboard/AnalyticsDashboardWidgetTopPagesTable.js

@@ -53,6 +53,10 @@ const AnalyticsDashboardWidgetTopPagesTable = ( props ) => {
 		return null;
 	}
 
+	if ( ! Array.isArray( data[ 0 ].data.rows ) ) {
+		return null;
+	}
+
 	const headers = [
 		{
 			title: __( 'Title', 'google-site-kit' ),

assets/js/modules/analytics/components/wp-dashboard/WPAnalyticsDashboardWidgetTopPagesTable.js

@@ -46,6 +46,14 @@ class WPAnalyticsDashboardWidgetTopPagesTable extends Component {
 			return null;
 		}
 
+		if ( ! data || ! data.length ) {
+			return null;
+		}
+
+		if ( ! Array.isArray( data[ 0 ].data.rows ) ) {
+			return null;
+		}
+
 		const links = [];
 		const dataMapped = data[ 0 ].data.rows.map( ( row, i ) => {
 			const [ title, url ] = row.dimensions;

assets/js/modules/search-console/components/dashboard/SearchConsoleDashboardWidgetKeywordTable.js

@@ -38,6 +38,11 @@ const SearchConsoleDashboardWidgetKeywordTable = ( props ) => {
 	const { data } = props;
 	const domain = useSelect( ( select ) => select( STORE_NAME ).getPropertyID() );
 	const baseServiceURL = useSelect( ( select ) => select( STORE_NAME ).getServiceURL( { path: '/performance/search-analytics', query: { resource_id: domain, num_of_days: 28 } } ) );
+
+	if ( ! data || ! data.length ) {
+		return null;
+	}
+
 	const headers = [
 		{
 			title: __( 'Keyword', 'google-site-kit' ),