Merge pull request #7307 from google/fix/7306-wp-dashboard

Fix UA side-effect on WP dashboard
google · Jul 14, 2023 · f786a44 · f786a44
2 parents 7396d8f + f4515de
commit f786a44
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/assets/js/components/wp-dashboard/WPDashboardWidgets.js b/assets/js/components/wp-dashboard/WPDashboardWidgets.js
@@ -119,12 +119,13 @@ export default function WPDashboardWidgets() {
 				}
 			) }
 		>
-			{ analyticsModuleActiveAndConnected && ! isGA4DashboardView && (
-				<Fragment>
-					<WPDashboardUniqueVisitorsWidget />
-					<WPDashboardSessionDurationWidget />
-				</Fragment>
-			) }
+			{ analyticsModuleActiveAndConnected &&
+				isGA4DashboardView === false && (
+					<Fragment>
+						<WPDashboardUniqueVisitorsWidget />
+						<WPDashboardSessionDurationWidget />
+					</Fragment>
+				) }
 
 			{ isGA4DashboardView && (
 				<Fragment>
@@ -142,12 +143,13 @@ export default function WPDashboardWidgets() {
 				</div>
 			) }
 
-			{ analyticsModuleActiveAndConnected && ! isGA4DashboardView && (
-				<Fragment>
-					<WPDashboardUniqueVisitorsChartWidget />
-					<WPDashboardPopularPagesWidget />
-				</Fragment>
-			) }
+			{ analyticsModuleActiveAndConnected &&
+				isGA4DashboardView === false && (
+					<Fragment>
+						<WPDashboardUniqueVisitorsChartWidget />
+						<WPDashboardPopularPagesWidget />
+					</Fragment>
+				) }
 
 			{ isGA4DashboardView && (
 				<Fragment>

diff --git a/assets/js/modules/search-console/components/common/AnalyticsStats.js b/assets/js/modules/search-console/components/common/AnalyticsStats.js
@@ -146,7 +146,7 @@ export default function AnalyticsStats( props ) {
 		];
 	}
 
-	if ( ! isGA4DashboardView ) {
+	if ( isGA4DashboardView === false ) {
 		dateMarkers = [
 			{
 				date: UA_CUTOFF_DATE,