Hosting Configuration: Make the menu title under the settings the sam…

…e as the destination (#39183) * Hosting Configuration: Rename the menu title under the settings * changelog * Fix lint * Update url * Fix tests * changelog * Fix wpcom_site_has_feature * Fix tests Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/10682178509 Upstream-Ref: Automattic/jetpack@60a8541
Automattic · Sep 3, 2024 · 9f1c142 · 9f1c142
1 parent f547e12
commit 9f1c142
Show file tree

Hide file tree

Showing 6 changed files with 99 additions and 88 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/vendor/automattic/jetpack-masterbar/CHANGELOG.md b/vendor/automattic/jetpack-masterbar/CHANGELOG.md
@@ -12,6 +12,9 @@ This is an alpha version! The changes listed here are not final.
 ### Changed
 - Enable Users -> Profile (profile.php) on all sites
 
+### Fixed
+- Hosting Configuration: Make the menu title under the settings the same as the destination
+
 ## [0.8.1] - 2024-08-30
 ### Changed
 - Updated package dependencies. [#39111]

diff --git a/vendor/automattic/jetpack-masterbar/src/admin-menu/class-atomic-admin-menu.php b/vendor/automattic/jetpack-masterbar/src/admin-menu/class-atomic-admin-menu.php
@@ -423,8 +423,16 @@ public function add_options_menu() {
 			);
 		}
 
-		// @phan-suppress-next-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
-		add_submenu_page( 'options-general.php', esc_attr__( 'Hosting Configuration', 'jetpack-masterbar' ), __( 'Hosting Configuration', 'jetpack-masterbar' ), 'manage_options', 'https://wordpress.com/hosting-config/' . $this->domain, null, 11 );
+		$has_feature_atomic = function_exists( 'wpcom_site_has_feature' ) && wpcom_site_has_feature( \WPCOM_Features::ATOMIC );
+		add_submenu_page(
+			'options-general.php',
+			$has_feature_atomic ? esc_attr__( 'Server Settings', 'jetpack-masterbar' ) : esc_attr__( 'Hosting Features', 'jetpack-masterbar' ),
+			$has_feature_atomic ? __( 'Server Settings', 'jetpack-masterbar' ) : __( 'Hosting Features', 'jetpack-masterbar' ),
+			'manage_options',
+			$has_feature_atomic ? 'https://wordpress.com/hosting-config/' . $this->domain : 'https://wordpress.com/hosting-features/' . $this->domain,
+			null, // @phan-suppress-current-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
+			11
+		);
 
 		// Page Optimize is active by default on all Atomic sites and registers a Settings > Performance submenu which
 		// would conflict with our own Settings > Performance that links to Calypso, so we hide it it since the Calypso

diff --git a/vendor/automattic/jetpack-masterbar/src/admin-menu/class-wpcom-admin-menu.php b/vendor/automattic/jetpack-masterbar/src/admin-menu/class-wpcom-admin-menu.php
@@ -362,7 +362,7 @@ public function add_options_menu() {
 		parent::add_options_menu();
 
 		// @phan-suppress-next-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
-		add_submenu_page( 'options-general.php', esc_attr__( 'Hosting Configuration', 'jetpack-masterbar' ), __( 'Hosting Configuration', 'jetpack-masterbar' ), 'manage_options', 'https://wordpress.com/hosting-config/' . $this->domain, null, 10 );
+		add_submenu_page( 'options-general.php', esc_attr__( 'Hosting Features', 'jetpack-masterbar' ), __( 'Hosting Features', 'jetpack-masterbar' ), 'manage_options', 'https://wordpress.com/hosting-features/' . $this->domain, null, 10 );
 	}
 
 	/**