Datagrid - Add filter group to allow disjunction

Author: nmonthrwjhealt

ponysdk/src/main/java/com/ponysdk/core/ui/datagrid2/column/ColumnActionListener.java

@@ -48,7 +48,7 @@ public interface ColumnActionListener<V> {
     /**
      * Called when this column is filtered
      *
-     * @see ColumnController#filter(Object, BiPredicate, boolean)
+     * @see ColumnController#filter(Object, BiPredicate, boolean, boolean) 
      */
     void onFilter(Object key, BiPredicate<V, Supplier<Object>> filter, boolean reinforcing);
 

ponysdk/src/main/java/com/ponysdk/core/ui/datagrid2/column/ColumnController.java

@@ -23,6 +23,7 @@
 
 package com.ponysdk.core.ui.datagrid2.column;
 
+import java.util.List;
 import java.util.function.BiPredicate;
 import java.util.function.Supplier;
 
@@ -54,6 +55,7 @@ public interface ColumnController<V> {
      *            arguments are the model value and a {@code Supplier}
      *            that provides the rendering helper that was supplied
      *            by {@link ColumnDefinition#getRenderingHelper(Object)}
+     * @param isActive a {@code Supplier} that provide values uses by filter
      * @param reinforcing {@code true} if the predicate is at least as
      *            intolerant as the replaced predicate of the same key
      *            (i.e. the predicate doesn't accept any value that was
@@ -64,7 +66,7 @@ public interface ColumnController<V> {
      *            replacing an existing one, the value of the
      *            {@code reinforcing} argument has no impact.
      */
-    void filter(Object key, BiPredicate<V, Supplier<Object>> filter, boolean reinforcing);
+    void filter(Object key, BiPredicate<V, Supplier<Object>> filter, boolean isActive, boolean reinforcing);
 
     /**
      * Cancels the filter, corresponding to {@code key}, from the view

ponysdk/src/main/java/com/ponysdk/core/ui/datagrid2/column/ColumnDefinition.java

@@ -23,6 +23,7 @@
 
 package com.ponysdk.core.ui.datagrid2.column;
 
+import java.util.function.BiPredicate;
 import java.util.function.Supplier;
 
 import com.ponysdk.core.ui.basic.IsPWidget;
@@ -87,7 +88,7 @@ public interface ColumnDefinition<V> extends ColumnActionListener<V> {
      * {@link ColumnDefinition#compare(Object, Supplier, Object, Supplier)} to
      * be used for sorting purposes, or inside the {@code BiPredicate} argument
      * of
-     * {@link ColumnController#filter(Object, java.util.function.BiPredicate, boolean)}
+     * {@link ColumnController#filter(Object, BiPredicate, boolean, boolean)}
      * to be used for filtering purposes.
      * For example: for a date column, this method can return a formatted
      * {@code String} of the date value, to avoid recalculating the
@@ -156,8 +157,7 @@ public interface ColumnDefinition<V> extends ColumnActionListener<V> {
     /**
      * @return {@code true} if data can be filtered based on this column,
      *         {@code false} otherwise
-     * @see ColumnController#filter(Object, java.util.function.BiPredicate,
-     *      boolean)
+     * @see ColumnController#filter(Object, BiPredicate, boolean, boolean) 
      */
     boolean isFilterable();
 
@@ -195,6 +195,11 @@ public interface ColumnDefinition<V> extends ColumnActionListener<V> {
      * @return the maximum width for this column
      */
     int getMaxWidth();
+    
+    /**
+     * @return the group that the column belongs to. Null if it is not affiliated with a group.
+     */
+    String getGroup();
 
     /**
      * The state of a column regarding its visibility and pinning.

ponysdk/src/main/java/com/ponysdk/core/ui/datagrid2/column/DecoratorColumnDefinition.java

@@ -179,4 +179,9 @@ public IsPWidget getDraggableHeaderElement() {
     public void onMoved() {
         column.onMoved();
     }
+
+	@Override
+	public String getGroup() {
+		return column.getGroup();
+	}
 }

ponysdk/src/main/java/com/ponysdk/core/ui/datagrid2/column/DefaultColumnDefinition.java

@@ -23,18 +23,18 @@
 
 package com.ponysdk.core.ui.datagrid2.column;
 
-import java.util.function.BiConsumer;
-import java.util.function.BiPredicate;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
 import com.ponysdk.core.ui.basic.Element;
 import com.ponysdk.core.ui.basic.IsPWidget;
 import com.ponysdk.core.ui.basic.PComplexPanel;
 import com.ponysdk.core.ui.basic.PLabel;
 import com.ponysdk.core.ui.datagrid2.cell.LabelCell;
 import com.ponysdk.core.ui.datagrid2.cell.PrimaryCell;
 
+import java.util.function.BiConsumer;
+import java.util.function.BiPredicate;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
 /**
  * @author mbagdouri
  */
@@ -47,16 +47,21 @@ public class DefaultColumnDefinition<V> implements ColumnDefinition<V> {
     private final PLabel columnNameLabel = Element.newPLabel();
     private final PLabel pinLabel = Element.newPLabel();
     private final PLabel hideLabel = Element.newPLabel();
+    private final String group;
     private ColumnController<V> columnController;
     private Boolean sort;
     private State state = getDefaultState();
 
-    public DefaultColumnDefinition(final String columnName, final Function<V, Object> columnValueFn,
-            final BiConsumer<V, String> columnEditFn) {
+    public DefaultColumnDefinition(final String columnName, final Function<V, Object> columnValueFn, final BiConsumer<V, String> columnEditFn) {
+        this(columnName, columnValueFn, columnEditFn, null);
+    }
+
+    public DefaultColumnDefinition(final String columnName, final Function<V, Object> columnValueFn, final BiConsumer<V, String> columnEditFn, String group) {
         super();
         this.columnName = columnName;
         this.columnValueFn = columnValueFn;
         this.columnEditFn = columnEditFn;
+        this.group = group;
         initHeader();
     }
 
@@ -113,13 +118,13 @@ public String toString() {
     }
 
     @Override
-    public void setController(final ColumnController<V> columnController) {
-        this.columnController = columnController;
+    public ColumnController<V> getController() {
+        return columnController;
     }
 
     @Override
-    public ColumnController<V> getController() {
-        return columnController;
+    public void setController(final ColumnController<V> columnController) {
+        this.columnController = columnController;
     }
 
     @Override
@@ -223,4 +228,9 @@ public IsPWidget getDraggableHeaderElement() {
     @Override
     public void onMoved() {
     }
+
+    @Override
+    public String getGroup() {
+        return group;
+    }
 }

ponysdk/src/main/java/com/ponysdk/core/ui/datagrid2/controller/DataGridController.java

@@ -23,14 +23,6 @@
 
 package com.ponysdk.core.ui.datagrid2.controller;
 
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Map;
-import java.util.function.BiPredicate;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-
 import com.ponysdk.core.server.service.query.PResultSet;
 import com.ponysdk.core.ui.datagrid2.adapter.DataGridAdapter;
 import com.ponysdk.core.ui.datagrid2.cell.Cell;
@@ -41,6 +33,14 @@
 import com.ponysdk.core.ui.datagrid2.view.DataGridView;
 import com.ponysdk.core.util.Pair;
 
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.function.BiPredicate;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
 /**
  * @author mbagdouri
  */
@@ -53,14 +53,13 @@ public interface DataGridController<K, V> {
 
     boolean isSelectable(K k);
 
-    public PResultSet<V> getFilteredData();
+    PResultSet<V> getFilteredData();
+
+    PResultSet<V> getLiveSelectedData();
 
-    public PResultSet<V> getLiveSelectedData();
-    
-    public PResultSet<V> getLastRequestedData();
+    PResultSet<V> getLastRequestedData();
 
     /**
-     *
      * @return the number of selected data
      */
     int getLiveSelectedDataCount();
@@ -90,9 +89,10 @@ public interface DataGridController<K, V> {
 
     void sort();
 
-    void setFilter(Object key, ColumnDefinition<V> column, BiPredicate<V, Supplier<Object>> filter, boolean reinforcing);
+    void setFilter(Object key, ColumnDefinition<V> column, BiPredicate<V, Supplier<Object>> filter, boolean isActive,
+                   boolean reinforcing);
 
-    void setFilter(Object key, String id, Predicate<V> filter, boolean reinforcing);
+    void setFilter(Object key, String id, Predicate<V> filter, boolean isActive, boolean reinforcing);
 
     void clearFilter(Object key);
 
@@ -117,8 +117,8 @@ public interface DataGridController<K, V> {
     void enrichConfigBuilder(DataGridConfigBuilder<V> builder);
 
     /**
-     * Performs a full refresh; i.e. same as {@link #refreshOnNextDraw()} but with a forced redraw on
-     * {@link DataGridView} afterwards.
+     * Performs a full refresh; i.e. same as {@link #refreshOnNextDraw()} but with a
+     * forced redraw on {@link DataGridView} afterwards.
      */
     void refresh();
 
@@ -129,7 +129,7 @@ public interface DataGridController<K, V> {
      * Indeed, a performance mechanism limits the rows which gets refreshed during a draw and this refresh ensures the
      * whole dataset will be refreshed.<br>
      * <br>
-     *
+     * <p>
      * splits the data in 2 zones: a constant one and a variable one.
      * The variable zone is the only one that gets updated during a draw and it is constantly narrowed down for better
      * performance.<br>
@@ -183,6 +183,11 @@ void prepareLiveDataOnScreen(int dataSrcRowIndex, int dataSize, DataGridSnapshot
      */
     V removeData(K k);
 
+    /**
+     * Whether the model is bound to the view.
+     */
+    boolean getBound();
+
     /**
      * If {@code bound} is true (default), the view is notified when the model
      * is updated. Otherwise, the view is not notified but it will continue to
@@ -192,9 +197,4 @@ void prepareLiveDataOnScreen(int dataSrcRowIndex, int dataSize, DataGridSnapshot
      */
     void setBound(boolean bound);
 
-    /**
-     * Whether the model is bound to the view.
-     */
-    boolean getBound();
-
 }