From cbb2525a8ea518aa14b19c6258f07ed1b20433e0 Mon Sep 17 00:00:00 2001
From: Matt Gawarecki <matt.gawarecki@gmail.com>
Date: Wed, 10 Jun 2020 09:24:02 -0500
Subject: [PATCH] Jetpack Cloud: Move Activity Log menu item under Jetpack
 section (#43109)

---
 client/my-sites/sidebar/index.jsx | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/client/my-sites/sidebar/index.jsx b/client/my-sites/sidebar/index.jsx
index 34add1f94dee8..6e03efc4f7412 100644
--- a/client/my-sites/sidebar/index.jsx
+++ b/client/my-sites/sidebar/index.jsx
@@ -287,6 +287,12 @@ export class MySitesSidebar extends Component {
 			return null;
 		}
 
+		// When the new Jetpack section is active,
+		// Activity Log goes there instead of here
+		if ( isEnabled( 'jetpack/features-section' ) ) {
+			return null;
+		}
+
 		let activityLink = '/activity-log' + siteSuffix,
 			activityLabel = translate( 'Activity' );
 
@@ -373,7 +379,12 @@ export class MySitesSidebar extends Component {
 	}
 
 	jetpack() {
-		const { isJetpackSectionOpen, site, translate } = this.props;
+		const { isJetpack, isJetpackSectionOpen, site, siteSuffix, path, translate } = this.props;
+
+		let activityLogUrl = '/activity-log' + siteSuffix;
+		if ( isJetpack && isEnabled( 'manage/themes-jetpack' ) ) {
+			activityLogUrl += '?group=rewind';
+		}
 
 		return (
 			<ExpandableSidebarMenu
@@ -386,9 +397,10 @@ export class MySitesSidebar extends Component {
 					label={ translate( 'Activity Log', {
 						comment: 'Jetpack Cloud / Activity Log status sidebar navigation item',
 					} ) }
-					link={ backupActivityPath( site.slug ) }
-					onNavigate={ this.onNavigate( 'Jetpack Cloud Backup / Activity Log' ) }
-					selected={ itemLinkMatches( backupActivityPath(), this.props.path ) }
+					link={ activityLogUrl }
+					onNavigate={ this.trackActivityClick }
+					selected={ itemLinkMatches( [ '/activity-log' ], path ) }
+					expandSection={ this.expandJetpackSection }
 				/>
 				<SidebarItem
 					label={ translate( 'Backup', {
@@ -397,8 +409,8 @@ export class MySitesSidebar extends Component {
 					link={ backupMainPath( site.slug ) }
 					onNavigate={ this.onNavigate( 'Jetpack Cloud Backup / Latest backups' ) }
 					selected={
-						itemLinkMatches( backupMainPath(), this.props.path ) &&
-						! itemLinkMatches( backupActivityPath(), this.props.path )
+						itemLinkMatches( backupMainPath(), path ) &&
+						! itemLinkMatches( backupActivityPath(), path )
 					}
 				/>
 				<SidebarItem
@@ -408,8 +420,7 @@ export class MySitesSidebar extends Component {
 					link={ site?.slug ? `/scan/${ site.slug }` : '/scan' }
 					onNavigate={ this.onNavigate( 'Jetpack Cloud Scan / Scanner' ) }
 					selected={
-						itemLinkMatches( '/scan', this.props.path ) &&
-						! itemLinkMatches( '/scan/history', this.props.path )
+						itemLinkMatches( '/scan', path ) && ! itemLinkMatches( '/scan/history', path )
 					}
 				></SidebarItem>
 			</ExpandableSidebarMenu>