Untangling: Rename Vaultpress to Backup admin menu on WPCOM (#44181)

* Untangling: Rename Vaultpress to Backup

* Update the position

* Fix linting

* Remove test

Author: BogdanUngureanu

projects/packages/jetpack-mu-wpcom/changelog/update-rename-vaultpress-on-wpcom

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Rename Jetpack > Vaultpress to Jetpack > Backup admin menu for WPCOM sites
+
+

projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-menu/wpcom-admin-menu.php

@@ -211,6 +211,7 @@ function wpcom_add_untangled_jetpack_menu() {
 	$domain = wp_parse_url( home_url(), PHP_URL_HOST );
 
 	wpcom_hide_submenu_page( 'jetpack', esc_url( Redirect::get_url( 'calypso-scanner' ) ) );
+	wpcom_hide_submenu_page( 'jetpack', esc_url( Redirect::get_url( 'calypso-backups' ) ) );
 
 	Jetpack_Admin_UI_Admin::add_menu(
 		esc_attr__( 'Scan', 'jetpack-mu-wpcom' ),
@@ -223,6 +224,18 @@ function wpcom_add_untangled_jetpack_menu() {
 		null,
 		5
 	);
+
+	Jetpack_Admin_UI_Admin::add_menu(
+		esc_attr__( 'Backup', 'jetpack-mu-wpcom' ),
+		__( 'Backup', 'jetpack-mu-wpcom' ),
+		'manage_options',
+		'https://wordpress.com/backup/' . $domain,
+		/**
+		 * Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
+		 */
+		null,
+		4
+	);
 }
 
 add_action( 'admin_menu', 'wpcom_add_untangled_jetpack_menu', 999 );
@@ -251,12 +264,10 @@ function wpcom_add_jetpack_submenu() {
 	// Hide submenu items that link to Jetpack Cloud.
 	wpcom_hide_submenu_page( 'jetpack', esc_url( Redirect::get_url( 'cloud-activity-log-wp-menu', array( 'site' => $blog_id ) ) ) );
 	wpcom_hide_submenu_page( 'jetpack', esc_url( Redirect::get_url( 'cloud-scan-history-wp-menu' ) ) );
-	wpcom_hide_submenu_page( 'jetpack', esc_url( Redirect::get_url( 'calypso-backups' ) ) );
 	wpcom_hide_submenu_page( 'jetpack', esc_url( Redirect::get_url( 'jetpack-menu-jetpack-manage-subscribers', array( 'site' => $blog_id ) ) ) );
 
 	$domain           = wp_parse_url( home_url(), PHP_URL_HOST );
 	$activity_log_url = 'https://wordpress.com/activity-log/' . $domain;
-	$vaultpress_url   = 'https://wordpress.com/backup/' . $domain;
 	$monetize_url     = 'https://wordpress.com/earn/' . $domain;
 	$subscribers_url  = 'https://wordpress.com/subscribers/' . $domain;
 	$newsletter_url   = 'https://wordpress.com/settings/newsletter/' . $domain;
@@ -272,15 +283,6 @@ function wpcom_add_jetpack_submenu() {
 		null // @phan-suppress-current-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
 	);
 
-	add_submenu_page(
-		'jetpack',
-		__( 'VaultPress', 'jetpack-mu-wpcom' ),
-		__( 'VaultPress', 'jetpack-mu-wpcom' ),
-		'manage_options',
-		$vaultpress_url,
-		null // @phan-suppress-current-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
-	);
-
 	add_submenu_page(
 		'jetpack',
 		__( 'Monetize', 'jetpack-mu-wpcom' ),
@@ -335,7 +337,6 @@ function wpcom_add_jetpack_submenu() {
 		'my-jetpack',
 		'stats',
 		$activity_log_url,
-		$vaultpress_url,
 		'akismet-key-config',
 		'jetpack-search',
 		$monetize_url,

projects/packages/masterbar/changelog/update-rename-vaultpress-on-wpcom

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Rename Jetpack > Vaultpress to Jetpack > Backup admin menu for WPCOM sites
+
+

projects/packages/masterbar/src/admin-menu/class-admin-menu.php

@@ -10,7 +10,6 @@
 use Automattic\Jetpack\Admin_UI\Admin_Menu as Jetpack_Admin_UI_Admin;
 use Automattic\Jetpack\Assets;
 use Automattic\Jetpack\Assets\Logo;
-use Automattic\Jetpack\Redirect;
 
 require_once __DIR__ . '/class-base-admin-menu.php';
 
@@ -413,18 +412,6 @@ public function register_nav_unification_jetpack_menus() {
 			null,
 			2
 		);
-
-		Jetpack_Admin_UI_Admin::add_menu(
-			esc_attr__( 'Backup', 'jetpack-masterbar' ),
-			__( 'Backup', 'jetpack-masterbar' ),
-			'manage_options',
-			'https://wordpress.com/backup/' . $this->domain,
-			/**
-			 * Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
-			 */
-			null,
-			3
-		);
 	}
 
 	/**
@@ -448,7 +435,6 @@ public function create_jetpack_menu( $position = 50, $separator = true ) {
 
 		if ( self::DEFAULT_VIEW === $this->get_preferred_view( 'jetpack' ) ) {
 			$this->hide_submenu_page( 'jetpack', 'jetpack#/settings' );
-			$this->hide_submenu_page( 'jetpack', esc_url( Redirect::get_url( 'calypso-backups' ) ) );
 		}
 
 		if ( ! $is_menu_updated ) {

projects/packages/masterbar/src/admin-menu/class-atomic-admin-menu.php

@@ -11,7 +11,6 @@
 use Automattic\Jetpack\Current_Plan as Jetpack_Plan;
 use Automattic\Jetpack\JITMS\JITM;
 use Automattic\Jetpack\Modules;
-use Automattic\Jetpack\Redirect;
 use Automattic\Jetpack\Subscribers_Dashboard\Dashboard as Subscribers_Dashboard;
 
 require_once __DIR__ . '/class-admin-menu.php';
@@ -268,14 +267,6 @@ public function add_jetpack_menu() {
 		} else {
 			parent::add_jetpack_menu();
 		}
-
-		/**
-		 * Prevent duplicate menu items that link to Jetpack Backup.
-		 * Hide the one that's shown when the standalone backup plugin is not installed, since Jetpack Backup is already included in Atomic sites.
-		 *
-		 * @see https://github.com/Automattic/jetpack/pull/33955
-		 */
-		$this->hide_submenu_page( 'jetpack', esc_url( Redirect::get_url( 'calypso-backups' ) ) );
 	}
 
 	/**

projects/packages/masterbar/tests/php/Admin_Menu_Test.php

@@ -344,7 +344,6 @@ public function test_add_jetpack_menu() {
 		static::$admin_menu->add_jetpack_menu();
 
 		$this->assertSame( 'https://wordpress.com/activity-log/' . static::$domain, $submenu['jetpack'][3][2] );
-		$this->assertSame( 'https://wordpress.com/backup/' . static::$domain, $submenu['jetpack'][4][2] );
 	}
 
 	/**