Stats admin: dismiss the pricing grid once the user picks a plan

Both CTAs now land on Odyssey views flagged with a view query param
(traffic for free, purchase for paid); loading either view marks the
grid dismissed so it doesn't reappear — including after Odyssey's 'I
will do it later'. Dismissal is recorded in the wpcom stats notices
(pricing_grid_dismissed) for connected sites, with a local option
covering unconnected sites where that endpoint is unreachable.

'Start for free' no longer runs a checkout for the free product — it
goes straight to the Stats dashboard, so the checkout workflow hook,
the connection initial state, and the unused initial-state fields are
removed. Also reword the paid price legend to 'from 10k monthly views'.

Author: kangzj

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

@@ -8,7 +8,6 @@
 namespace Automattic\Jetpack\Stats_Admin;
 
 use Automattic\Jetpack\Assets;
-use Automattic\Jetpack\Connection\Initial_State as Connection_Initial_State;
 use Automattic\Jetpack\Stats\Options as Stats_Options;
 
 /**
@@ -144,6 +143,12 @@ class="jp-stats-dashboard-loading-spinner"
 	 */
 	public function admin_init() {
 		add_action( 'admin_enqueue_scripts', array( $this, 'load_admin_scripts' ) );
+
+		// Landing on an Odyssey view means the user chose a plan from the
+		// pricing grid; don't show the grid again on later visits.
+		if ( $this->is_odyssey_view() ) {
+			Pricing_Grid\Eligibility::dismiss();
+		}
 	}
 
 	/**
@@ -164,17 +169,27 @@ public function load_admin_scripts() {
 	 * @return bool True if the pricing grid should be shown.
 	 */
 	private function should_show_pricing_grid() {
-		// The Odyssey purchase route (#!/stats/purchase/{blogId}) shares this
-		// page; the pricing grid's paid CTA adds `view=purchase` so the
-		// dashboard renders Odyssey there instead of the grid.
-		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		if ( isset( $_GET['view'] ) && 'purchase' === $_GET['view'] ) {
+		// Odyssey shares this page; the pricing grid's CTAs add a `view` flag
+		// (purchase for the paid tier route, traffic for the free dashboard)
+		// so the dashboard renders Odyssey there instead of the grid.
+		if ( $this->is_odyssey_view() ) {
 			return false;
 		}
 
 		return Pricing_Grid\Eligibility::should_show_pricing_grid();
 	}
 
+	/**
+	 * Whether the current request targets an Odyssey view via the pricing
+	 * grid's `view` query flag.
+	 *
+	 * @return bool True for an Odyssey view.
+	 */
+	private function is_odyssey_view() {
+		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		return isset( $_GET['view'] ) && in_array( $_GET['view'], array( 'purchase', 'traffic' ), true );
+	}
+
 	/**
 	 * Load the pricing grid scripts and initial state.
 	 */
@@ -196,8 +211,7 @@ private function load_pricing_grid_scripts() {
 		);
 		Assets::enqueue_script( $handle );
 
-		// Inject the initial states before the bundle runs.
+		// Inject the initial state before the bundle runs.
 		wp_add_inline_script( $handle, ( new Pricing_Grid\Initial_State() )->render(), 'before' );
-		Connection_Initial_State::render_script( $handle );
 	}
 }

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

@@ -56,7 +56,7 @@ private function __construct() {
 		// The stats module normally registers the Stats menu, but modules only
 		// load once the site is connected. Register the dashboard here too so
 		// eligible new sites see the pricing grid before connecting.
-		if ( is_admin() && Pricing_Grid\Eligibility::should_show_pricing_grid() ) {
+		if ( is_admin() && Pricing_Grid\Eligibility::is_eligible_site() ) {
 			Dashboard::init();
 		}
 

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

@@ -21,6 +21,7 @@ class Notices {
 	const NEW_STATS_FEEDBACK_NOTICE_ID      = 'new_stats_feedback';
 	const OPT_IN_NEW_STATS_NOTICE_ID        = 'opt_in_new_stats';
 	const GDPR_COOKIE_CONSENT_NOTICE_ID     = 'gdpr_cookie_consent';
+	const PRICING_GRID_DISMISSED_NOTICE_ID  = 'pricing_grid_dismissed';
 
 	const VIEWS_TO_SHOW_FEEDBACK      = 3;
 	const POSTPONE_OPT_IN_NOTICE_DAYS = 30;

projects/packages/stats-admin/src/pricing-grid/class-eligibility.php

@@ -9,6 +9,7 @@
 
 use Automattic\Jetpack\Connection\Manager as Connection_Manager;
 use Automattic\Jetpack\Current_Plan;
+use Automattic\Jetpack\Stats_Admin\Notices;
 
 /**
  * Determines whether to show the Stats pricing grid (for new sites without a plan).
@@ -92,14 +93,66 @@ public static function has_stats_plan() {
 		return false;
 	}
 
+	/**
+	 * Option marking the pricing grid as dismissed.
+	 *
+	 * Set once the user picks a plan from the grid, so it doesn't reappear
+	 * after "I will do it later" or an abandoned checkout. The wpcom notices
+	 * endpoint is the authoritative record for connected sites; this local
+	 * option covers unconnected sites, where that endpoint is unreachable.
+	 *
+	 * @var string
+	 */
+	const DISMISSED_OPTION = 'jetpack_stats_pricing_grid_dismissed';
+
+	/**
+	 * Check if the pricing grid has been dismissed.
+	 *
+	 * @return bool True if the pricing grid has been dismissed.
+	 */
+	public static function is_dismissed() {
+		if ( get_option( self::DISMISSED_OPTION ) ) {
+			return true;
+		}
+
+		if ( ( new Connection_Manager() )->is_connected() ) {
+			return ( new Notices() )->is_notice_hidden( Notices::PRICING_GRID_DISMISSED_NOTICE_ID );
+		}
+
+		return false;
+	}
+
+	/**
+	 * Mark the pricing grid as dismissed.
+	 */
+	public static function dismiss() {
+		update_option( self::DISMISSED_OPTION, true );
+
+		if ( ( new Connection_Manager() )->is_connected() ) {
+			( new Notices() )->update_notice( Notices::PRICING_GRID_DISMISSED_NOTICE_ID, 'dismissed' );
+		}
+	}
+
+	/**
+	 * Check if the site qualifies for the pricing grid: a new site without a
+	 * Stats plan. Dismissal is intentionally not considered here — this also
+	 * gates the Stats menu registration for unconnected sites, which must
+	 * survive dismissal.
+	 *
+	 * @return bool True if the site qualifies for the pricing grid.
+	 */
+	public static function is_eligible_site() {
+		return self::is_new_site() && ! self::has_stats_plan();
+	}
+
 	/**
 	 * Check if the pricing grid should be shown.
 	 *
-	 * The pricing grid is shown for new sites without a Stats plan.
+	 * The pricing grid is shown for new sites without a Stats plan, until dismissed.
 	 *
 	 * @return bool True if the pricing grid should be shown.
 	 */
 	public static function should_show_pricing_grid() {
-		return self::is_new_site() && ! self::has_stats_plan();
+		return self::is_eligible_site() && ! self::is_dismissed();
 	}
 }

projects/packages/stats-admin/src/pricing-grid/class-initial-state.php

@@ -7,20 +7,12 @@
 
 namespace Automattic\Jetpack\Stats_Admin\Pricing_Grid;
 
-use Automattic\Jetpack\Connection\Manager as Connection_Manager;
 use Jetpack_Options;
 
 /**
  * Builds the initial state object for the pricing grid React component.
  */
 class Initial_State {
-	/**
-	 * The free Stats product slug.
-	 *
-	 * @var string
-	 */
-	const FREE_PRODUCT_SLUG = 'jetpack_stats_free_yearly';
-
 	/**
 	 * The paid Stats product slug.
 	 *
@@ -41,21 +33,13 @@ class Initial_State {
 	 * @return array
 	 */
 	public function get_data() {
-		$connection_manager = new Connection_Manager();
-		$blog_id            = Jetpack_Options::get_option( 'id' );
-		$is_registered      = $connection_manager->is_connected();
-
-		// Get the site's domain/slug for checkout redirects.
-		$domain = $this->get_site_domain();
+		$blog_id = Jetpack_Options::get_option( 'id' );
 
 		return array(
-			'blogId'          => $blog_id,
-			'siteSuffix'      => $domain,
-			'isConnected'     => $is_registered,
-			'adminUrl'        => admin_url(),
-			'freeProductSlug' => self::FREE_PRODUCT_SLUG,
-			'paidProductSlug' => self::PAID_PRODUCT_SLUG,
-			'paidPurchaseUrl' => $this->get_paid_purchase_url( $blog_id, $domain ),
+			// The free choice needs no purchase: it goes straight to the
+			// dashboard; the `view=traffic` flag also dismisses the grid.
+			'freeStatsUrl'    => admin_url( 'admin.php?page=stats&view=traffic' ),
+			'paidPurchaseUrl' => $this->get_paid_purchase_url( $blog_id, $this->get_site_domain() ),
 			'paidPricing'     => $this->get_paid_pricing(),
 		);
 	}

projects/packages/stats-admin/src/pricing-grid/components/pricing-grid/index.jsx

@@ -12,7 +12,6 @@ import {
 	ThemeProvider,
 } from '@automattic/jetpack-components';
 import { __ } from '@wordpress/i18n';
-import useStatsCheckoutWorkflow from '../../hooks/use-stats-checkout-workflow';
 
 /* global JP_STATS_PRICING_GRID_INITIAL_STATE */
 
@@ -51,13 +50,6 @@ export default function PricingGrid() {
 			? JP_STATS_PRICING_GRID_INITIAL_STATE
 			: {};
 
-	const { run: checkoutFree, hasCheckoutStarted: freeCheckoutStarted } = useStatsCheckoutWorkflow( {
-		productSlug: state.freeProductSlug || 'jetpack_stats_free_yearly',
-		redirectUrl: 'admin.php?page=stats',
-		siteSuffix: state.siteSuffix,
-		adminUrl: state.adminUrl,
-	} );
-
 	const currency = state.paidPricing?.currency || 'USD';
 	const monthlyPrice = state.paidPricing?.yearlyCost ? state.paidPricing.yearlyCost / 12 : null;
 
@@ -81,7 +73,7 @@ export default function PricingGrid() {
 												price={ monthlyPrice }
 												currency={ currency }
 												legend={ __(
-													'per month for up to 10k monthly views, billed yearly',
+													'per month, from 10k monthly views, billed yearly',
 													'jetpack-stats-admin'
 												) }
 											/>
@@ -113,13 +105,7 @@ export default function PricingGrid() {
 								<PricingTableColumn>
 									<PricingTableHeader>
 										<ProductPrice price={ 0 } legend="" currency={ currency } hidePriceFraction />
-										<Button
-											onClick={ checkoutFree }
-											isLoading={ freeCheckoutStarted }
-											disabled={ freeCheckoutStarted }
-											variant="secondary"
-											fullWidth
-										>
+										<Button href={ state.freeStatsUrl || '#' } variant="secondary" fullWidth>
 											{ __( 'Start for free', 'jetpack-stats-admin' ) }
 										</Button>
 									</PricingTableHeader>

projects/packages/stats-admin/src/pricing-grid/hooks/use-stats-checkout-workflow.jsx

@@ -31,6 +31,7 @@ public function test_init_sets_initialized() {
 	public function tearDown(): void {
 		parent::tearDown();
 		unset( $_GET['view'] );
+		delete_option( Pricing_Grid\Eligibility::DISMISSED_OPTION );
 	}
 
 	/**
@@ -64,4 +65,22 @@ public function test_render_odyssey_for_purchase_view_on_eligible_new_site() {
 		$this->expectOutputRegex( '/<div id="wpcom" class="jp-stats-dashboard".*>/i' );
 		( new Dashboard() )->render();
 	}
+
+	/**
+	 * Test that loading the purchase view dismisses the pricing grid, so later
+	 * visits (e.g. after "I will do it later") render Odyssey instead.
+	 */
+	public function test_purchase_view_dismisses_pricing_grid() {
+		set_transient( 'jetpack_assumed_site_creation_date', '2036-01-01 00:00:00' );
+		( new Connection_Manager() )->reset_connection_status();
+		$dashboard = new Dashboard();
+
+		$_GET['view'] = 'purchase';
+		$dashboard->admin_init();
+		unset( $_GET['view'] );
+
+		$this->assertTrue( Pricing_Grid\Eligibility::is_dismissed() );
+		$this->expectOutputRegex( '/<div id="wpcom" class="jp-stats-dashboard".*>/i' );
+		$dashboard->render();
+	}
 }

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

@@ -32,6 +32,7 @@ public function tearDown(): void {
 		parent::tearDown();
 		delete_option( Current_Plan::PLAN_OPTION );
 		delete_option( Current_Plan::SITE_PRODUCTS_OPTION );
+		delete_option( Eligibility::DISMISSED_OPTION );
 		$this->reset_current_plan_cache();
 		( new Connection_Manager() )->reset_connection_status();
 	}
@@ -86,6 +87,56 @@ public function test_connected_site_created_after_launch_shows_grid() {
 		$this->assertTrue( Eligibility::should_show_pricing_grid() );
 	}
 
+	/**
+	 * A connected site whose pricing_grid_dismissed notice is hidden on wpcom
+	 * should not see the grid, even without the local option.
+	 */
+	public function test_wpcom_dismissed_notice_hides_grid_on_connected_site() {
+		set_transient( 'jetpack_assumed_site_creation_date', '2036-01-01 00:00:00' );
+		delete_transient( Notices::STATS_DASHBOARD_NOTICES_CACHE_KEY );
+		add_filter( 'pre_http_request', array( $this, 'wpcom_notices_dismissed_fixture' ), 11, 3 );
+
+		$this->assertTrue( Eligibility::is_eligible_site() );
+		$this->assertTrue( Eligibility::is_dismissed() );
+		$this->assertFalse( Eligibility::should_show_pricing_grid() );
+
+		remove_filter( 'pre_http_request', array( $this, 'wpcom_notices_dismissed_fixture' ), 11 );
+		delete_transient( Notices::STATS_DASHBOARD_NOTICES_CACHE_KEY );
+	}
+
+	/**
+	 * Fixture marking the pricing_grid_dismissed notice as hidden on wpcom.
+	 *
+	 * @param array|false $response Existing response.
+	 * @param array       $parsed_args Request args.
+	 * @param string      $url Request URL.
+	 * @return array|false
+	 */
+	public function wpcom_notices_dismissed_fixture( $response, $parsed_args, $url ) {
+		if ( strpos( $url, '/jetpack-stats-dashboard/notices' ) !== false ) {
+			return array(
+				'response' => array(
+					'code'    => 200,
+					'message' => 'ok',
+				),
+				'body'     => '{"pricing_grid_dismissed":false}',
+			);
+		}
+		return $response;
+	}
+
+	/**
+	 * A dismissed pricing grid stays hidden while the site remains eligible
+	 * (so the Stats menu keeps registering).
+	 */
+	public function test_dismissed_grid_stays_hidden_on_eligible_site() {
+		$this->disconnect_site();
+		Eligibility::dismiss();
+
+		$this->assertTrue( Eligibility::is_eligible_site() );
+		$this->assertFalse( Eligibility::should_show_pricing_grid() );
+	}
+
 	/**
 	 * A site with a Stats product should not see the pricing grid.
 	 */