Admin UI: Add Upgrade Jetpack menu item for free users

projects/js-packages/components/changelog/update-header-and-nav-cleanup-and-improvements

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Part of admin header normalization work
+
+Remove padding from admin page header subtitle for consistent spacing.

projects/js-packages/components/components/admin-page/style.module.scss

@@ -45,3 +45,8 @@
 :global(.jetpack-admin-page #dolly) {
 	background-color: #fff;
 }
+
+:global(.jetpack-admin-page .admin-ui-page__header-subtitle) {
+	padding-block-end: 0;
+	padding-bottom: 0;
+}

projects/packages/admin-ui/changelog/feature-upsell-to-pro-wp-admin-menu

@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Add Upgrade to Pro menu item for free users in the Jetpack admin menu.

projects/packages/admin-ui/changelog/update-header-and-nav-cleanup-and-improvements

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Simplify Akismet admin menu title from 'Akismet Anti-spam' to 'Anti-spam'.

projects/packages/admin-ui/composer.json

@@ -4,7 +4,9 @@
 	"type": "jetpack-library",
 	"license": "GPL-2.0-or-later",
 	"require": {
-		"php": ">=7.2"
+		"php": ">=7.2",
+		"automattic/jetpack-plans": "@dev",
+		"automattic/jetpack-redirect": "@dev"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^4.0.0",

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

@@ -15,6 +15,20 @@
 
 	const PACKAGE_VERSION = '0.5.11';
 
+	/**
+	 * Redirect source slug used as the upgrade URL identifier and CSS class.
+	 *
+	 * @var string
+	 */
+	const UPGRADE_MENU_SLUG = 'jetpack-wpadmin-sidebar-free-plan-upsell-menu-item';
+
+	/**
+	 * Fallback upgrade URL when the Redirect class is unavailable.
+	 *
+	 * @var string
+	 */
+	const UPGRADE_MENU_FALLBACK_URL = 'https://jetpack.com/upgrade/';
+
 	/**
 	 * Whether this class has been initialized
 	 *
@@ -40,6 +54,7 @@
 			self::handle_akismet_menu();
 			add_action( 'admin_menu', array( __CLASS__, 'admin_menu_hook_callback' ), 1000 ); // Jetpack uses 998.
 			add_action( 'network_admin_menu', array( __CLASS__, 'admin_menu_hook_callback' ), 1000 ); // Jetpack uses 998.
+			add_action( 'admin_head', array( __CLASS__, 'add_upgrade_menu_item_styles' ) );
 		}
 	}
 
@@ -58,7 +73,7 @@
 					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' ), 6 );
+					self::add_menu( __( 'Akismet Anti-spam', 'jetpack-admin-ui' ), __( 'Anti-spam', 'jetpack-admin-ui' ), 'manage_options', 'akismet-key-config', array( 'Akismet_Admin', 'display_page' ), 6 );
 				},
 				4
 			);
@@ -140,6 +155,8 @@
 		if ( ! $can_see_toplevel_menu ) {
 			remove_menu_page( 'jetpack' );
 		}
+
+		self::maybe_add_upgrade_menu_item();
 	}
 
 	/**
@@ -225,4 +242,97 @@
 		$url = $fallback ? $fallback : admin_url();
 		return $url;
 	}
+
+	/**
+	 * Checks whether the current site is on a free Jetpack plan with no active paid license.
+	 *
+	 * @return bool True if the site has no paid plan.
+	 */
+	private static function is_free_plan() {
+		if ( class_exists( '\Automattic\Jetpack\Current_Plan' ) ) {
+			$plan = \Automattic\Jetpack\Current_Plan::get();
+			return 'free' === ( $plan['class'] ?? 'free' );
+		}
+
+		$plan = get_option( 'jetpack_active_plan', array() );
+		return 'free' === ( $plan['class'] ?? 'free' );
+	}
+
+	/**
+	 * Conditionally adds an "Upgrade to Pro" submenu item for free-plan sites.
+	 *
+	 * The item is only added when the Jetpack top-level menu is visible and the
+	 * site has not yet purchased a paid Jetpack plan or license.
+	 *
+	 * @return void
+	 */
+	private static function maybe_add_upgrade_menu_item() {
+		if ( ! current_user_can( 'manage_options' ) ) {
+			return;
+		}
+
+		if ( ! self::is_free_plan() ) {
+			return;
+		}
+
+		$upgrade_url = class_exists( '\Automattic\Jetpack\Redirect' )
+			? \Automattic\Jetpack\Redirect::get_url( self::UPGRADE_MENU_SLUG )
+			: self::UPGRADE_MENU_FALLBACK_URL;
+
+		$menu_title = '<span class="dashicons dashicons-star-filled jetpack-upgrade-menu__icon" aria-hidden="true"></span>'
+			. esc_html__( 'Upgrade to Pro', 'jetpack-admin-ui' )
+			. ' <span aria-hidden="true">↗</span>';
+
+		add_submenu_page(
+			'jetpack',
+			__( 'Upgrade to Pro', 'jetpack-admin-ui' ),
+			$menu_title,
+			'manage_options',
+			esc_url( $upgrade_url ),
+			null,
+			999
+		);
+
+		// Add a CSS class to the <li> element so styles can target it precisely.
+		global $submenu;
+		if ( ! empty( $submenu['jetpack'] ) ) {
+			foreach ( $submenu['jetpack'] as $index => $item ) {
+				if ( isset( $item[2] ) && false !== strpos( $item[2], self::UPGRADE_MENU_SLUG ) ) {
+					// phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+					$submenu['jetpack'][ $index ][4] = ( ! empty( $item[4] ) ? $item[4] . ' ' : '' ) . self::UPGRADE_MENU_SLUG;
+					break;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Outputs inline CSS to style the "Upgrade to Pro" menu item in Jetpack green.
+	 *
+	 * The sidebar menu is visible on every admin page, so styles must load globally.
+	 * Only outputs for free-plan sites.
+	 *
+	 * @return void
+	 */
+	public static function add_upgrade_menu_item_styles() {
+		if ( ! self::is_free_plan() ) {
+			return;
+		}
+		?>
+		<style>
+			#adminmenu .jetpack-upgrade-menu__icon {
+				color: #069e08;
+				font-size: 15px;
+				line-height: 1;
+				vertical-align: middle;
+				margin-inline-start: -3px;
+			}
+			#adminmenu li.<?php echo esc_attr( self::UPGRADE_MENU_SLUG ); ?> > a,
+			#adminmenu li.<?php echo esc_attr( self::UPGRADE_MENU_SLUG ); ?> > a:hover {
+				color: #069e08;
+				font-weight: 600;
+			}
+		</style>
+		<?php
+	}
 }

projects/packages/admin-ui/tests/php/Admin_Menu_Test.php

@@ -15,6 +15,59 @@
  */
 class Admin_Menu_Test extends TestCase {
 
+	/**
+	 * Administrator user ID created once for the test class.
+	 *
+	 * @var int
+	 */
+	private static $admin_user_id;
+
+	/**
+	 * Editor user ID created once for the test class.
+	 *
+	 * @var int
+	 */
+	private static $editor_user_id;
+
+	/**
+	 * Create shared users once for the test class.
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass(): void {
+		parent::setUpBeforeClass();
+
+		self::$admin_user_id = wp_insert_user(
+			array(
+				'user_login' => 'upgrade_test_admin',
+				'user_pass'  => 'pass',
+				'user_email' => 'upgrade_admin@example.com',
+				'role'       => 'administrator',
+			)
+		);
+
+		self::$editor_user_id = wp_insert_user(
+			array(
+				'user_login' => 'upgrade_test_editor',
+				'user_pass'  => 'pass',
+				'user_email' => 'upgrade_editor@example.com',
+				'role'       => 'editor',
+			)
+		);
+	}
+
+	/**
+	 * Reset shared state before each test.
+	 *
+	 * @return void
+	 */
+	public function setUp(): void {
+		parent::setUp();
+		global $submenu;
+		$submenu = array();
+		delete_option( 'jetpack_active_plan' );
+	}
+
 	/**
 	 * Tests whether the page_suffix we return in our method will match the page_suffix returned by the native WP methods
 	 *
@@ -77,7 +130,7 @@ public static function page_suffix_matches_data() {
 	}
 
 	/**
-	 * Undocumented function
+	 * Tests that the first registered menu item is returned correctly.
 	 *
 	 * @return void
 	 */
@@ -95,4 +148,112 @@ public function test_first_menu() {
 
 		$this->assertSame( 'menu_2', $first );
 	}
+
+	/**
+	 * Upgrade item appears in the submenu for an administrator on a free plan.
+	 *
+	 * @return void
+	 */
+	public function test_upgrade_menu_item_shown_for_free_plan_admin() {
+		wp_set_current_user( self::$admin_user_id );
+
+		Admin_Menu::init();
+		do_action( 'admin_menu' );
+
+		$this->assertUpgradeMenuItemPresent();
+	}
+
+	/**
+	 * Upgrade item is absent when the site has a paid plan.
+	 *
+	 * @return void
+	 */
+	public function test_upgrade_menu_item_hidden_for_paid_plan() {
+		wp_set_current_user( self::$admin_user_id );
+		update_option( 'jetpack_active_plan', array( 'class' => 'security' ) );
+
+		Admin_Menu::init();
+		do_action( 'admin_menu' );
+
+		$this->assertUpgradeMenuItemAbsent();
+	}
+
+	/**
+	 * Upgrade item is absent for users without manage_options capability.
+	 *
+	 * @return void
+	 */
+	public function test_upgrade_menu_item_hidden_for_non_admin() {
+		wp_set_current_user( self::$editor_user_id );
+
+		Admin_Menu::init();
+		do_action( 'admin_menu' );
+
+		$this->assertUpgradeMenuItemAbsent();
+	}
+
+	/**
+	 * CSS styles are output for a free-plan site on any admin screen.
+	 *
+	 * The sidebar is visible everywhere in wp-admin, so styles must load globally.
+	 *
+	 * @return void
+	 */
+	public function test_upgrade_menu_item_styles_output_for_free_plan() {
+		ob_start();
+		Admin_Menu::add_upgrade_menu_item_styles();
+		$output = ob_get_clean();
+
+		$this->assertStringContainsString( 'jetpack-upgrade-menu__icon', $output );
+		$this->assertStringContainsString( '#069e08', $output );
+	}
+
+	/**
+	 * No CSS output when the site has a paid plan.
+	 *
+	 * @return void
+	 */
+	public function test_upgrade_menu_item_styles_no_output_for_paid_plan() {
+		update_option( 'jetpack_active_plan', array( 'class' => 'premium' ) );
+
+		ob_start();
+		Admin_Menu::add_upgrade_menu_item_styles();
+		$output = ob_get_clean();
+
+		$this->assertSame( '', $output );
+	}
+
+	/**
+	 * Asserts the upgrade submenu item is present under the jetpack top-level menu.
+	 *
+	 * @return void
+	 */
+	private function assertUpgradeMenuItemPresent() {
+		global $submenu;
+		$slugs = array_column( $submenu['jetpack'] ?? array(), 2 );
+		$found = array_filter(
+			$slugs,
+			function ( $slug ) {
+				return false !== strpos( $slug, Admin_Menu::UPGRADE_MENU_SLUG );
+			}
+		);
+		$this->assertNotEmpty( $found, 'Expected the upgrade menu item to be registered.' );
+	}
+
+	/**
+	 * Asserts the upgrade submenu item is absent from the jetpack top-level menu.
+	 *
+	 * @return void
+	 */
+	private function assertUpgradeMenuItemAbsent() {
+		global $submenu;
+		$slugs = array_column( $submenu['jetpack'] ?? array(), 2 );
+		$found = array_filter(
+			$slugs,
+			function ( $slug ) {
+				return false !== strpos( $slug, Admin_Menu::UPGRADE_MENU_SLUG );
+			}
+		);
+		$this->assertEmpty( $found, 'Expected the upgrade menu item to be absent.' );
+	}
 }

projects/packages/backup/changelog/simplify-menu-title

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Simplify admin menu title from 'VaultPress Backup' to 'Backups'.

projects/packages/backup/changelog/update-header-and-nav-cleanup-and-improvements

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Replace @automattic/jetpack-components Button with @wordpress/components Button in BackupNowButton component.

projects/packages/backup/src/class-jetpack-backup.php

@@ -162,7 +162,7 @@ function () {
 	public static function add_wp_admin_submenu() {
 		$page_suffix = Admin_Menu::add_menu(
 			__( 'Jetpack VaultPress Backup', 'jetpack-backup-pkg' ),
-			_x( 'VaultPress Backup', 'The Jetpack VaultPress Backup product name, without the Jetpack prefix', 'jetpack-backup-pkg' ),
+			_x( 'Backups', 'Menu label for the Jetpack Backups page in WP Admin', 'jetpack-backup-pkg' ),
 			'manage_options',
 			'jetpack-backup',
 			array( __CLASS__, 'plugin_settings_page' ),