Jeckpack SSO return value for filter in User custom column (#37575)

* Return existing value in the filter for Jetpack SSO Status custom column. * Version bump and changelog Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/9255392036 Upstream-Ref: Automattic/jetpack@93a3e51
Automattic · May 27, 2024 · f5b4e38 · f5b4e38
1 parent 37fa280
commit f5b4e38
Show file tree

Hide file tree

Showing 14 changed files with 114 additions and 105 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/vendor/automattic/jetpack-connection/CHANGELOG.md b/vendor/automattic/jetpack-connection/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.8.5-alpha] - unreleased
+
+This is an alpha version! The changes listed here are not final.
+
+### Fixed
+- SSO: Send User custom column back in the filter to not interfere with other custom columns.
+
 ## [2.8.4] - 2024-05-22
 ### Deprecated
 - Jetpack Connection Manager: Deprecate `request_params` arg in setup_xmlrpc_handlers method. [#37445]
@@ -1080,6 +1087,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Separate the connection library into its own package.
 
+[2.8.5-alpha]: https://github.com/Automattic/jetpack-connection/compare/v2.8.4...v2.8.5-alpha
 [2.8.4]: https://github.com/Automattic/jetpack-connection/compare/v2.8.3...v2.8.4
 [2.8.3]: https://github.com/Automattic/jetpack-connection/compare/v2.8.2...v2.8.3
 [2.8.2]: https://github.com/Automattic/jetpack-connection/compare/v2.8.1...v2.8.2

diff --git a/vendor/automattic/jetpack-connection/src/class-package-version.php b/vendor/automattic/jetpack-connection/src/class-package-version.php
@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '2.8.4';
+	const PACKAGE_VERSION = '2.8.5-alpha';
 
 	const PACKAGE_SLUG = 'connection';
 

diff --git a/vendor/automattic/jetpack-connection/src/sso/class-user-admin.php b/vendor/automattic/jetpack-connection/src/sso/class-user-admin.php
@@ -57,7 +57,7 @@ public function __construct() {
 		add_action( 'delete_user_form', array( $this, 'render_invitations_notices_for_deleted_users' ) );
 		add_action( 'delete_user', array( $this, 'revoke_user_invite' ) );
 		add_filter( 'manage_users_columns', array( $this, 'jetpack_user_connected_th' ) );
-		add_action( 'manage_users_custom_column', array( $this, 'jetpack_show_connection_status' ), 10, 3 );
+		add_filter( 'manage_users_custom_column', array( $this, 'jetpack_show_connection_status' ), 10, 3 );
 		add_action( 'user_row_actions', array( $this, 'jetpack_user_table_row_actions' ), 10, 2 );
 		add_action( 'admin_notices', array( $this, 'handle_invitation_results' ) );
 		add_action( 'admin_post_jetpack_invite_user_to_wpcom', array( $this, 'invite_user_to_wpcom' ) );
@@ -1221,6 +1221,7 @@ public function jetpack_show_connection_status( $val, $col, $user_id ) {
 				return $connection_html;
 			}
 		}
+		return $val;
 	}
 
 	/**

diff --git a/vendor/automattic/jetpack-identity-crisis/composer.json b/vendor/automattic/jetpack-identity-crisis/composer.json
@@ -5,7 +5,7 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.0",
-		"automattic/jetpack-connection": "^2.8.4",
+		"automattic/jetpack-connection": "^2.8.5-alpha",
 		"automattic/jetpack-constants": "^2.0.2",
 		"automattic/jetpack-status": "^3.2.0",
 		"automattic/jetpack-logo": "^2.0.3",

diff --git a/vendor/automattic/jetpack-jitm/composer.json b/vendor/automattic/jetpack-jitm/composer.json
@@ -7,7 +7,7 @@
 		"php": ">=7.0",
 		"automattic/jetpack-a8c-mc-stats": "^2.0.1",
 		"automattic/jetpack-assets": "^2.1.11",
-		"automattic/jetpack-connection": "^2.8.4",
+		"automattic/jetpack-connection": "^2.8.5-alpha",
 		"automattic/jetpack-device-detection": "^2.1.3",
 		"automattic/jetpack-logo": "^2.0.3",
 		"automattic/jetpack-redirect": "^2.0.2",

diff --git a/vendor/automattic/jetpack-mu-wpcom/composer.json b/vendor/automattic/jetpack-mu-wpcom/composer.json
@@ -9,7 +9,7 @@
 		"automattic/jetpack-blocks": "^2.0.4",
 		"automattic/jetpack-calypsoify": "^0.1.0-alpha",
 		"automattic/jetpack-classic-theme-helper": "^0.2.0-alpha",
-		"automattic/jetpack-connection": "^2.8.4",
+		"automattic/jetpack-connection": "^2.8.5-alpha",
 		"automattic/jetpack-redirect": "^2.0.2",
 		"automattic/jetpack-stats-admin": "^0.19.2",
 		"automattic/jetpack-status": "^3.2.0",

diff --git a/vendor/automattic/jetpack-plans/composer.json b/vendor/automattic/jetpack-plans/composer.json
@@ -5,7 +5,7 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.0",
-		"automattic/jetpack-connection": "^2.8.4"
+		"automattic/jetpack-connection": "^2.8.5-alpha"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "1.1.0",

diff --git a/vendor/automattic/jetpack-stats-admin/composer.json b/vendor/automattic/jetpack-stats-admin/composer.json
@@ -5,7 +5,7 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.0",
-		"automattic/jetpack-connection": "^2.8.4",
+		"automattic/jetpack-connection": "^2.8.5-alpha",
 		"automattic/jetpack-constants": "^2.0.2",
 		"automattic/jetpack-plans": "^0.4.7",
 		"automattic/jetpack-stats": "^0.12.5",

diff --git a/vendor/automattic/jetpack-stats/composer.json b/vendor/automattic/jetpack-stats/composer.json
@@ -5,7 +5,7 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.0",
-		"automattic/jetpack-connection": "^2.8.4",
+		"automattic/jetpack-connection": "^2.8.5-alpha",
 		"automattic/jetpack-constants": "^2.0.2",
 		"automattic/jetpack-status": "^3.2.0"
 	},

diff --git a/vendor/automattic/jetpack-sync/composer.json b/vendor/automattic/jetpack-sync/composer.json
@@ -5,7 +5,7 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.0",
-		"automattic/jetpack-connection": "^2.8.4",
+		"automattic/jetpack-connection": "^2.8.5-alpha",
 		"automattic/jetpack-constants": "^2.0.2",
 		"automattic/jetpack-identity-crisis": "^0.20.0",
 		"automattic/jetpack-password-checker": "^0.3.1",

diff --git a/vendor/automattic/scheduled-updates/composer.json b/vendor/automattic/scheduled-updates/composer.json
@@ -9,7 +9,7 @@
 		"automattic/jetpack-sync": "^3.0.0-alpha",
 		"automattic/jetpack-plans": "^0.4.7",
 		"automattic/jetpack-constants": "^2.0.2",
-		"automattic/jetpack-connection": "^2.8.4"
+		"automattic/jetpack-connection": "^2.8.5-alpha"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "1.1.0",