Stats admin: only register the Stats dashboard for connected sites

Drop the pre-connection registration: the Stats menu now only appears
once the site is connected, as before this branch. What remains is the
consolidation of the registration decision in
Main::maybe_register_dashboard() — connected, stats module active,
Odyssey enabled, and not a noheader chart-image request — with the
stats module falling back to the old interface when it declines.

Author: kangzj

projects/packages/stats-admin/changelog/stats-366-pricing-grid

@@ -1,4 +1,4 @@
-Significance: minor
-Type: added
+Significance: patch
+Type: changed
+Comment: Consolidate the Stats dashboard menu registration decision in Main::maybe_register_dashboard(). No user-facing change.
 
-Register the Stats dashboard before the site connects, so new installations can reach the Stats pricing grid rendered by Odyssey.

projects/packages/stats-admin/src/class-main.php

@@ -53,11 +53,6 @@ public static function init() {
 	 */
 	private function __construct() {
 		add_action( 'rest_api_init', array( REST_Controller::class, 'register' ) );
-
-		if ( is_admin() ) {
-			self::maybe_register_dashboard();
-		}
-
 		// Disable JITM assets on the Stats page.
 		// JITM is handled separately by Stats: https://github.com/Automattic/wp-calypso/pull/95273.
 		add_filter(
@@ -80,28 +75,18 @@ function ( $show, $screen_id ) {
 	 * Register the Odyssey dashboard as the Stats menu when it should own the
 	 * Stats screen, and report whether it did.
 	 *
-	 * Called from two entry points covering disjoint cases: this package's
-	 * constructor for sites that haven't connected yet (the stats module,
-	 * which normally registers the menu, only loads once connected), and the
-	 * stats module's stats_admin_menu() for connected sites, which falls back
-	 * to the old Stats interface when this declines.
+	 * Called from the stats module's stats_admin_menu(), which falls back to
+	 * the old Stats interface when this declines: when the site isn't
+	 * connected, the stats module is inactive, the site opted out of Odyssey,
+	 * or the request is a noheader chart image (the adminbar sparkline and
+	 * dashboard widget), which the legacy interface serves.
 	 *
 	 * @return bool Whether the dashboard was registered.
 	 */
 	public static function maybe_register_dashboard() {
-		// Unconnected sites can't load the stats module; register the
-		// dashboard so Odyssey — which hosts the Stats pricing grid and owns
-		// its eligibility — is reachable before connecting.
-		if ( ! ( new Manager() )->is_connected() ) {
-			Dashboard::init();
-			return true;
-		}
-
-		// On connected sites the stats module owns the screen: respect the
-		// Odyssey opt-out, and leave noheader chart-image requests (the
-		// adminbar sparkline and dashboard widget) to the legacy interface.
 		if (
-			! ( new Modules() )->is_active( 'stats' )
+			! ( new Manager() )->is_connected()
+			|| ! ( new Modules() )->is_active( 'stats' )
 			|| ! Stats_Options::get_option( 'enable_odyssey_stats' )
 			// phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			|| isset( $_GET['noheader'] )

projects/packages/stats-admin/tests/php/Main_Test.php

@@ -30,14 +30,14 @@ public function tearDown(): void {
 	}
 
 	/**
-	 * An unconnected site registers the dashboard, so Odyssey (and its
-	 * pricing grid) is reachable before connecting.
+	 * An unconnected site declines, so the Stats menu only registers once the
+	 * site is connected.
 	 */
-	public function test_maybe_register_dashboard_for_unconnected_site() {
+	public function test_maybe_register_dashboard_declines_for_unconnected_site() {
 		remove_filter( 'jetpack_options', array( $this, 'mock_jetpack_site_connection_options' ) );
 		( new Connection_Manager() )->reset_connection_status();
 
-		$this->assertTrue( Main::maybe_register_dashboard() );
+		$this->assertFalse( Main::maybe_register_dashboard() );
 	}
 
 	/**

projects/plugins/jetpack/changelog/stats-366-pricing-grid

@@ -1,4 +1,4 @@
 Significance: patch
-Type: enhancement
+Type: other
+Comment: Stats: delegate the Odyssey dashboard registration decision to the stats-admin package. No user-facing change.
 
-Stats: Show the Stats pricing grid for new installations without a plan, including before the site is connected.