From 5718616bf36965f57cab4f5bf380282390fb3e45 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 19 Nov 2024 09:18:53 +0100
Subject: [PATCH] Bugfix: Scoped Content Picker Search (#17481)

* add searchFrom to request args type

* add search from to picker search manager config

* pass startNode to config

* get default setting from config

* pass to server

* remove unused import
---
 .../core/picker/search/manager/picker-search.manager.ts    | 7 ++++++-
 .../src/packages/core/picker/search/manager/types.ts       | 3 +++
 .../tree/tree-picker-modal/tree-picker-modal.element.ts    | 2 +-
 .../documents/search/document-search.server.data-source.ts | 1 +
 src/Umbraco.Web.UI.Client/src/packages/search/types.ts     | 2 ++
 5 files changed, 13 insertions(+), 2 deletions(-)

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 3b09cd0927..2997327f6a 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
@@ -184,7 +184,12 @@ export class UmbPickerSearchManager<
 			return;
 		}
 
-		const { data } = await this.#searchProvider.search(query);
+		const args = {
+			searchFrom: this.#config?.searchFrom,
+			...query,
+		};
+
+		const { data } = await this.#searchProvider.search(args);
 		const items = (data?.items as ResultItemType[]) ?? [];
 		this.#resultItems.setValue(items);
 		this.#resultTotalItems.setValue(data?.total ?? 0);
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 9e4468e7fc..a8ef1e5a67 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,3 +1,6 @@
+import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
+
 export interface UmbPickerSearchManagerConfig {
 	providerAlias: string;
+	searchFrom?: UmbEntityModel;
 }
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 107dc84fbf..9f775bf189 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
@@ -55,7 +55,7 @@ export class UmbTreePickerModalElement<TreeItemType extends UmbTreeItemModelBase
 
 		if (_changedProperties.has('data')) {
 			if (this.data?.search) {
-				this.#pickerContext.search.updateConfig({ ...this.data?.search });
+				this.#pickerContext.search.updateConfig({ ...this.data?.search, searchFrom: this.data?.startNode });
 			}
 
 			const multiple = this.data?.multiple ?? false;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/search/document-search.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/search/document-search.server.data-source.ts
index f36582527f..aeb27b1822 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/search/document-search.server.data-source.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/search/document-search.server.data-source.ts
@@ -33,6 +33,7 @@ export class UmbDocumentSearchServerDataSource implements UmbSearchDataSource<Um
 			this.#host,
 			DocumentService.getItemDocumentSearch({
 				query: args.query,
+				parentId: args.searchFrom?.unique ?? undefined,
 			}),
 		);
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/search/types.ts b/src/Umbraco.Web.UI.Client/src/packages/search/types.ts
index c051328e18..857db0debb 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/search/types.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/search/types.ts
@@ -1,3 +1,4 @@
+import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
 import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 import type { UmbPagedModel, UmbRepositoryResponse } from '@umbraco-cms/backoffice/repository';
 
@@ -12,6 +13,7 @@ export type UmbSearchResultItemModel = {
 
 export type UmbSearchRequestArgs = {
 	query: string;
+	searchFrom?: UmbEntityModel;
 };
 
 export interface UmbSearchProvider<