yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix: Templating Query Builder

Browse Source
This commit is contained in:
Lone Iversen
2024-04-24 12:11:47 +02:00
committed by Jacob Overgaard
parent 14dbd25d97
commit b780c873dc
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-filter.element.ts
View File

@@ -51,6 +51,7 @@ export class UmbTemplateQueryBuilderFilterElement extends UmbLitElement {
#resetFilter() {
this.filter = <TemplateQueryExecuteFilterPresentationModel>{};
this.dispatchEvent(new Event('remove-filter'));
}
#removeOrReset() {

13
src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-modal.element.ts
View File

@@ -167,12 +167,19 @@ export default class UmbTemplateQueryBuilderModalElement extends UmbModalBaseEle
};
#updateFilters = () => {
this.#updateQueryRequest({ filters: Array.from(this._filterElements)?.map((filter) => filter.filter) ?? [] });
// Only use the filter from elements that have everything set
const ready = Array.from(this._filterElements)?.filter((element) => element.isFilterValid);
this.#updateQueryRequest({ filters: ready?.map((element) => element.filter) ?? [] });
};
#removeFilter = (event: Event) => {
const target = event.target as UmbTemplateQueryBuilderFilterElement;
this._filterContainer?.removeChild(target);
if (this._filterElements.length > 1) {
const target = event.target as UmbTemplateQueryBuilderFilterElement;
this._filterContainer?.removeChild(target);
if (this._filterElements.length === 1) {
this._filterElements[0].unremovable = true;
}
}
this.#updateFilters();
};