Sidebar upsell: show only on connected sites by simison · Pull Request #47967 · Automattic/jetpack

simison · 2026-04-07T11:11:35Z

Fixes JETPACK-1518
Closes #47993

Follow-up to #47418

Proposed changes

Hides upsell banner when site and user aren't connected yet
Hides also when site is in offline mode

Before

After

Other information

Related product discussion/links

internal ref p1775549007733249-slack-C0D96691V

Does this pull request change what data or activity we track or use?

Testing instructions

Have a free site, or modify is_free_plan() return true always
See sidebar has upsell
Set your site offline mode and see upsell gone add_filter( 'jetpack_offline_mode', '__return_true' );
Disconnect your Jetpack and see upsell gone.
You may also test with Jurassic Ninja before connecting the site.

github-actions · 2026-04-07T11:12:37Z

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

✅ Include a description of your PR changes.
✅ Add a "[Status]" label (In Progress, Needs Review, ...).
✅ Add testing instructions.
✅ Specify whether this PR includes any changes to data or privacy.
✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖

Follow this PR Review Process:

Ensure all required checks appearing at the bottom of this PR are passing.
Make sure to test your changes on all platforms that it applies to. You're responsible for the quality of the code you ship.
You can use GitHub's Reviewers functionality to request a review.
When it's reviewed and merged, you will be pinged in Slack to deploy the changes to WordPress.com simple once the build is done.

If you have questions about anything, reach out in #jetpack-developers for guidance!

github-actions · 2026-04-07T11:12:37Z

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

To test on WoA, go to the Plugins menu on a WoA dev site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin (Jetpack or WordPress.com Site Helper), and enable the update/upsell-sidebar-hide-when-not-connected branch.
To test on Simple, run the following command on your sandbox:

bin/jetpack-downloader test jetpack update/upsell-sidebar-hide-when-not-connected

bin/jetpack-downloader test jetpack-mu-wpcom-plugin update/upsell-sidebar-hide-when-not-connected

Interested in more tips and information?

In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
Read more about our development workflow here: PCYsg-eg0-p2
Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

jp-launch-control · 2026-04-07T11:40:22Z

Code Coverage Summary

Coverage changed in 1 file.

File	Coverage	Δ%	Δ Uncovered
projects/packages/admin-ui/src/class-admin-menu.php	143/171 (83.63%)	-0.14%	3 ❤️‍🩹

Full summary · PHP report · JS report

keoshi

Confirmed:

The button is not visible when the site is not connected

The button shows up when it's connected

When disconnecting the user account (site-only connection) the button is visible. Clicking it correctly takes users to the checkout. However, checkout fails because the user is not connected to the site. Unrelated and not blocking, though we could show the button only when site+user are connected.

jeherve

Ah, I missed that PR of yours and opened #47993 yesterday.

I can close my PR, but I think it's worth adding the offline check to yours.

simison · 2026-04-09T10:14:47Z

Nice one! I'll add that and I also like your method for tests more. Looks cleaner.

This reverts commit 27c82e5.

Copilot

Pull request overview

Updates the admin-ui package’s “Upgrade Jetpack” sidebar upsell so it only appears when the site is usable for upgrades (i.e., connected and not in offline mode), aligning the UI with actual upgrade capability on self‑hosted installs.

Changes:

Gate the upsell behind offline-mode detection and “site + current user connected” checks.
Add PHPUnit coverage for “site not connected” and “offline mode” hiding behavior.
Add a changelog fragment describing the behavior change.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.

File	Description
projects/packages/admin-ui/src/class-admin-menu.php	Adds offline-mode + connection gating to the upgrade submenu and its style enqueue, with an injectable connection manager for tests.
projects/packages/admin-ui/tests/php/bootstrap.php	Ensures connection-related classes are available during the test bootstrap.
projects/packages/admin-ui/tests/php/Admin_Menu_Test.php	Extends tests to assert the upsell is hidden when offline or when the site isn’t connected.
projects/packages/admin-ui/changelog/update-upsell-sidebar-hide-when-not-connected	Adds a changelog entry for the upsell visibility change.

Copilot · 2026-04-09T15:10:15Z

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

+if ( ! class_exists( 'Jetpack_Options' ) ) {
+	require_once __DIR__ . '/../../../connection/legacy/class-jetpack-options.php';
+}
+
+if ( ! class_exists( '\Automattic\Jetpack\Connection\Manager' ) ) {
+	require_once __DIR__ . '/../../../connection/src/class-manager.php';
+}
+


The test bootstrap is hard-coding monorepo-relative paths into require_once for the connection package. This bypasses the Composer dev dependency (automattic/jetpack-connection) and can break when this package is used/tested outside the monorepo (e.g., mirrored repo / different directory layout). Prefer relying on Composer autoload (or resolving the dependency via vendor/) rather than ../../../connection/... paths.

Suggested change

if ( ! class_exists( 'Jetpack_Options' ) ) {

require_once __DIR__ . '/../../../connection/legacy/class-jetpack-options.php';

}

if ( ! class_exists( '\Automattic\Jetpack\Connection\Manager' ) ) {

require_once __DIR__ . '/../../../connection/src/class-manager.php';

}

if ( ! class_exists( 'Jetpack_Options' ) || ! class_exists( '\Automattic\Jetpack\Connection\Manager' ) ) {

throw new RuntimeException(

'Missing test dependency: automattic/jetpack-connection must be installed and autoloaded via Composer.'

);

}

Copilot · 2026-04-09T15:10:16Z

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

+	private static function is_site_and_user_connected() {
+		$connection_manager = self::$connection_manager;
+		if ( ! $connection_manager && class_exists( '\Automattic\Jetpack\Connection\Manager' ) ) {
+			$connection_manager = new \Automattic\Jetpack\Connection\Manager();


is_site_and_user_connected() instantiates a new \Automattic\Jetpack\Connection\Manager every time it runs when no dependency is injected. Since should_show_upgrade_menu() is called from multiple hooks in the same request (menu registration and enqueue), this can create multiple Manager instances unnecessarily. Consider caching the created Manager in self::$connection_manager after instantiation so subsequent calls reuse it.

Suggested change

$connection_manager = new \Automattic\Jetpack\Connection\Manager();

$connection_manager = new \Automattic\Jetpack\Connection\Manager();

self::$connection_manager = $connection_manager;

Copilot · 2026-04-09T15:10:17Z

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

+	public function test_upgrade_menu_item_hidden_when_site_not_connected() {
+		wp_set_current_user( self::$admin_user_id );
+		$connection = $this->getMockBuilder( 'Automattic\Jetpack\Connection\Manager' )
+			->disableOriginalConstructor()
+			->getMock();
+		$connection->expects( $this->atLeastOnce() )
+			->method( 'is_connected' )
+			->willReturn( false );
+		Admin_Menu::set_connection_manager( $connection );
+
+		Admin_Menu::init();
+		do_action( 'admin_menu' );
+
+		$this->assertUpgradeMenuItemAbsent();
+	}


New behavior requires both site and user to be connected (is_user_connected), but the tests only cover the site-not-connected case and offline mode. Add coverage for the case where the site is connected but the current user is not (for both menu item registration and stylesheet enqueue) to ensure the new gating logic is enforced.

Copilot · 2026-04-09T15:10:17Z

projects/packages/admin-ui/changelog/update-upsell-sidebar-hide-when-not-connected

+Significance: minor
+Type: changed
+
+Sidebar upsell: hide when site is not connected to Jetpack.com.


The changelog entry text is inconsistent with the behavior introduced in this PR: it mentions “Jetpack.com” (the connection is to WordPress.com) and doesn't mention the offline-mode suppression. Please update the entry text to accurately reflect the conditions under which the sidebar upsell is hidden.

Suggested change

Sidebar upsell: hide when site is not connected to Jetpack.com.

Hide the sidebar upsell when the site is not connected to WordPress.com or is in offline mode.

…cted test, fix changelog Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

dhasilva

LGTM

jeherve

This looks good, should be good to merge.

Not a blocker, more of a question. We typically do not add class_exists and is_callable checks for those methods in other packages in the codebase, mostly because the package is required by the consuming package so we know those are available. Do we really need those here?

simison added Enhancement Changes to an existing feature — removing, adding, or changing parts of it [Status] Needs Review This PR is ready for review. labels Apr 7, 2026

github-actions bot added [Package] Admin Ui [Tests] Includes Tests labels Apr 7, 2026

github-actions bot added [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. and removed [Status] Needs Review This PR is ready for review. labels Apr 7, 2026

keoshi previously approved these changes Apr 7, 2026

View reviewed changes

simison dismissed keoshi’s stale review via 5d908bc April 9, 2026 09:17

simison force-pushed the update/upsell-sidebar-hide-when-not-connected branch from 27c82e5 to 5d908bc Compare April 9, 2026 09:17

jeherve reviewed Apr 9, 2026

View reviewed changes

jeherve mentioned this pull request Apr 9, 2026

Upgrade menu: do not show when not connected or in offline mode #47993

Closed

simison added 8 commits April 9, 2026 14:21

Sidebar upsell: show only on connected sites

fde2759

changelog

54f417e

Move connection check closer to plan check; host check first

539ee53

Update Admin_Menu_Test.php

5465bbc

Revert "Update Admin_Menu_Test.php"

f6beacb

This reverts commit 27c82e5.

Update tests

f0ead78

Add user connection check

9e90db1

Add offline check and simplify tests

66199db

simison force-pushed the update/upsell-sidebar-hide-when-not-connected branch from 6e35adb to 66199db Compare April 9, 2026 11:22

dhasilva assigned simison Apr 9, 2026

dhasilva added [Status] Needs Review This PR is ready for review. and removed [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. labels Apr 9, 2026

dhasilva requested a review from Copilot April 9, 2026 15:05

Copilot started reviewing on behalf of dhasilva April 9, 2026 15:06 View session

Copilot AI reviewed Apr 9, 2026

View reviewed changes

Address review feedback: cache connection manager, add user-not-conne…

eba32f5

…cted test, fix changelog Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

dhasilva requested a review from a team April 9, 2026 15:58

dhasilva approved these changes Apr 9, 2026

View reviewed changes

jeherve approved these changes Apr 9, 2026

View reviewed changes

dhasilva merged commit 6670a2b into trunk Apr 9, 2026
118 of 120 checks passed

dhasilva deleted the update/upsell-sidebar-hide-when-not-connected branch April 9, 2026 20:32

github-actions bot removed the [Status] Needs Review This PR is ready for review. label Apr 9, 2026

	$connection_manager = new \Automattic\Jetpack\Connection\Manager();
	$connection_manager = new \Automattic\Jetpack\Connection\Manager();
	self::$connection_manager = $connection_manager;

	Sidebar upsell: hide when site is not connected to Jetpack.com.
	Hide the sidebar upsell when the site is not connected to WordPress.com or is in offline mode.

Conversation

simison commented Apr 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed changes

Other information

Related product discussion/links

Does this pull request change what data or activity we track or use?

Testing instructions

Uh oh!

github-actions bot commented Apr 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Apr 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jp-launch-control bot commented Apr 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Coverage Summary

Uh oh!

keoshi left a comment

Choose a reason for hiding this comment

Uh oh!

jeherve left a comment

Choose a reason for hiding this comment

Uh oh!

simison commented Apr 9, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Apr 9, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 9, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 9, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 9, 2026

Choose a reason for hiding this comment

Uh oh!

dhasilva left a comment

Choose a reason for hiding this comment

Uh oh!

jeherve left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

simison commented Apr 7, 2026 •

edited

Loading

github-actions bot commented Apr 7, 2026 •

edited

Loading

github-actions bot commented Apr 7, 2026 •

edited

Loading

jp-launch-control bot commented Apr 7, 2026 •

edited

Loading