Masterbar: Fix missing private badge on admin menu for private WoA si…

…tes (#38026) * Masterbar: Fix missing private badge on admin menu for private WoA sites
Automattic · Jun 25, 2024 · 618e479 · 618e479
1 parent 64517a4
commit 618e479
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 3 deletions.
diff --git a/projects/packages/masterbar/changelog/fix-masterbar-atomic-menu-private-sites b/projects/packages/masterbar/changelog/fix-masterbar-atomic-menu-private-sites
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Masterbar: Fix missing private badge on admin menu for private WoA sites
diff --git a/projects/packages/masterbar/package.json b/projects/packages/masterbar/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-masterbar",
-	"version": "0.2.1",
+	"version": "0.2.2-alpha",
 	"description": "The WordPress.com Toolbar feature replaces the default admin bar and offers quick links to the Reader, all your sites, your WordPress.com profile, and notifications.",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/masterbar/#readme",
 	"bugs": {

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
@@ -258,7 +258,7 @@ public function add_site_card_menu() {
 		}
 
 		// @phan-suppress-next-line PhanUndeclaredFunction -- This is temp, pending pf4qpu-nc-p2
-		if ( ( function_exists( 'site_is_private' ) && site_is_private() ) || $is_coming_soon ) {
+		if ( ( function_exists( '\Private_Site\site_is_private' ) && \Private_Site\site_is_private() ) || $is_coming_soon ) {
 			$badge .= sprintf(
 				'<span class="site__badge site__badge-private">%s</span>',
 				$is_coming_soon ? esc_html__( 'Coming Soon', 'jetpack-masterbar' ) : esc_html__( 'Private', 'jetpack-masterbar' )

diff --git a/projects/packages/masterbar/src/class-main.php b/projects/packages/masterbar/src/class-main.php
@@ -14,7 +14,7 @@
  */
 class Main {
 
-	const PACKAGE_VERSION = '0.2.1';
+	const PACKAGE_VERSION = '0.2.2-alpha';
 
 	/**
 	 * Initializer.

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
@@ -8,6 +8,7 @@
 namespace Automattic\Jetpack\Masterbar;
 
 use Automattic\Jetpack\Status;
+use Brain\Monkey\Functions;
 use PHPUnit\Framework\TestCase;
 use WorDBless\Options as WorDBless_Options;
 use WorDBless\Users as WorDBless_Users;
@@ -205,6 +206,37 @@ public function test_add_site_card_menu() {
 		$this->assertEquals( $site_card_menu_item, $menu[1] );
 	}
 
+	/**
+	 * Tests add_site_card_menu for Private sites
+	 *
+	 * @covers ::add_site_card_menu
+	 */
+	public function test_add_site_card_menu_private_site() {
+		global $menu;
+
+		Functions\expect( '\Private_Site\site_is_private' )
+				->andReturn( true );
+
+		static::$admin_menu->add_site_card_menu();
+
+		$home_url            = home_url();
+		$site_card_menu_item = array(
+			// phpcs:ignore Squiz.Strings.DoubleQuoteUsage.NotRequired
+			'
+<div class="site__info">
+	<div class="site__title">' . get_option( 'blogname' ) . '</div>
+	<div class="site__domain">' . static::$domain . "</div>\n\t<span class=\"site__badge site__badge-private\">Private</span>\n</div>",
+			'read',
+			$home_url,
+			'site-card',
+			'menu-top toplevel_page_' . $home_url,
+			'toplevel_page_' . $home_url,
+			plugins_url( 'src/admin-menu/globe-icon.svg', dirname( __DIR__ ) ),
+		);
+
+		$this->assertEquals( $site_card_menu_item, $menu[1] );
+	}
+
 	/**
 	 * Tests set_site_card_menu_class
 	 *