Bugfix: Templating Query Builder

Author: loivsen

src/packages/templating/templates/modals/query-builder/query-builder-filter.element.ts

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

src/packages/templating/templates/modals/query-builder/query-builder-modal.element.ts

@@ -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();
 	};