Update/my jetpack status handling

projects/packages/my-jetpack/_inc/components/product-card/action-button.jsx

@@ -12,11 +12,13 @@ export const PRODUCT_STATUSES = {
 	ACTIVE: 'active',
 	INACTIVE: 'inactive',
 	MODULE_DISABLED: 'module_disabled',
-	ERROR: 'error',
+	SITE_CONNECTION_ERROR: 'site_connection_error',
 	ABSENT: 'plugin_absent',
 	ABSENT_WITH_PLAN: 'plugin_absent_with_plan',
 	NEEDS_PURCHASE: 'needs_purchase',
 	NEEDS_PURCHASE_OR_FREE: 'needs_purchase_or_free',
+	NEEDS_FIRST_SITE_CONNECTION: 'needs_first_site_connection',
+	USER_CONNECTION_ERROR: 'user_connection_error',
 	CAN_UPGRADE: 'can_upgrade',
 };
 
@@ -90,6 +92,20 @@ const ActionButton = ( {
 						primaryActionOverride[ PRODUCT_STATUSES.ABSENT_WITH_PLAN ] ),
 				};
 			}
+			// The site or user have never been connected before and the connection is required
+			case PRODUCT_STATUSES.NEEDS_FIRST_SITE_CONNECTION:
+				return {
+					...buttonState,
+					href: purchaseUrl || `#/add-${ slug }`,
+					size: 'small',
+					variant: 'primary',
+					weight: 'regular',
+					label: __( 'Learn more', 'jetpack-my-jetpack' ),
+					onClick: onAdd,
+					...( primaryActionOverride &&
+						PRODUCT_STATUSES.NEEDS_FIRST_SITE_CONNECTION in primaryActionOverride &&
+						primaryActionOverride[ PRODUCT_STATUSES.NEEDS_FIRST_SITE_CONNECTION ] ),
+				};
 			case PRODUCT_STATUSES.NEEDS_PURCHASE: {
 				return {
 					...buttonState,
@@ -152,7 +168,7 @@ const ActionButton = ( {
 						primaryActionOverride[ PRODUCT_STATUSES.ACTIVE ] ),
 				};
 			}
-			case PRODUCT_STATUSES.ERROR:
+			case PRODUCT_STATUSES.SITE_CONNECTION_ERROR:
 				return {
 					...buttonState,
 					href: '#/connection',
@@ -165,6 +181,18 @@ const ActionButton = ( {
 						PRODUCT_STATUSES.ERROR in primaryActionOverride &&
 						primaryActionOverride[ PRODUCT_STATUSES.ERROR ] ),
 				};
+			case PRODUCT_STATUSES.USER_CONNECTION_ERROR:
+				return {
+					href: '#/connection',
+					size: 'small',
+					variant: 'primary',
+					weight: 'regular',
+					label: __( 'Sign In', 'jetpack-my-jetpack' ),
+					onClick: onFixConnection,
+					...( primaryActionOverride &&
+						PRODUCT_STATUSES.USER_CONNECTION_ERROR in primaryActionOverride &&
+						primaryActionOverride[ PRODUCT_STATUSES.USER_CONNECTION_ERROR ] ),
+				};
 			case PRODUCT_STATUSES.INACTIVE:
 			case PRODUCT_STATUSES.MODULE_DISABLED:
 				return {

projects/packages/my-jetpack/_inc/components/product-card/index.jsx

@@ -12,12 +12,14 @@ import styles from './style.module.scss';
 export const PRODUCT_STATUSES_LABELS = {
 	[ PRODUCT_STATUSES.ACTIVE ]: __( 'Active', 'jetpack-my-jetpack' ),
 	[ PRODUCT_STATUSES.INACTIVE ]: __( 'Inactive', 'jetpack-my-jetpack' ),
-	[ PRODUCT_STATUSES.MODULE_DISABLED ]: __( 'Module disabled', 'jetpack-my-jetpack' ),
+	[ PRODUCT_STATUSES.MODULE_DISABLED ]: __( 'Inactive', 'jetpack-my-jetpack' ),
 	[ PRODUCT_STATUSES.NEEDS_PURCHASE ]: __( 'Inactive', 'jetpack-my-jetpack' ),
 	[ PRODUCT_STATUSES.NEEDS_PURCHASE_OR_FREE ]: __( 'Inactive', 'jetpack-my-jetpack' ),
 	[ PRODUCT_STATUSES.ABSENT ]: __( 'Inactive', 'jetpack-my-jetpack' ),
 	[ PRODUCT_STATUSES.ABSENT_WITH_PLAN ]: __( 'Needs Plugin', 'jetpack-my-jetpack' ),
-	[ PRODUCT_STATUSES.ERROR ]: __( 'Needs connection', 'jetpack-my-jetpack' ),
+	[ PRODUCT_STATUSES.NEEDS_FIRST_SITE_CONNECTION ]: __( 'Inactive', 'jetpack-my-jetpack' ),
+	[ PRODUCT_STATUSES.USER_CONNECTION_ERROR ]: __( 'Needs sign-in', 'jetpack-my-jetpack' ),
+	[ PRODUCT_STATUSES.SITE_CONNECTION_ERROR ]: __( 'Needs connection', 'jetpack-my-jetpack' ),
 	[ PRODUCT_STATUSES.CAN_UPGRADE ]: __( 'Active', 'jetpack-my-jetpack' ),
 };
 
@@ -252,11 +254,13 @@ ProductCard.propTypes = {
 	status: PropTypes.oneOf( [
 		PRODUCT_STATUSES.ACTIVE,
 		PRODUCT_STATUSES.INACTIVE,
-		PRODUCT_STATUSES.ERROR,
+		PRODUCT_STATUSES.SITE_CONNECTION_ERROR,
 		PRODUCT_STATUSES.ABSENT,
 		PRODUCT_STATUSES.ABSENT_WITH_PLAN,
 		PRODUCT_STATUSES.NEEDS_PURCHASE,
 		PRODUCT_STATUSES.NEEDS_PURCHASE_OR_FREE,
+		PRODUCT_STATUSES.NEEDS_FIRST_SITE_CONNECTION,
+		PRODUCT_STATUSES.USER_CONNECTION_ERROR,
 		PRODUCT_STATUSES.CAN_UPGRADE,
 		PRODUCT_STATUSES.MODULE_DISABLED,
 	] ).isRequired,

projects/packages/my-jetpack/_inc/components/product-card/status.jsx

@@ -10,12 +10,13 @@ const getStatusClassName = status => {
 		case PRODUCT_STATUSES.CAN_UPGRADE:
 			return styles.active;
 		case PRODUCT_STATUSES.ABSENT_WITH_PLAN:
+		case PRODUCT_STATUSES.SITE_CONNECTION_ERROR:
+		case PRODUCT_STATUSES.USER_CONNECTION_ERROR:
 			return styles.warning;
 		case PRODUCT_STATUSES.INACTIVE:
 		case PRODUCT_STATUSES.NEEDS_PURCHASE:
 		case PRODUCT_STATUSES.NEEDS_PURCHASE_OR_FREE:
-			return styles.inactive;
-		case PRODUCT_STATUSES.ERROR:
+		case PRODUCT_STATUSES.NEEDS_FIRST_SITE_CONNECTION:
 			return styles.inactive;
 		default:
 			return styles.inactive;

projects/packages/my-jetpack/changelog/update-my-jetpack-status-handling

@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Improving the active/ inactive statuses on My Jetpack

projects/packages/my-jetpack/composer.json

@@ -79,7 +79,7 @@
 			"link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}"
 		},
 		"branch-alias": {
-			"dev-trunk": "4.23.x-dev"
+			"dev-trunk": "4.24.x-dev"
 		},
 		"version-constants": {
 			"::PACKAGE_VERSION": "src/class-initializer.php"

projects/packages/my-jetpack/global.d.ts

@@ -79,8 +79,6 @@ interface Window {
 					features: string[];
 					has_paid_plan_for_product: boolean;
 					features_by_tier: Array< string >;
-					has_required_plan: boolean;
-					has_required_tier: Array< string >;
 					is_bundle: boolean;
 					is_plugin_active: boolean;
 					is_upgradable_by_bundle: string[];

projects/packages/my-jetpack/package.json

@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-my-jetpack",
-	"version": "4.23.3-alpha",
+	"version": "4.24.0-alpha",
 	"description": "WP Admin page with information and configuration shared among all Jetpack stand-alone plugins",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/my-jetpack/#readme",
 	"bugs": {

projects/packages/my-jetpack/src/class-initializer.php

@@ -37,7 +37,7 @@ class Initializer {
 	 *
 	 * @var string
 	 */
-	const PACKAGE_VERSION = '4.23.3-alpha';
+	const PACKAGE_VERSION = '4.24.0-alpha';
 
 	/**
 	 * HTML container ID for the IDC screen on My Jetpack page.

projects/packages/my-jetpack/src/class-products.php

@@ -156,7 +156,7 @@ public static function get_product_data_schema() {
 				'status'      => array(
 					'title' => 'The product status',
 					'type'  => 'string',
-					'enum'  => array( 'active', 'inactive', 'plugin_absent', 'needs_purchase', 'needs_purchase_or_free', 'error' ),
+					'enum'  => array( 'active', 'inactive', 'plugin_absent', 'needs_purchase', 'needs_purchase_or_free', 'needs_first_site_connection', 'user_connection_error', 'site_connection_error' ),
 				),
 				'class'       => array(
 					'title' => 'The product class handler',

projects/packages/my-jetpack/src/products/class-anti-spam.php

@@ -101,10 +101,11 @@ public static function get_features() {
 
 	/**
 	 * Determine if the site has an Akismet plan by checking for an API key
+	 * Note that some Akismet Plans are free - we're just checking for an API key and don't have the perspective of the plan attached to it here
 	 *
 	 * @return bool - whether an API key was found
 	 */
-	public static function has_required_plan() {
+	public static function has_paid_plan_for_product() {
 		// Check if the site has an API key for Akismet
 		$akismet_api_key = apply_filters( 'akismet_get_api_key', defined( 'WPCOM_API_KEY' ) ? constant( 'WPCOM_API_KEY' ) : get_option( 'wordpress_api_key' ) );
 		$fallback        = ! empty( $akismet_api_key );

projects/packages/my-jetpack/src/products/class-backup.php

@@ -58,6 +58,13 @@ class Backup extends Hybrid_Product {
 	 */
 	public static $has_free_offering = false;
 
+	/**
+	 * Whether this product requires a plan to work at all
+	 *
+	 * @var bool
+	 */
+	public static $requires_plan = true;
+
 	/**
 	 * Get the product name
 	 *
@@ -190,7 +197,7 @@ private static function get_state_from_wpcom() {
 	 *
 	 * @return boolean
 	 */
-	public static function has_required_plan() {
+	public static function has_paid_plan_for_product() {
 		$rewind_data = static::get_state_from_wpcom();
 		if ( is_wp_error( $rewind_data ) ) {
 			return false;
@@ -231,13 +238,4 @@ public static function get_manage_url() {
 			return Redirect::get_url( 'my-jetpack-manage-backup' );
 		}
 	}
-
-	/**
-	 * Checks whether the Product is active
-	 *
-	 * @return boolean
-	 */
-	public static function is_active() {
-		return parent::is_active() && static::has_required_plan();
-	}
 }

projects/packages/my-jetpack/src/products/class-creator.php

@@ -323,7 +323,7 @@ public static function get_wpcom_monthly_product_slug() {
 	 *
 	 * @return boolean
 	 */
-	public static function has_required_plan() {
+	public static function has_paid_plan_for_product() {
 		$purchases_data = Wpcom_Products::get_site_current_purchases();
 		if ( is_wp_error( $purchases_data ) ) {
 			return false;
@@ -345,7 +345,6 @@ public static function has_required_plan() {
 	 * @return boolean
 	 */
 	public static function is_upgradable() {
-		$has_required_plan = self::has_required_plan();
-		return ! $has_required_plan;
+		return ! self::has_paid_plan_for_product();
 	}
 }

projects/packages/my-jetpack/src/products/class-hybrid-product.php

@@ -125,9 +125,13 @@ public static function do_product_specific_activation( $product_activation ) {
 			}
 		}
 
-		// Only activate the module if the plan supports it
-		// We don't want to throw an error for a missing plan here since we try activation before purchase
-		if ( static::has_required_plan() && static::$module_name ) {
+		if ( ! empty( static::$module_name ) ) {
+			// Only activate the module if the plan supports it
+			// We don't want to throw an error for a missing plan here since we try activation before purchase
+			if ( static::$requires_plan && ! static::has_any_plan_for_product() ) {
+				return true;
+			}
+
 			$module_activation = ( new Modules() )->activate( static::$module_name, false, false );
 
 			if ( ! $module_activation ) {
@@ -156,7 +160,7 @@ public static function install_and_activate_standalone() {
 		 * Activate the module as well, if the user has a plan
 		 * or the product does not require a plan to work
 		 */
-		if ( static::has_required_plan() && static::$module_name ) {
+		if ( static::has_any_plan_for_product() && isset( static::$module_name ) ) {
 			$module_activation = ( new Modules() )->activate( static::$module_name, false, false );
 
 			if ( ! $module_activation ) {

projects/packages/my-jetpack/src/products/class-jetpack-ai.php

@@ -106,7 +106,7 @@ public static function get_tiers() {
 	 */
 	public static function get_features_by_tier() {
 		$current_tier        = self::get_current_usage_tier();
-		$current_description = $current_tier === 0
+		$current_description = 0 === $current_tier
 			? __( 'Up to 20 requests', 'jetpack-my-jetpack' )
 			/* translators: number of requests */
 			: sprintf( __( 'Up to %d requests per month', 'jetpack-my-jetpack' ), $current_tier );
@@ -179,7 +179,7 @@ public static function get_current_usage_tier() {
 
 		// Bail early if it's not possible to fetch the feature data.
 		if ( is_wp_error( $info ) ) {
-			return null;
+			return 0;
 		}
 
 		$current_tier = isset( $info['current-tier']['value'] ) ? $info['current-tier']['value'] : null;
@@ -193,7 +193,7 @@ public static function get_current_usage_tier() {
 	 * @return int
 	 */
 	public static function get_next_usage_tier() {
-		if ( ! self::is_site_connected() || ! self::has_required_plan() ) {
+		if ( ! self::is_site_connected() || ! self::has_paid_plan_for_product() ) {
 			return 100;
 		}
 
@@ -419,12 +419,23 @@ public static function get_wpcom_bi_yearly_product_slug() {
 	}
 
 	/**
-	 * Checks whether the current plan (or purchases) of the site already supports the product
+	 * Checks whether the site has a paid plan for this product
 	 *
 	 * @return boolean
 	 */
-	public static function has_required_plan() {
-		return static::does_site_have_feature( 'ai-assistant' );
+	public static function has_paid_plan_for_product() {
+		$purchases_data = Wpcom_Products::get_site_current_purchases();
+		if ( is_wp_error( $purchases_data ) ) {
+			return false;
+		}
+		if ( is_array( $purchases_data ) && ! empty( $purchases_data ) ) {
+			foreach ( $purchases_data as $purchase ) {
+				if ( str_contains( $purchase->product_slug, 'jetpack_ai' ) ) {
+					return true;
+				}
+			}
+		}
+		return false;
 	}
 
 	/**
@@ -433,11 +444,11 @@ public static function has_required_plan() {
 	 * @return boolean
 	 */
 	public static function is_upgradable() {
-		$has_required_plan = self::has_required_plan();
-		$current_tier      = self::get_current_usage_tier();
+		$has_ai_feature = static::does_site_have_feature( 'ai-assistant' );
+		$current_tier   = self::get_current_usage_tier();
 
 		// Mark as not upgradable if user is on unlimited tier or does not have any plan.
-		if ( ! $has_required_plan || null === $current_tier || 1 === $current_tier ) {
+		if ( ! $has_ai_feature || null === $current_tier || 1 === $current_tier ) {
 			return false;
 		}