Server-side sorting updates data on client-side (#13334)

Change-Id: If4576ed8605c4795d6edaa2f6d36cdb2eb9e8440

1 files changed, 11 insertions, 5 deletions

diff --git a/server/src/com/vaadin/data/RpcDataProviderExtension.java b/server/src/com/vaadin/data/RpcDataProviderExtension.java
index 801b925e2a..f731e4575d 100644
--- a/server/src/com/vaadin/data/RpcDataProviderExtension.java
+++ b/server/src/com/vaadin/data/RpcDataProviderExtension.java
@@ -583,11 +583,17 @@ public class RpcDataProviderExtension extends AbstractExtension {
             }
 
             else {
-                // TODO no diff info available, redraw everything
-                throw new UnsupportedOperationException("bare "
-                        + "ItemSetChangeEvents are currently "
-                        + "not supported, use a container that "
-                        + "uses AddItemEvents and RemoveItemEvents.");
+                Range visibleRows = activeRowHandler.activeRange;
+                List<?> itemIds = container.getItemIds(visibleRows.getStart(),
+                        visibleRows.length());
+
+                keyMapper.removeActiveRows(keyMapper.activeRange);
+                keyMapper.addActiveRows(visibleRows, visibleRows.getStart(),
+                        itemIds);
+
+                pushRows(visibleRows.getStart(), itemIds);
+                activeRowHandler.setActiveRows(visibleRows.getStart(),
+                        visibleRows.length());
             }
         }
     };