Admin menu: update order of submenu items within the Jetpack menu.

This changes the order of the different submenu items, like so: 1. **My Jetpack** 2. Activity Log (External) 3. **Jetpack Manage** (External) 4. **Stats** 5. **Boost** 6. **VideoPress** 7. **Social** 8. **Protect** 9. **Akismet Anti-spam** 10. **VaultPress Backup** / Scan / VaultPress (External) / VaultPress 11. Search 12. **Dashboard** 13. **Settings** 14. **Subscribers** (External) 15. WordAds 16. Beta Tester
Automattic · Aug 7, 2024 · 469c79e · 469c79e
1 parent e0ff257
commit 469c79e
Show file tree

Hide file tree

Showing 41 changed files with 168 additions and 44 deletions.
diff --git a/projects/packages/admin-ui/changelog/update-jetpack-admin-menu-order b/projects/packages/admin-ui/changelog/update-jetpack-admin-menu-order
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Admin menu: update the order of the different submenu items within the Jetpack menu.
diff --git a/projects/packages/admin-ui/package.json b/projects/packages/admin-ui/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-admin-ui",
-	"version": "0.4.2",
+	"version": "0.4.3-alpha",
 	"description": "Generic Jetpack wp-admin UI elements",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/admin-ui/#readme",
 	"bugs": {

diff --git a/projects/packages/admin-ui/src/class-admin-menu.php b/projects/packages/admin-ui/src/class-admin-menu.php
@@ -13,7 +13,7 @@
  */
 class Admin_Menu {
 
-	const PACKAGE_VERSION = '0.4.2';
+	const PACKAGE_VERSION = '0.4.3-alpha';
 
 	/**
 	 * Whether this class has been initialized
@@ -58,7 +58,14 @@ function () {
 					remove_action( 'admin_menu', array( 'Akismet_Admin', 'admin_menu' ), 5 );
 
 					// Add an Anti-spam menu item for Jetpack.
-					self::add_menu( __( 'Akismet Anti-spam', 'jetpack-admin-ui' ), __( 'Akismet Anti-spam', 'jetpack-admin-ui' ), 'manage_options', 'akismet-key-config', array( 'Akismet_Admin', 'display_page' ) );
+					self::add_menu(
+						__( 'Akismet Anti-spam', 'jetpack-admin-ui' ),
+						__( 'Akismet Anti-spam', 'jetpack-admin-ui' ),
+						'manage_options',
+						'akismet-key-config',
+						array( 'Akismet_Admin', 'display_page' ),
+						9
+					);
 				},
 				4
 			);

diff --git a/projects/packages/backup/changelog/update-jetpack-admin-menu-order b/projects/packages/backup/changelog/update-jetpack-admin-menu-order
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Admin menu: update the order of the different submenu items within the Jetpack menu.
diff --git a/projects/packages/backup/src/class-jetpack-backup.php b/projects/packages/backup/src/class-jetpack-backup.php
@@ -124,7 +124,8 @@ public static function initialize() {
 			_x( 'VaultPress Backup', 'The Jetpack VaultPress Backup product name, without the Jetpack prefix', 'jetpack-backup-pkg' ),
 			'manage_options',
 			'jetpack-backup',
-			array( __CLASS__, 'plugin_settings_page' )
+			array( __CLASS__, 'plugin_settings_page' ),
+			10
 		);
 		add_action( 'load-' . $page_suffix, array( __CLASS__, 'admin_init' ) );
 

diff --git a/projects/packages/backup/src/class-package-version.php b/projects/packages/backup/src/class-package-version.php
@@ -16,7 +16,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '3.4.2';
+	const PACKAGE_VERSION = '3.4.3-alpha';
 
 	const PACKAGE_SLUG = 'backup';
 

diff --git a/projects/packages/my-jetpack/changelog/update-jetpack-admin-menu-order b/projects/packages/my-jetpack/changelog/update-jetpack-admin-menu-order
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Admin menu: update the order of the different submenu items within the Jetpack menu.
diff --git a/projects/packages/my-jetpack/package.json b/projects/packages/my-jetpack/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-my-jetpack",
-	"version": "4.32.0",
+	"version": "4.32.1-alpha",
 	"description": "WP Admin page with information and configuration shared among all Jetpack stand-alone plugins",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/my-jetpack/#readme",
 	"bugs": {

diff --git a/projects/packages/my-jetpack/src/class-activitylog.php b/projects/packages/my-jetpack/src/class-activitylog.php
@@ -51,7 +51,7 @@ public static function add_submenu_jetpack() {
 			'manage_options',
 			esc_url( Redirect::get_url( 'cloud-activity-log-wp-menu', $args ) ),
 			null,
-			1
+			2
 		);
 	}
 }
diff --git a/projects/packages/my-jetpack/src/class-initializer.php b/projects/packages/my-jetpack/src/class-initializer.php
@@ -41,7 +41,7 @@ class Initializer {
 	 *
 	 * @var string
 	 */
-	const PACKAGE_VERSION = '4.32.0';
+	const PACKAGE_VERSION = '4.32.1-alpha';
 
 	/**
 	 * HTML container ID for the IDC screen on My Jetpack page.

diff --git a/projects/packages/my-jetpack/src/class-jetpack-manage.php b/projects/packages/my-jetpack/src/class-jetpack-manage.php
@@ -49,7 +49,7 @@ public static function add_submenu_jetpack() {
 			'manage_options',
 			esc_url( Redirect::get_url( 'cloud-manage-dashboard-wp-menu', $args ) ),
 			null,
-			100
+			3
 		);
 	}
 

diff --git a/projects/packages/search/changelog/update-jetpack-admin-menu-order b/projects/packages/search/changelog/update-jetpack-admin-menu-order
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Admin menu: update the order of the different submenu items within the Jetpack menu.
diff --git a/projects/packages/search/package.json b/projects/packages/search/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "jetpack-search",
-	"version": "0.44.14",
+	"version": "0.44.15-alpha",
 	"description": "Package for Jetpack Search products",
 	"main": "main.js",
 	"directories": {

diff --git a/projects/packages/search/src/class-package.php b/projects/packages/search/src/class-package.php
@@ -11,7 +11,7 @@
  * Search package general information
  */
 class Package {
-	const VERSION = '0.44.14';
+	const VERSION = '0.44.15-alpha';
 	const SLUG    = 'search';
 
 	/**

diff --git a/projects/packages/search/src/dashboard/class-dashboard.php b/projects/packages/search/src/dashboard/class-dashboard.php
@@ -102,7 +102,8 @@ public function add_wp_admin_submenu() {
 				_x( 'Search', 'product name shown in menu', 'jetpack-search-pkg' ),
 				'manage_options',
 				'jetpack-search',
-				array( $this, 'render' )
+				array( $this, 'render' ),
+				11
 			);
 		} else {
 			// always add the page, but hide it from the menu.

diff --git a/projects/packages/stats-admin/changelog/update-jetpack-admin-menu-order b/projects/packages/stats-admin/changelog/update-jetpack-admin-menu-order
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Admin menu: update the order of the different submenu items within the Jetpack menu.
diff --git a/projects/packages/stats-admin/package.json b/projects/packages/stats-admin/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-stats-admin",
-	"version": "0.21.0",
+	"version": "0.21.1-alpha",
 	"description": "Stats Dashboard",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/stats-admin/#readme",
 	"bugs": {

diff --git a/projects/packages/stats-admin/src/class-dashboard.php b/projects/packages/stats-admin/src/class-dashboard.php
@@ -60,7 +60,8 @@ public function add_wp_admin_submenu() {
 			_x( 'Stats', 'product name shown in menu', 'jetpack-stats-admin' ),
 			'manage_options',
 			'stats',
-			array( $this, 'render' )
+			array( $this, 'render' ),
+			4
 		);
 
 		if ( $page_suffix ) {

diff --git a/projects/packages/stats-admin/src/class-main.php b/projects/packages/stats-admin/src/class-main.php
@@ -22,7 +22,7 @@ class Main {
 	/**
 	 * Stats version.
 	 */
-	const VERSION = '0.21.0';
+	const VERSION = '0.21.1-alpha';
 
 	/**
 	 * Singleton Main instance.

diff --git a/projects/packages/videopress/changelog/update-jetpack-admin-menu-order b/projects/packages/videopress/changelog/update-jetpack-admin-menu-order
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Admin menu: update the order of the different submenu items within the Jetpack menu.
diff --git a/projects/packages/videopress/package.json b/projects/packages/videopress/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-videopress",
-	"version": "0.23.30",
+	"version": "0.23.31-alpha",
 	"description": "VideoPress package",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/videopress/#readme",
 	"bugs": {

diff --git a/projects/packages/videopress/src/class-admin-ui.php b/projects/packages/videopress/src/class-admin-ui.php
@@ -39,7 +39,8 @@ public static function init() {
 			_x( 'VideoPress', 'The Jetpack VideoPress product name, without the Jetpack prefix', 'jetpack-videopress-pkg' ),
 			'manage_options',
 			self::ADMIN_PAGE_SLUG,
-			array( __CLASS__, 'plugin_settings_page' )
+			array( __CLASS__, 'plugin_settings_page' ),
+			6
 		);
 		add_action( 'load-' . $page_suffix, array( __CLASS__, 'admin_init' ) );
 

diff --git a/projects/packages/videopress/src/class-package-version.php b/projects/packages/videopress/src/class-package-version.php
@@ -11,7 +11,7 @@
  * The Package_Version class.
  */
 class Package_Version {
-	const PACKAGE_VERSION = '0.23.30';
+	const PACKAGE_VERSION = '0.23.31-alpha';
 
 	const PACKAGE_SLUG = 'videopress';
 

diff --git a/projects/packages/wordads/changelog/update-jetpack-admin-menu-order b/projects/packages/wordads/changelog/update-jetpack-admin-menu-order
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Admin menu: update the order of the different submenu items within the Jetpack menu.
diff --git a/projects/packages/wordads/package.json b/projects/packages/wordads/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-wordads",
-	"version": "0.3.25",
+	"version": "0.3.26-alpha",
 	"description": "Earn income by allowing Jetpack to display high quality ads.",
 	"main": "main.js",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/wordads/#readme",

diff --git a/projects/packages/wordads/src/class-package.php b/projects/packages/wordads/src/class-package.php
@@ -11,7 +11,7 @@
  * WordAds package general information
  */
 class Package {
-	const VERSION = '0.3.25';
+	const VERSION = '0.3.26-alpha';
 	const SLUG    = 'wordads';
 
 	/**

diff --git a/projects/packages/wordads/src/dashboard/class-dashboard.php b/projects/packages/wordads/src/dashboard/class-dashboard.php
@@ -55,7 +55,8 @@ public function add_wp_admin_submenu() {
 			_x( 'WordAds', 'product name shown in menu', 'jetpack-wordads' ),
 			'manage_options',
 			'jetpack-wordads',
-			array( $this, 'render' )
+			array( $this, 'render' ),
+			15
 		);
 
 		add_action( 'load-' . $page_suffix, array( $this, 'admin_init' ) );

diff --git a/projects/plugins/beta/changelog/update-jetpack-admin-menu-order b/projects/plugins/beta/changelog/update-jetpack-admin-menu-order
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Admin menu: update the order of the different submenu items within the Jetpack menu.
diff --git a/projects/plugins/beta/src/class-admin.php b/projects/plugins/beta/src/class-admin.php
@@ -41,7 +41,8 @@ public static function add_actions() {
 			'Beta Tester',
 			'update_plugins',
 			'jetpack-beta',
-			array( self::class, 'render' )
+			array( self::class, 'render' ),
+			16
 		);
 
 		if ( false !== self::$hookname ) {

diff --git a/projects/plugins/boost/app/admin/class-admin.php b/projects/plugins/boost/app/admin/class-admin.php
@@ -53,7 +53,8 @@ public function handle_admin_menu() {
 			$menu_label,
 			'manage_options',
 			JETPACK_BOOST_SLUG,
-			array( $this, 'render_settings' )
+			array( $this, 'render_settings' ),
+			5
 		);
 		add_action( 'load-' . $page_suffix, array( $this, 'admin_init' ) );
 	}

diff --git a/projects/plugins/boost/changelog/update-jetpack-admin-menu-order b/projects/plugins/boost/changelog/update-jetpack-admin-menu-order
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Admin menu: update the order of the different submenu items within the Jetpack menu.
diff --git a/projects/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-react-page.php b/projects/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-react-page.php
@@ -1,5 +1,6 @@
 <?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
 
+use Automattic\Jetpack\Admin_UI\Admin_Menu;
 use Automattic\Jetpack\Assets\Logo;
 use Automattic\Jetpack\Connection\Initial_State as Connection_Initial_State;
 use Automattic\Jetpack\Connection\Manager as Connection_Manager;
@@ -77,6 +78,21 @@ public function add_page_actions( $hook ) {
 		}
 	}
 
+	/**
+	 * Remove the main Jetpack submenu if a site is in offline mode or connected.
+	 * At that point, admins can access the Jetpack Dashboard instead.
+	 *
+	 * @since $$next-version$$
+	 */
+	public function remove_jetpack_menu() {
+		if (
+			( new Status() )->is_offline_mode()
+			|| Jetpack::is_connection_ready()
+		) {
+			remove_submenu_page( 'jetpack', 'jetpack' );
+		}
+	}
+
 	/**
 	 * Add Jetpack Dashboard sub-link and point it to AAG if the user can view stats, manage modules or if Protect is active.
 	 *
@@ -85,9 +101,18 @@ public function add_page_actions( $hook ) {
 	 * @since 4.3.0
 	 */
 	public function jetpack_add_dashboard_sub_nav_item() {
-		if ( ( new Status() )->is_offline_mode() || Jetpack::is_connection_ready() ) {
-			add_submenu_page( 'jetpack', __( 'Dashboard', 'jetpack' ), __( 'Dashboard', 'jetpack' ), 'jetpack_admin_page', 'jetpack#/dashboard', '__return_null', 1 );
-			remove_submenu_page( 'jetpack', 'jetpack' );
+		if (
+			( new Status() )->is_offline_mode()
+			|| Jetpack::is_connection_ready()
+		) {
+			Admin_Menu::add_menu(
+				__( 'Dashboard', 'jetpack' ),
+				__( 'Dashboard', 'jetpack' ),
+				'jetpack_admin_page',
+				Jetpack::admin_url( array( 'page' => 'jetpack#/dashboard' ) ),
+				null,
+				12
+			);
 		}
 	}
 
@@ -165,7 +190,14 @@ private function can_access_settings() {
 	 */
 	public function jetpack_add_settings_sub_nav_item() {
 		if ( $this->can_access_settings() ) {
-			add_submenu_page( 'jetpack', __( 'Settings', 'jetpack' ), __( 'Settings', 'jetpack' ), 'jetpack_admin_page', 'jetpack#/settings', '__return_null' );
+			Admin_Menu::add_menu(
+				__( 'Settings', 'jetpack' ),
+				__( 'Settings', 'jetpack' ),
+				'jetpack_admin_page',
+				Jetpack::admin_url( array( 'page' => 'jetpack#/settings' ) ),
+				null,
+				13
+			);
 		}
 	}
 

diff --git a/projects/plugins/jetpack/changelog/update-jetpack-admin-menu-order b/projects/plugins/jetpack/changelog/update-jetpack-admin-menu-order
@@ -0,0 +1,4 @@
+Significance: patch
+Type: enhancement
+
+Admin menu: update the order of the different submenu items within the Jetpack menu.
diff --git a/projects/plugins/jetpack/class.jetpack-admin.php b/projects/plugins/jetpack/class.jetpack-admin.php
@@ -64,6 +64,7 @@ private function __construct() {
 
 		add_action( 'admin_init', array( $jetpack_react, 'react_redirects' ), 0 );
 		add_action( 'admin_menu', array( $jetpack_react, 'add_actions' ), 998 );
+		add_action( 'admin_menu', array( $jetpack_react, 'remove_jetpack_menu' ), 1000 );
 		add_action( 'jetpack_admin_menu', array( $jetpack_react, 'jetpack_add_dashboard_sub_nav_item' ) );
 		add_action( 'jetpack_admin_menu', array( $jetpack_react, 'jetpack_add_settings_sub_nav_item' ) );
 		add_action( 'jetpack_admin_menu', array( $this, 'admin_menu_debugger' ) );
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,7 +51,7 @@ public static function add_submenu_jetpack() { @@
     			'manage_options',
     			esc_url( Redirect::get_url( 'cloud-activity-log-wp-menu', $args ) ),
     			null,
     		);
     	}
     }