From 2feef9c5b71d7c47a020d472f9bae4d04dea3e7e Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Wed, 30 Apr 2025 09:58:17 +0200
Subject: [PATCH] Ensure picker search config query params are always included
 in the server request (#19194)

* ensure picker search config query params are always included

* fix type error
---
 src/Umbraco.Web.UI.Client/src/packages/core/modal/types.ts | 4 ++--
 .../core/picker/search/manager/picker-search.manager.ts    | 4 +++-
 .../src/packages/core/picker/search/manager/types.ts       | 3 ++-
 .../tree/tree-picker-modal/tree-picker-modal.element.ts    | 7 -------
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/types.ts
index 061086786c..97b3ebb81e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/types.ts
@@ -10,9 +10,9 @@ export interface UmbPickerModalData<ItemType> {
 	search?: UmbPickerModalSearchConfig;
 }
 
-export interface UmbPickerModalSearchConfig {
+export interface UmbPickerModalSearchConfig<QueryParamsType = Record<string, unknown>> {
 	providerAlias: string;
-	queryParams?: object;
+	queryParams?: QueryParamsType;
 }
 
 export interface UmbPickerModalValue {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/manager/picker-search.manager.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/manager/picker-search.manager.ts
index c2c593269d..290f596a25 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/manager/picker-search.manager.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/manager/picker-search.manager.ts
@@ -183,8 +183,10 @@ export class UmbPickerSearchManager<
 		}
 
 		const args = {
-			searchFrom: this.#config?.searchFrom,
 			...query,
+			// ensure that config params are always included
+			...this.#config?.queryParams,
+			searchFrom: this.#config?.searchFrom,
 		};
 
 		const { data } = await this.#searchProvider.search(args);
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/manager/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/manager/types.ts
index a8ef1e5a67..452fe3a538 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/manager/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/manager/types.ts
@@ -1,6 +1,7 @@
 import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
 
-export interface UmbPickerSearchManagerConfig {
+export interface UmbPickerSearchManagerConfig<QueryParamsType = Record<string, unknown>> {
 	providerAlias: string;
 	searchFrom?: UmbEntityModel;
+	queryParams?: QueryParamsType;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-picker-modal/tree-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-picker-modal/tree-picker-modal.element.ts
index 2e81abbbea..bb1fe200de 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-picker-modal/tree-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-picker-modal/tree-picker-modal.element.ts
@@ -58,13 +58,6 @@ export class UmbTreePickerModalElement<TreeItemType extends UmbTreeItemModelBase
 					...this.data.search,
 					searchFrom: this.data.startNode,
 				});
-
-				const searchQueryParams = this.data.search.queryParams;
-				if (searchQueryParams) {
-					// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-					//@ts-ignore - TODO wire up types
-					this.#pickerContext.search.setQuery(searchQueryParams);
-				}
 			}
 
 			const multiple = this.data?.multiple ?? false;