Masterbar Site Menu - Tell Calypso the current site via `?origin_site…

…_id=` (#38401) * Add origin_site_id param to the links on masterbar * changelog * Use Connection_Manager * Use Connection_Manager for /read and /me/account * Extract maybe_add_origin_site_id_to_url * picky jetpack housekeeping goo * composer too... dont foget, never forget, always forget... * add another changelog... IS THIS THE END? * it wasnt the end, its never the end... * another composer lock... nesting dolls... * where is my atreyu * are we there yet? --------- Co-authored-by: Addison-Stavlo <[email protected]>
Automattic · Jul 18, 2024 · 15f7929 · 15f7929
1 parent 546cae1
commit 15f7929
Show file tree

Hide file tree

Showing 15 changed files with 68 additions and 42 deletions.
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/add-populate-site-from-wp-admin b/projects/packages/jetpack-mu-wpcom/changelog/add-populate-site-from-wp-admin
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Add origin_site_id param to the links on masterbar
diff --git a/projects/packages/jetpack-mu-wpcom/composer.json b/projects/packages/jetpack-mu-wpcom/composer.json
@@ -62,7 +62,7 @@
 		},
 		"autotagger": true,
 		"branch-alias": {
-			"dev-trunk": "5.46.x-dev"
+			"dev-trunk": "5.47.x-dev"
 		},
 		"textdomain": "jetpack-mu-wpcom",
 		"version-constants": {

diff --git a/projects/packages/jetpack-mu-wpcom/package.json b/projects/packages/jetpack-mu-wpcom/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-mu-wpcom",
-	"version": "5.46.0",
+	"version": "5.47.0-alpha",
 	"description": "Enhances your site with features powered by WordPress.com",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/jetpack-mu-wpcom/#readme",
 	"bugs": {

diff --git a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php
@@ -13,7 +13,7 @@
  * Jetpack_Mu_Wpcom main class.
  */
 class Jetpack_Mu_Wpcom {
-	const PACKAGE_VERSION = '5.46.0';
+	const PACKAGE_VERSION = '5.47.0-alpha';
 	const PKG_DIR         = __DIR__ . '/../';
 	const BASE_DIR        = __DIR__ . '/';
 	const BASE_FILE       = __FILE__;

diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-bar/wpcom-admin-bar.php b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-bar/wpcom-admin-bar.php
@@ -7,10 +7,26 @@
  * @package automattic/jetpack-mu-wpcom
  */
 
+use Automattic\Jetpack\Connection\Manager as Connection_Manager;
 use Automattic\Jetpack\Jetpack_Mu_Wpcom;
 
 define( 'WPCOM_ADMIN_BAR_UNIFICATION', true );
 
+/**
+ * Adds the origin_site_id query parameter to a URL.
+ *
+ * @param string $url The URL to add the query param to.
+ * @return string The URL with the origin_site_id query parameter mey be added.
+ */
+function maybe_add_origin_site_id_to_url( $url ) {
+	$site_id = Connection_Manager::get_site_id();
+	if ( is_wp_error( $site_id ) ) {
+		return $url;
+	}
+
+	return add_query_arg( 'origin_site_id', $site_id, $url );
+}
+
 /**
  * Enqueue assets needed by the WordPress.com admin bar.
  */
@@ -56,7 +72,6 @@ function wpcom_repurpose_wp_logo_as_all_sites_menu( $wp_admin_bar ) {
 			$wp_admin_bar->remove_node( $node->id );
 		}
 	}
-
 	$wp_admin_bar->remove_node( 'wp-logo' );
 	$wp_admin_bar->add_node(
 		array(
@@ -65,7 +80,7 @@ function wpcom_repurpose_wp_logo_as_all_sites_menu( $wp_admin_bar ) {
 						/* translators: Hidden accessibility text. */
 						__( 'All Sites', 'jetpack-mu-wpcom' ) .
 						'</span>',
-			'href'  => 'https://wordpress.com/sites',
+			'href'  => maybe_add_origin_site_id_to_url( 'https://wordpress.com/sites' ),
 			'meta'  => array(
 				'menu_title' => __( 'All Sites', 'jetpack-mu-wpcom' ),
 			),
@@ -84,7 +99,7 @@ function wpcom_add_reader_menu( $wp_admin_bar ) {
 		array(
 			'id'    => 'reader',
 			'title' => __( 'Reader', 'jetpack-mu-wpcom' ),
-			'href'  => 'https://wordpress.com/read',
+			'href'  => maybe_add_origin_site_id_to_url( 'https://wordpress.com/read' ),
 			'meta'  => array(
 				'class' => 'wp-admin-bar-reader',
 			),
@@ -104,13 +119,12 @@ function wpcom_add_my_account_item_to_profile_menu( $wp_admin_bar ) {
 		// Adds the 'My Account' menu item before 'Log Out'.
 		$wp_admin_bar->remove_node( 'logout' );
 	}
-
 	$wp_admin_bar->add_node(
 		array(
 			'id'     => 'wpcom-profile',
 			'parent' => 'user-actions',
 			'title'  => __( 'My Account', 'jetpack-mu-wpcom' ),
-			'href'   => 'https://wordpress.com/me/account',
+			'href'   => maybe_add_origin_site_id_to_url( 'https://wordpress.com/me/account' ),
 		)
 	);
 

diff --git a/projects/plugins/mu-wpcom-plugin/changelog/add-populate-site-from-wp-admin b/projects/plugins/mu-wpcom-plugin/changelog/add-populate-site-from-wp-admin
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Adds checks to remove wpcom items and links in wp-admin for users who are not connected to wpcom.
diff --git a/projects/plugins/mu-wpcom-plugin/composer.json b/projects/plugins/mu-wpcom-plugin/composer.json
@@ -46,6 +46,6 @@
 		]
 	},
 	"config": {
-		"autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_4_2_alpha"
+		"autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_5_0_alpha"
 	}
 }
diff --git a/projects/plugins/mu-wpcom-plugin/composer.lock b/projects/plugins/mu-wpcom-plugin/composer.lock
diff --git a/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php b/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php
@@ -3,7 +3,7 @@
  *
  * Plugin Name: WordPress.com Features
  * Description: Test plugin for the jetpack-mu-wpcom package
- * Version: 2.4.2-alpha
+ * Version: 2.5.0-alpha
  * Author: Automattic
  * License: GPLv2 or later
  * Text Domain: jetpack-mu-wpcom-plugin

diff --git a/projects/plugins/mu-wpcom-plugin/package.json b/projects/plugins/mu-wpcom-plugin/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-mu-wpcom-plugin",
-	"version": "2.4.2-alpha",
+	"version": "2.5.0-alpha",
 	"description": "Test plugin for the jetpack-mu-wpcom package",
 	"homepage": "https://jetpack.com",
 	"bugs": {

diff --git a/projects/plugins/wpcomsh/changelog/add-populate-site-from-wp-admin b/projects/plugins/wpcomsh/changelog/add-populate-site-from-wp-admin
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Adds checks to remove wpcom items and links in wp-admin for users who are not connected to wpcom.
diff --git a/projects/plugins/wpcomsh/composer.json b/projects/plugins/wpcomsh/composer.json
@@ -130,7 +130,7 @@
 			"composer/installers": true,
 			"roots/wordpress-core-installer": true
 		},
-		"autoloader-suffix": "26841ac2064774301cbe06d174833bfc_wpcomshⓥ4_0_0"
+		"autoloader-suffix": "26841ac2064774301cbe06d174833bfc_wpcomshⓥ4_1_0_alpha"
 	},
 	"extra": {
 		"mirror-repo": "Automattic/wpcom-site-helper",

diff --git a/projects/plugins/wpcomsh/composer.lock b/projects/plugins/wpcomsh/composer.lock
diff --git a/projects/plugins/wpcomsh/package.json b/projects/plugins/wpcomsh/package.json
@@ -3,7 +3,7 @@
 	"name": "@automattic/jetpack-wpcomsh",
 	"description": "A helper for connecting WordPress.com sites to external host infrastructure.",
 	"homepage": "https://jetpack.com",
-	"version": "4.0.0",
+	"version": "4.1.0-alpha",
 	"bugs": {
 		"url": "https://github.com/Automattic/jetpack/labels/[Plugin] Wpcomsh"
 	},

diff --git a/projects/plugins/wpcomsh/wpcomsh.php b/projects/plugins/wpcomsh/wpcomsh.php
@@ -2,14 +2,14 @@
 /**
  * Plugin Name: WordPress.com Site Helper
  * Description: A helper for connecting WordPress.com sites to external host infrastructure.
- * Version: 4.0.0
+ * Version: 4.1.0-alpha
  * Author: Automattic
  * Author URI: http://automattic.com/
  *
  * @package wpcomsh
  */
 
-define( 'WPCOMSH_VERSION', '4.0.0' );
+define( 'WPCOMSH_VERSION', '4.1.0-alpha' );
 
 // If true, Typekit fonts will be available in addition to Google fonts
 add_filter( 'jetpack_fonts_enable_typekit', '__return_true' );