Add NOT + cleanup

Author: AB-xdev

vaadin-grid-filter-demo/src/main/java/software/xdev/vaadin/ui/DemoView.java

@@ -3,7 +3,6 @@
 import java.time.LocalDate;
 
 import com.vaadin.flow.component.AttachEvent;
-import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.grid.Grid;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.router.AfterNavigationEvent;
@@ -25,21 +24,14 @@ public class DemoView extends VerticalLayout implements AfterNavigationObserver
 	public DemoView()
 	{
 		final GridFilter<Person> filter = GridFilter.createDefault(this.grid)
-			.withSearchableField("id", Person::id, Integer.class)
-			.withSearchableField("firstName", Person::firstName, String.class)
-			.withSearchableField("birthday", Person::birthday, LocalDate.class)
-			.withSearchableField("married", Person::married, Boolean.class)
-			.withSearchableField("department", Person::department, Department.class);
-		this.add(filter);
+			.withFilterableField("id", Person::id, Integer.class)
+			.withFilterableField("firstName", Person::firstName, String.class)
+			.withFilterableField("birthday", Person::birthday, LocalDate.class)
+			.withFilterableField("married", Person::married, Boolean.class)
+			.withFilterableField("department", Person::department, Department.class);
+		this.add(filter, this.grid);
 
 		this.queryParameterAdapter = new GridFilterQueryParameterAdapter(filter, "filter");
-		
-		this.add(new Button("Serialize", ev -> System.out.println(filter.serialize())));
-		this.add(new Button(
-			"Fill in",
-			ev -> filter.deserializeAndApply(
-				"_OR(id = 1,_AND(birthday = 2024-09-26,firstName contains %2C%29%28%3D+)),id = 1")));
-		this.add(this.grid);
 	}
 
 	@Override

vaadin-grid-filter/src/main/java/software/xdev/vaadin/gridfilter/AddFilterComponentsButtons.java

@@ -19,6 +19,7 @@
 import java.util.function.Consumer;
 
 import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.icon.VaadinIcon;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 
@@ -33,7 +34,12 @@ public void update(
 	{
 		this.removeAll();
 		filterComponentSuppliers.stream()
-			.map(s -> new Button(s.display(), VaadinIcon.PLUS.create(), ev -> onAddButtonClicked.accept(s)))
+			.map(s -> {
+				final Button btn =
+					new Button(s.display(), VaadinIcon.PLUS.create(), ev -> onAddButtonClicked.accept(s));
+				btn.addThemeVariants(ButtonVariant.LUMO_SMALL);
+				return btn;
+			})
 			.forEach(this::add);
 	}
 }

vaadin-grid-filter/src/main/java/software/xdev/vaadin/gridfilter/GridFilter.java

@@ -66,6 +66,7 @@
 import software.xdev.vaadin.gridfilter.filtercomponents.FilterComponentSerialization;
 import software.xdev.vaadin.gridfilter.filtercomponents.FilterComponentSupplier;
 import software.xdev.vaadin.gridfilter.filtercomponents.block.FilterANDComponentSupplier;
+import software.xdev.vaadin.gridfilter.filtercomponents.block.FilterNOTComponentSupplier;
 import software.xdev.vaadin.gridfilter.filtercomponents.block.FilterORComponentSupplier;
 import software.xdev.vaadin.gridfilter.filtercomponents.condition.FieldFilterConditionComponentSupplier;
 
@@ -292,7 +293,7 @@ public GridFilter<T> clearFilterComponentSuppliers()
 		return this;
 	}
 
-	public <S> GridFilter<T> withSearchableField(
+	public <S> GridFilter<T> withFilterableField(
 		final String name,
 		final Function<T, S> keyExtractor,
 		final Class<S> clazz)
@@ -319,7 +320,7 @@ public static <T> GridFilter<T> createDefault(final Grid<T> grid)
 				new SingleValueNotRequiredComponentProvider<>(
 					Boolean.class,
 					Checkbox::new,
-					b -> b ? "1" : "0",
+					b -> Boolean.TRUE.equals(b) ? "1" : "0",
 					"1"::equals),
 				new SingleValueComponentProvider<>(
 					String.class,
@@ -354,6 +355,7 @@ public static <T> GridFilter<T> createDefault(final Grid<T> grid)
 			.addFilterComponentSuppliers(List.of(
 				new FieldFilterConditionComponentSupplier(),
 				new FilterORComponentSupplier(),
-				new FilterANDComponentSupplier()));
+				new FilterANDComponentSupplier(),
+				new FilterNOTComponentSupplier()));
 	}
 }

vaadin-grid-filter/src/main/java/software/xdev/vaadin/gridfilter/filtercomponents/block/FilterBlockComponent.java

@@ -79,7 +79,7 @@ public FilterBlockComponent(
 		this.serializationPrefixSupplier = serializationPrefixSupplier;
 
 		final Span spBlockIdentifier = new Span(identifierName);
-		spBlockIdentifier.setMinWidth("2.4em");
+		spBlockIdentifier.setMinWidth("2.5em");
 		spBlockIdentifier.getStyle().set("overflow-wrap", "anywhere");
 
 		this.filterContainerComponent = new FilterContainerComponent<>(onValueUpdated, true);
@@ -99,6 +99,7 @@ public FilterBlockComponent(
 		this.getStyle().set("padding-right", "var(--lumo-space-xs)");
 	}
 
+	@SuppressWarnings("java:S1452")
 	protected FilterComponent<T, ?> addFilterComponent(final FilterComponentSupplier supplier)
 	{
 		final FilterComponent<T, ?> filterConditionComponent = supplier.create(

vaadin-grid-filter/src/main/java/software/xdev/vaadin/gridfilter/filtercomponents/block/FilterNOTComponentSupplier.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2024 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.vaadin.gridfilter.filtercomponents.block;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+
+import software.xdev.vaadin.gridfilter.FilterableField;
+import software.xdev.vaadin.gridfilter.business.operation.Operation;
+import software.xdev.vaadin.gridfilter.business.typevaluecomp.TypeValueComponentProvider;
+import software.xdev.vaadin.gridfilter.business.value.ValueContainer;
+import software.xdev.vaadin.gridfilter.business.value.reuse.ValueReUseAdapter;
+import software.xdev.vaadin.gridfilter.filtercomponents.FilterComponent;
+import software.xdev.vaadin.gridfilter.filtercomponents.FilterComponentSupplier;
+
+
+public class FilterNOTComponentSupplier implements FilterComponentSupplier
+{
+	@Override
+	public String display()
+	{
+		return "NOT block";
+	}
+	
+	@Override
+	public String serializationPrefix()
+	{
+		return "_NOT";
+	}
+	
+	@Override
+	public <T> FilterComponent<T, ?> create(
+		final List<FilterableField<T, ?>> filterableFields,
+		final Function<FilterableField<T, ?>, Map<Operation<?>, TypeValueComponentProvider<?>>> fieldDataResolver,
+		final Map<Class<? extends ValueContainer>, Set<ValueReUseAdapter<?>>> valueReUseAdapters,
+		final List<FilterComponentSupplier> filterComponentSuppliers,
+		final Runnable onValueUpdated)
+	{
+		return new FilterBlockComponent<>(
+			filterableFields,
+			fieldDataResolver,
+			valueReUseAdapters,
+			filterComponentSuppliers,
+			onValueUpdated,
+			(stream, predicate) -> !stream.allMatch(predicate),
+			"NOT",
+			this::serializationPrefix);
+	}
+}