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
This commit is contained in:
@@ -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 {
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user