From 2efb3a9f7c87dae155b71ad520ac5aa00f7490b4 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Thu, 28 Nov 2024 10:39:35 +0100
Subject: [PATCH] REST API: Support search_columns argument in the user
 endpoint (#67330)

Co-authored-by: youknowriad <youknowriad@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
Co-authored-by: ntsekouras <ntsekouras@git.wordpress.org>
Co-authored-by: mreishus <mreishus@git.wordpress.org>
Co-authored-by claudiulodro < claudiulodro@git.wordpress.org>
---
 backport-changelog/6.8/7909.md                |  3 +
 .../class-gutenberg-rest-user-controller.php  | 62 +++++++++++++++++++
 lib/load.php                                  |  1 +
 .../src/components/post-author/constants.js   |  2 +-
 .../editor/src/components/post-author/hook.js |  1 +
 5 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 backport-changelog/6.8/7909.md
 create mode 100644 lib/compat/wordpress-6.8/class-gutenberg-rest-user-controller.php

diff --git a/backport-changelog/6.8/7909.md b/backport-changelog/6.8/7909.md
new file mode 100644
index 00000000000000..32a441ef296a2d
--- /dev/null
+++ b/backport-changelog/6.8/7909.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7909
+
+* https://github.com/WordPress/gutenberg/pull/67330
diff --git a/lib/compat/wordpress-6.8/class-gutenberg-rest-user-controller.php b/lib/compat/wordpress-6.8/class-gutenberg-rest-user-controller.php
new file mode 100644
index 00000000000000..c1ecb8c86660cd
--- /dev/null
+++ b/lib/compat/wordpress-6.8/class-gutenberg-rest-user-controller.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Add search_columns parameter to users endpoint parameters
+ *
+ * @param array $query_params JSON Schema-formatted collection parameters.
+ * @return array Updated collection parameters
+ */
+function gutenberg_add_search_columns_param( $query_params ) {
+	$query_params['search_columns'] = array(
+		'default'     => array(),
+		'description' => __( 'Array of column names to be searched.' ),
+		'type'        => 'array',
+		'items'       => array(
+			'enum' => array( 'email', 'name', 'id', 'username', 'slug' ),
+			'type' => 'string',
+		),
+	);
+
+	return $query_params;
+}
+
+add_filter( 'rest_user_collection_params', 'gutenberg_add_search_columns_param', 10, 1 );
+
+/**
+ * Modify user query based on search_columns parameter
+ *
+ * @param array           $prepared_args Array of arguments for WP_User_Query.
+ * @param WP_REST_Request $request       The REST API request.
+ * @return array Modified arguments
+ */
+function gutenberg_modify_user_query_args( $prepared_args, $request ) {
+	if ( $request->get_param( 'search' ) && $request->get_param( 'search_columns' ) ) {
+		$search_columns = $request->get_param( 'search_columns' );
+
+		// Validate search columns
+		$valid_columns          = isset( $prepared_args['search_columns'] )
+			? $prepared_args['search_columns']
+			: array( 'ID', 'user_login', 'user_nicename', 'user_email', 'user_url', 'display_name' );
+		$search_columns_mapping = array(
+			'id'       => 'ID',
+			'username' => 'user_login',
+			'slug'     => 'user_nicename',
+			'email'    => 'user_email',
+			'name'     => 'display_name',
+		);
+		$search_columns         = array_map(
+			static function ( $column ) use ( $search_columns_mapping ) {
+				return $search_columns_mapping[ $column ];
+			},
+			$search_columns
+		);
+		$search_columns         = array_intersect( $search_columns, $valid_columns );
+
+		if ( ! empty( $search_columns ) ) {
+			$prepared_args['search_columns'] = $search_columns;
+		}
+	}
+
+	return $prepared_args;
+}
+add_filter( 'rest_user_query', 'gutenberg_modify_user_query_args', 10, 2 );
diff --git a/lib/load.php b/lib/load.php
index 97c5404a3a3ead..26af78f3173c53 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -99,6 +99,7 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/compat/wordpress-6.8/functions.php';
 require __DIR__ . '/compat/wordpress-6.8/post.php';
 require __DIR__ . '/compat/wordpress-6.8/site-editor.php';
+require __DIR__ . '/compat/wordpress-6.8/class-gutenberg-rest-user-controller.php';
 
 // Experimental features.
 require __DIR__ . '/experimental/block-editor-settings-mobile.php';
diff --git a/packages/editor/src/components/post-author/constants.js b/packages/editor/src/components/post-author/constants.js
index 46bc2d46d1b086..517cbd9ea1dc8d 100644
--- a/packages/editor/src/components/post-author/constants.js
+++ b/packages/editor/src/components/post-author/constants.js
@@ -5,6 +5,6 @@ export const BASE_QUERY = {
 
 export const AUTHORS_QUERY = {
 	who: 'authors',
-	per_page: 50,
+	per_page: 100,
 	...BASE_QUERY,
 };
diff --git a/packages/editor/src/components/post-author/hook.js b/packages/editor/src/components/post-author/hook.js
index 62830cf6ea60e6..f251eba79e1806 100644
--- a/packages/editor/src/components/post-author/hook.js
+++ b/packages/editor/src/components/post-author/hook.js
@@ -23,6 +23,7 @@ export function useAuthorsQuery( search ) {
 
 			if ( search ) {
 				query.search = search;
+				query.search_columns = [ 'name' ];
 			}
 
 			return {