Connection: adapt js component for custom errors (#44281)

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/16465998684

Upstream-Ref: Automattic/jetpack@8c12546

Author: bindlegirl

CHANGELOG.md

@@ -24,6 +24,7 @@ This is an alpha version! The changes listed here are not final.
 
 ### Fixed
 - Bump wc-calypso-bridge package 2.11.0
+- Fixed tests.
 - JITM: Fix ineffective caching due to expired plugin sync transient
 - Playground Importer: Fix query error generated by SQLite table with no entries in the data types cache table.
 - Private site: ensure private sites return a valid cookie expiration value

connection/class-protected-owner-error-handler.php

@@ -204,7 +204,6 @@ private function build_enhanced_error_data( $raw_error ) {
 			),
 		);
 
-		// @phan-suppress-next-line PhanUndeclaredMethod -- Method exists in newer connection package versions
 		return $error_handler->build_action_error_data( $args );
 	}
 

jetpack_vendor/automattic/jetpack-connection/dist/jetpack-connection.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('jetpack-script-data', 'react', 'react-jsx-runtime', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '38952d9d604b8b86a198');
+<?php return array('dependencies' => array('jetpack-script-data', 'react', 'react-jsx-runtime', 'wp-components', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '8414cb09f6268b7f83a3');

jetpack_vendor/automattic/jetpack-connection/dist/jetpack-connection.css

@@ -331,23 +331,42 @@ public function jetpack_react_dashboard_error( $errors ) { // phpcs:ignore Varia
 		}
 
 		$first_user_errors = $displayable_errors[ $first_error_code ];
-		$first_error       = reset( $first_user_errors );
+		if ( ! is_array( $first_user_errors ) || empty( $first_user_errors ) ) {
+			return array(); // Invalid error structure
+		}
+
+		$first_error = reset( $first_user_errors );
+
+		// Validate error structure
+		if ( ! is_array( $first_error ) || ! isset( $first_error['error_message'] ) ) {
+			return array(); // Invalid error structure
+		}
 
 		// Determine the action - use the one from error_data if available, otherwise default to 'reconnect'
 		$action = 'reconnect'; // Default action for connection errors
-		if ( isset( $first_error['error_data']['action'] ) ) {
+		if ( isset( $first_error['error_data']['action'] ) && is_string( $first_error['error_data']['action'] ) ) {
 			$action = $first_error['error_data']['action'];
 		}
 
+		// Safely merge error data, ensuring we don't overwrite critical fields
+		$error_data = isset( $first_error['error_data'] ) && is_array( $first_error['error_data'] ) ? $first_error['error_data'] : array();
+
+		// Build the data array with safe merging
+		$dashboard_data = array( 'api_error_code' => $first_error_code );
+
+		// Add error_data fields, but be careful not to overwrite api_error_code
+		foreach ( $error_data as $key => $value ) {
+			if ( 'api_error_code' !== $key ) {
+				$dashboard_data[ $key ] = $value;
+			}
+		}
+
 		$dashboard_error = array(
 			array(
 				'code'    => 'connection_error',
 				'message' => $first_error['error_message'],
 				'action'  => $action,
-				'data'    => array_merge(
-					array( 'api_error_code' => $first_error_code ),
-					$first_error['error_data'] ?? array()
-				),
+				'data'    => $dashboard_data,
 			),
 		);
 
@@ -465,13 +484,66 @@ public function store_error( \WP_Error $error ) {
 		return false;
 	}
 
+	/**
+	 * Builds action error data for generic JavaScript components.
+	 *
+	 * This helper method creates standardized error_data arrays that work with the generic
+	 * JavaScript error handling components. External plugins (like wpcomsh) can use this
+	 * to ensure their error structures are compatible.
+	 *
+	 * @since 6.16.0-alpha
+	 *
+	 * @param array $args Action configuration arguments - only non-empty values will be included.
+	 * @return array Standardized error_data array for JavaScript components.
+	 */
+	public function build_action_error_data( array $args = array() ) {
+		// Set default values for variants
+		$args = wp_parse_args(
+			$args,
+			array(
+				'action_variant'           => 'primary',
+				'secondary_action_variant' => 'secondary',
+			)
+		);
+
+		// Start with core data
+		$error_data = array(
+			'blog_id' => \Jetpack_Options::get_option( 'id' ),
+		);
+
+		// Validate variant values
+		$valid_variants = array( 'primary', 'secondary' );
+		if ( ! in_array( $args['action_variant'], $valid_variants, true ) ) {
+			$args['action_variant'] = 'primary';
+		}
+		if ( ! in_array( $args['secondary_action_variant'], $valid_variants, true ) ) {
+			$args['secondary_action_variant'] = 'secondary';
+		}
+
+		// Merge extra_data first, then regular args (so args take precedence)
+		if ( ! empty( $args['extra_data'] ) && is_array( $args['extra_data'] ) ) {
+			$error_data = array_merge( $error_data, $args['extra_data'] );
+			unset( $args['extra_data'] ); // Remove from args to avoid duplication
+		}
+
+		// Filter out empty values and merge with error_data
+		$filtered_args = array_filter(
+			$args,
+			function ( $value ) {
+				return ! empty( $value );
+			}
+		);
+
+		return array_merge( $error_data, $filtered_args );
+	}
+
 	/**
 	 * Builds a standardized error array for the connection error system.
 	 *
 	 * This method creates a consistent error array structure that can be used
 	 * by both internal error handling and external plugins/customizations.
 	 *
-	 * @since 6.13.10
+	 * @since 1.14.2
 	 *
 	 * @param string $error_code    The error code identifier.
 	 * @param string $error_message The human-readable error message.

jetpack_vendor/automattic/jetpack-connection/dist/jetpack-connection.js

@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '6.15.0';
+	const PACKAGE_VERSION = '6.16.0-alpha';
 
 	const PACKAGE_SLUG = 'connection';
 

jetpack_vendor/automattic/jetpack-connection/dist/jetpack-connection.rtl.css

@@ -34,7 +34,7 @@
     ),
     'jetpack-connection' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-connection',
-      'ver' => '6.15.0',
+      'ver' => '6.16.0-alpha1753260548',
     ),
     'jetpack-google-analytics' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-google-analytics',