Untangling: Show "Jetpack -> Subscribers" menu on all sites (#44302)

- Move the `/subscribers/:site` path to the Jetpack > Subscribers menu for all sites (that menu was previously only visible with the classic interface).
- The existing Users > Subscribers menu (only visible with the default interface) will now point to `/subscribers/jetpack-subscribers/:site` so we can inform users with a callout that the menu has been moved (see DOTCOM-13883). This menu will be removed after a month, and it's only visible to existing users.

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/16344258243

Upstream-Ref: Automattic/jetpack@f71d3bc

Author: mmtr

jetpack_vendor/automattic/jetpack-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\Subscribers_Dashboard\Dashboard as Subscribers_Dashboard;
 
 require_once __DIR__ . '/class-admin-menu.php';
 
@@ -138,13 +137,10 @@ public function add_users_menu() {
 			$this->update_submenus( $slug, $submenus_to_update );
 		}
 
-		if ( ! $this->use_wp_admin_interface() && ! apply_filters( 'jetpack_wp_admin_subscriber_management_enabled', false ) ) {
-			// The 'Subscribers' menu exists in the Jetpack menu for Classic wp-admin interface, so only add it for non-wp-admin interfaces.
+		// Temporary "Users > Subscribers" menu for existing users that shows a callout informing that the screen has moved to "Jetpack > Subscribers".
+		if ( ! $this->use_wp_admin_interface() && ! apply_filters( 'jetpack_wp_admin_subscriber_management_enabled', false ) && get_current_user_id() < 268854000 ) {
 			// // @phan-suppress-next-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
-			add_submenu_page( 'users.php', esc_attr__( 'Subscribers', 'jetpack-masterbar' ), __( 'Subscribers', 'jetpack-masterbar' ), 'list_users', 'https://wordpress.com/subscribers/' . $this->domain, null );
-		} elseif ( apply_filters( 'jetpack_wp_admin_subscriber_management_enabled', false ) ) {
-			$subscribers_dashboard = new Subscribers_Dashboard();
-			$subscribers_dashboard->add_wp_admin_submenu();
+			add_submenu_page( 'users.php', esc_attr__( 'Subscribers', 'jetpack-masterbar' ), __( 'Subscribers', 'jetpack-masterbar' ), 'list_users', 'https://wordpress.com/subscribers/jetpack-subscribers/' . $this->domain, null );
 		}
 
 		// Users who can't 'list_users' will see "Profile" menu & "Profile > Account Settings" as submenu.

jetpack_vendor/automattic/jetpack-masterbar/src/admin-menu/class-wpcom-admin-menu.php

@@ -7,7 +7,6 @@
 
 namespace Automattic\Jetpack\Masterbar;
 
-use Automattic\Jetpack\Subscribers_Dashboard\Dashboard as Subscribers_Dashboard;
 use Jetpack_Custom_CSS;
 use JITM;
 
@@ -271,12 +270,11 @@ public function add_users_menu() {
 		$this->update_submenus( $slug, $submenus_to_update );
 		// @phan-suppress-next-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
 		add_submenu_page( 'users.php', esc_attr__( 'Add New User', 'jetpack-masterbar' ), __( 'Add New User', 'jetpack-masterbar' ), 'promote_users', 'https://wordpress.com/people/new/' . $this->domain, null, 1 );
-		if ( ! apply_filters( 'jetpack_wp_admin_subscriber_management_enabled', false ) ) {
+
+		// Temporary "Users > Subscribers" menu for existing users that shows a callout informing that the screen has moved to "Jetpack > Subscribers".
+		if ( ! apply_filters( 'jetpack_wp_admin_subscriber_management_enabled', false ) && get_current_user_id() < 268854000 ) {
 			// @phan-suppress-next-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
-			add_submenu_page( 'users.php', esc_attr__( 'Subscribers', 'jetpack-masterbar' ), __( 'Subscribers', 'jetpack-masterbar' ), 'list_users', 'https://wordpress.com/subscribers/' . $this->domain, null, 3 );
-		} else {
-			$subscribers_dashboard = new Subscribers_Dashboard();
-			$subscribers_dashboard->add_wp_admin_submenu();
+			add_submenu_page( 'users.php', esc_attr__( 'Subscribers', 'jetpack-masterbar' ), __( 'Subscribers', 'jetpack-masterbar' ), 'list_users', 'https://wordpress.com/subscribers/jetpack-subscribers/' . $this->domain, null, 3 );
 		}
 	}
 

jetpack_vendor/automattic/jetpack-mu-wpcom/src/features/wpcom-admin-menu/wpcom-admin-menu.php

@@ -245,6 +245,22 @@ 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.
 	);
 
+	// Jetpack > Subscribers.
+	if ( ! apply_filters( 'jetpack_wp_admin_subscriber_management_enabled', false ) ) {
+		wpcom_hide_submenu_page( 'jetpack', esc_url( Redirect::get_url( 'jetpack-menu-jetpack-manage-subscribers', array( 'site' => $blog_id ) ) ) );
+		add_submenu_page(
+			'jetpack',
+			__( 'Subscribers', 'jetpack-mu-wpcom' ),
+			__( 'Subscribers', 'jetpack-mu-wpcom' ),
+			'manage_options',
+			'https://wordpress.com/subscribers/' . $domain,
+			null // @phan-suppress-current-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
+		);
+	} else {
+		$subscribers_dashboard = new Subscribers_Dashboard();
+		$subscribers_dashboard->add_wp_admin_submenu();
+	}
+
 	if ( $uses_wp_admin_interface ) {
 		// Jetpack > Activity Log.
 		wpcom_hide_submenu_page( 'jetpack', esc_url( Redirect::get_url( 'cloud-activity-log-wp-menu', array( 'site' => $blog_id ) ) ) );
@@ -257,22 +273,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.
 		);
 
-		// Jetpack > Subscribers.
-		if ( ! apply_filters( 'jetpack_wp_admin_subscriber_management_enabled', false ) ) {
-			wpcom_hide_submenu_page( 'jetpack', esc_url( Redirect::get_url( 'jetpack-menu-jetpack-manage-subscribers', array( 'site' => $blog_id ) ) ) );
-			add_submenu_page(
-				'jetpack',
-				__( 'Subscribers', 'jetpack-mu-wpcom' ),
-				__( 'Subscribers', 'jetpack-mu-wpcom' ),
-				'manage_options',
-				'https://wordpress.com/subscribers/' . $domain,
-				null // @phan-suppress-current-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
-			);
-		} else {
-			$subscribers_dashboard = new Subscribers_Dashboard();
-			$subscribers_dashboard->add_wp_admin_submenu();
-		}
-
 		// Jetpack > Newsletter.
 		if ( $is_simple_site ) {
 			add_submenu_page(

jetpack_vendor/i18n-map.php

@@ -50,11 +50,11 @@
     ),
     'jetpack-masterbar' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-masterbar',
-      'ver' => '0.19.0-alpha1752749930',
+      'ver' => '0.19.0-alpha1752752834',
     ),
     'jetpack-mu-wpcom' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-mu-wpcom',
-      'ver' => '6.7.0-alpha1752749930',
+      'ver' => '6.7.0-alpha1752752834',
     ),
     'jetpack-password-checker' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-password-checker',