wrap the removal of My Mailboxes in a call to wpcom_is_duplicate_view…

…s_experiment_enabled so it's hidden behind the experiment
Automattic · Jan 9, 2025 · 613a079 · 613a079
1 parent 8c6a84a
commit 613a079
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 0 deletions.
diff --git a/projects/packages/masterbar/src/admin-menu/class-admin-menu.php b/projects/packages/masterbar/src/admin-menu/class-admin-menu.php
@@ -115,6 +115,14 @@ public function add_my_home_menu() {
 		$this->update_menu( 'index.php', 'https://wordpress.com/home/' . $this->domain, __( 'My Home', 'jetpack-masterbar' ), 'read', 'dashicons-admin-home' );
 	}
 
+	/**
+	 * Adds My Mailboxes menu.
+	 */
+	public function add_my_mailboxes_menu() {
+		// @phan-suppress-next-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
+		add_menu_page( __( 'My Mailboxes', 'jetpack-masterbar' ), __( 'My Mailboxes', 'jetpack-masterbar' ), 'manage_options', 'https://wordpress.com/mailboxes/' . $this->domain, null, 'dashicons-email', 4.64424 );
+	}
+
 	/**
 	 * Adds Stats menu.
 	 */

diff --git a/projects/packages/masterbar/src/admin-menu/class-atomic-admin-menu.php b/projects/packages/masterbar/src/admin-menu/class-atomic-admin-menu.php
@@ -78,6 +78,13 @@ public function reregister_menu_items() {
 		$this->add_my_home_menu();
 		$this->remove_gutenberg_menu();
 
+		// We don't need the `My Mailboxes` when the interface is set to wp-admin or the site is a staging site,
+		if ( ! $this->use_wp_admin_interface() && ! get_option( 'wpcom_is_staging_site' ) ) {
+			if ( function_exists( 'wpcom_is_duplicate_views_experiment_enabled' ) && ! wpcom_is_duplicate_views_experiment_enabled() ) {
+				$this->add_my_mailboxes_menu();
+			}
+		}
+
 		// Not needed outside of wp-admin.
 		if ( ! $this->is_api_request ) {
 			$this->add_site_card_menu();

diff --git a/projects/packages/masterbar/src/admin-menu/class-wpcom-admin-menu.php b/projects/packages/masterbar/src/admin-menu/class-wpcom-admin-menu.php
@@ -45,6 +45,9 @@ public function reregister_menu_items() {
 		parent::reregister_menu_items();
 
 		$this->add_my_home_menu();
+		if ( function_exists( 'wpcom_is_duplicate_views_experiment_enabled' ) && ! wpcom_is_duplicate_views_experiment_enabled() ) {
+			$this->add_my_mailboxes_menu();
+		}
 		$this->remove_gutenberg_menu();
 
 		// Not needed outside of wp-admin.

diff --git a/projects/packages/masterbar/tests/php/test-class-atomic-admin-menu.php b/projects/packages/masterbar/tests/php/test-class-atomic-admin-menu.php
@@ -264,6 +264,19 @@ public function test_add_upgrades_menu() {
 		}
 	}
 
+	/**
+	 * Tests add_my_mailboxes_menu
+	 *
+	 * @covers Automattic\Jetpack\Masterbar\Atomic_Admin_Menu::add_my_mailboxes_menu
+	 */
+	public function test_add_my_mailboxes_menu() {
+		global $menu;
+
+		static::$admin_menu->add_my_mailboxes_menu();
+
+		$this->assertSame( 'https://wordpress.com/mailboxes/' . static::$domain, $menu['4.64424'][2] );
+	}
+
 	/**
 	 * Tests add_options_menu
 	 *