fix #1093 TreeGridPlugin: Uncaught TypeError: Cannot read properties of undefined

Author: vegegoku

domino-ui/src/main/java/org/dominokit/domino/ui/data/FilterMode.java

@@ -19,51 +19,158 @@
 import java.util.Collection;
 import java.util.List;
 
+/**
+ * Strategy interface for filtering collections using one or more {@link DataFilter} instances.
+ *
+ * <p>Implementations provided here are:
+ *
+ * <ul>
+ *   <li>{@link #denial()} — keep items that pass <em>all</em> filters (logical AND).
+ *   <li>{@link #acceptance()} — keep items that pass <em>any</em> filter (logical OR).
+ *   <li>{@link #acceptAll()} — ignore filters and keep all items.
+ *   <li>{@link #denyAll()} — ignore filters and keep no items.
+ * </ul>
+ *
+ * <p><strong>Null-handling:</strong> For convenience and safety, all built-in modes treat {@code
+ * data == null} as empty and {@code filters == null} or empty as "no filters", which accepts all
+ * items (except for {@link #denyAll()}).
+ *
+ * <p><em>Note:</em> This interface uses private static helper methods (requires Java 9+).
+ *
+ * @param <T> the element type
+ */
+@FunctionalInterface
 public interface FilterMode<T> {
 
+  /**
+   * Applies this filter mode to the provided data using the provided filters.
+   *
+   * @param data the input elements; may be {@code null} (treated as empty)
+   * @param filters the filters to evaluate; may be {@code null} or empty
+   * @return a new {@link List} containing the elements that satisfy this mode
+   * @implNote Implementations should avoid mutating the input collections and should generally
+   *     preserve input iteration order.
+   */
   List<T> apply(Collection<T> data, Collection<? extends DataFilter<? super T>> filters);
 
+  /**
+   * A mode that keeps only items which pass <em>all</em> filters (logical AND).
+   *
+   * <p>Behavior:
+   *
+   * <ul>
+   *   <li>If {@code data} is {@code null} or empty → returns an empty list.
+   *   <li>If {@code filters} is {@code null} or empty → returns a copy of {@code data}.
+   *   <li>Otherwise → includes an item only if every filter returns {@code true} for it.
+   * </ul>
+   *
+   * @param <T> the element type
+   * @return a {@link FilterMode} implementing AND semantics
+   */
   static <T> FilterMode<T> denial() {
     return (data, filters) -> {
       if (data == null || data.isEmpty()) return new ArrayList<>();
       if (filters == null || filters.isEmpty()) return new ArrayList<>(data);
+
       List<T> out = new ArrayList<>(data.size());
-      outer:
       for (T item : data) {
-        for (DataFilter<? super T> f : filters) {
-          if (!f.filter(item)) continue outer;
+        if (passesAll(item, filters)) {
+          out.add(item);
         }
-        out.add(item);
       }
       return out;
     };
   }
 
+  /**
+   * A mode that keeps items which pass <em>any</em> filter (logical OR).
+   *
+   * <p>Behavior:
+   *
+   * <ul>
+   *   <li>If {@code data} is {@code null} or empty → returns an empty list.
+   *   <li>If {@code filters} is {@code null} or empty → returns a copy of {@code data}.
+   *   <li>Otherwise → includes an item if at least one filter returns {@code true} for it.
+   * </ul>
+   *
+   * @param <T> the element type
+   * @return a {@link FilterMode} implementing OR semantics
+   */
   static <T> FilterMode<T> acceptance() {
     return (data, filters) -> {
       if (data == null || data.isEmpty()) return new ArrayList<>();
       if (filters == null || filters.isEmpty()) return new ArrayList<>(data);
+
       List<T> out = new ArrayList<>();
-      outer:
       for (T item : data) {
-        for (DataFilter<? super T> f : filters) {
-          if (f.filter(item)) {
-            out.add(item);
-            continue outer;
-          }
+        if (passesAny(item, filters)) {
+          out.add(item);
         }
       }
       return out;
     };
   }
 
-  /** Ignore filters and accept all items */
+  /**
+   * A mode that ignores filters and accepts all items.
+   *
+   * <p>Behavior:
+   *
+   * <ul>
+   *   <li>If {@code data} is {@code null} → returns an empty list.
+   *   <li>Otherwise → returns a copy of {@code data}.
+   * </ul>
+   *
+   * @param <T> the element type
+   * @return a {@link FilterMode} that accepts everything
+   */
   static <T> FilterMode<T> acceptAll() {
-    return (data, filters) -> new ArrayList<>(data);
+    return (data, filters) -> data == null ? new ArrayList<>() : new ArrayList<>(data);
   }
 
-  /** Ignore filters and deny all items */
+  /**
+   * A mode that ignores filters and denies all items.
+   *
+   * @param <T> the element type
+   * @return a {@link FilterMode} that accepts nothing
+   */
   static <T> FilterMode<T> denyAll() {
     return (data, filters) -> new ArrayList<>();
   }
+
+  /**
+   * Returns {@code true} if the given {@code item} passes <em>all</em> {@code filters}.
+   *
+   * @param item the item to test
+   * @param filters the filters to evaluate (assumed non-null/non-empty by callers)
+   * @param <T> the element type
+   * @return {@code true} if every filter returns {@code true} for {@code item}
+   */
+  private static <T> boolean passesAll(
+      T item, Collection<? extends DataFilter<? super T>> filters) {
+    for (DataFilter<? super T> f : filters) {
+      if (!f.filter(item)) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  /**
+   * Returns {@code true} if the given {@code item} passes <em>any</em> of the {@code filters}.
+   *
+   * @param item the item to test
+   * @param filters the filters to evaluate (assumed non-null/non-empty by callers)
+   * @param <T> the element type
+   * @return {@code true} if at least one filter returns {@code true} for {@code item}
+   */
+  private static <T> boolean passesAny(
+      T item, Collection<? extends DataFilter<? super T>> filters) {
+    for (DataFilter<? super T> f : filters) {
+      if (f.filter(item)) {
+        return true;
+      }
+    }
+    return false;
+  }
 }

domino-ui/src/main/java/org/dominokit/domino/ui/datatable/plugins/tree/store/LocalTreeDataStore.java

@@ -72,9 +72,9 @@ public LocalTreeDataStore(
    * @param subItemsProvider the provider of sub-items
    */
   public LocalTreeDataStore(List<T> records, SubItemsProvider<T> subItemsProvider) {
-    super(records);
     this.subItemsProvider = subItemsProvider;
     this.treeNodeChildrenAware = record -> true;
+    initData(records);
   }
 
   /**
@@ -89,9 +89,9 @@ public LocalTreeDataStore(
       List<T> records,
       SubItemsProvider<T> subItemsProvider,
       TreeNodeChildrenAware<T> treeNodeChildrenAware) {
-    super(records);
     this.subItemsProvider = subItemsProvider;
     this.treeNodeChildrenAware = treeNodeChildrenAware;
+    initData(records);
   }
 
   /**

domino-ui/src/main/java/org/dominokit/domino/ui/datatable/plugins/tree/store/SubItemsStore.java

@@ -16,6 +16,7 @@
 
 package org.dominokit.domino.ui.datatable.plugins.tree.store;
 
+import java.util.ArrayList;
 import java.util.List;
 import org.dominokit.domino.ui.datatable.events.SearchEvent;
 import org.dominokit.domino.ui.datatable.events.SortEvent;
@@ -43,6 +44,7 @@ public class SubItemsStore<T> extends LocalListDataStore<T> {
    */
   public SubItemsStore(LocalTreeDataStore<T> parent) {
     this.parent = parent;
+    initData(new ArrayList<>());
   }
 
   /**
@@ -53,8 +55,8 @@ public SubItemsStore(LocalTreeDataStore<T> parent) {
    * @param parent The parent LocalTreeDataStore to delegate data operations to.
    */
   public SubItemsStore(List<T> data, LocalTreeDataStore<T> parent) {
-    super(data);
     this.parent = parent;
+    initData(data);
   }
 
   /** {@inheritDoc} */

domino-ui/src/main/java/org/dominokit/domino/ui/datatable/store/LocalListDataStore.java

@@ -53,7 +53,7 @@ public class LocalListDataStore<T>
 
   private final List<StoreDataChangeListener<T>> listeners = new ArrayList<>();
 
-  protected final List<T> original;
+  protected List<T> original;
   protected List<T> filtered;
   private HasPagination pagination;
   private SearchFilter<T> searchFilter;
@@ -95,15 +95,14 @@ public void onDraggedOut(T draggedOutRecord) {
       };
   private boolean filtersPaused = false;
   private Set<DataFilter<? super T>> dataFilters;
-  private FilterMode<Object> filterMode;
+  private FilterMode<T> filterMode;
 
   /**
    * Constructs a new {@code LocalListDataStore} with an empty original data list and filtered data
    * list.
    */
   public LocalListDataStore() {
-    this.original = new ArrayList<>();
-    this.filtered = new ArrayList<>();
+    initData(new ArrayList<>());
   }
 
   /**
@@ -112,6 +111,10 @@ public LocalListDataStore() {
    * @param data The list of data records.
    */
   public LocalListDataStore(List<T> data) {
+    initData(data);
+  }
+
+  protected final void initData(List<T> data) {
     this.original = data;
     this.filtered = new ArrayList<>(filterData(data));
   }
@@ -352,9 +355,7 @@ public void handleEvent(DominoEvent event) {
    */
   private void handleDraggedOutEvent(RecordDraggedOutEvent<T> event) {
     T rowToRemove = event.getDraggedOutRecord();
-
     dragDropRecordActions.onDraggedOut(rowToRemove);
-
     fireUpdate(true);
   }
 
@@ -722,20 +723,6 @@ public void addRecords(Collection<T> records) {
     setData(new ArrayList<>(original));
   }
 
-  /**
-   * Deprecated method to remove multiple records from the data store, updating both the original
-   * and filtered lists.
-   *
-   * @param records A collection of records to be removed.
-   * @deprecated Use {@link #removeRecords(Collection)} instead.
-   */
-  @Deprecated
-  public void removeRecord(Collection<T> records) {
-    original.removeAll(records);
-    filtered.removeAll(records);
-    load();
-  }
-
   /**
    * Removes multiple records from the data store, updating both the original and filtered lists.
    *
@@ -806,6 +793,16 @@ public boolean isDataFiltersPaused() {
     return this.filtersPaused;
   }
 
+  public LocalListDataStore<T> setFilterMode(FilterMode<T> filterMode) {
+    this.filterMode = filterMode;
+    return this;
+  }
+
+  @Override
+  public FilterMode<T> getFilterMode() {
+    return nonNull(filterMode) ? filterMode : FilterMode.denial();
+  }
+
   public LocalListDataStore<T> setDataFiltersEnabled(boolean state) {
     if (state) {
       this.filterMode = FilterMode.denial();