fix: revert ensure first page is loaded; ignore test till fixed (#551) (

#563)
vaadin · Jan 12, 2021 · 2b2aa05 · 2b2aa05
1 parent c79b391
commit 2b2aa05
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/...sts/src/test/java/com/vaadin/flow/component/grid/it/GridTestScrollingOver100kLinesIT.java b/...sts/src/test/java/com/vaadin/flow/component/grid/it/GridTestScrollingOver100kLinesIT.java
@@ -49,7 +49,7 @@ public void toStringIsUsedForObjectSerialization() {
         allCellContents.forEach(vgcc -> {
             String slotName = vgcc.getAttribute("slot")
                     .replace("vaadin-grid-cell-content-", "");
-            if (Integer.parseInt(slotName) < 7 || Integer.parseInt(slotName) > 20) {
+            if (Integer.parseInt(slotName) <= 180) {
                 Assert.assertTrue(
                         "A grid cell was expected to have text content but had none.",
                         StringUtils.isNotBlank(vgcc.getText()));

diff --git a/...rid-flow-integration-tests/src/test/java/com/vaadin/flow/component/grid/it/SortingIT.java b/...rid-flow-integration-tests/src/test/java/com/vaadin/flow/component/grid/it/SortingIT.java
@@ -19,6 +19,7 @@
 
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
@@ -58,6 +59,7 @@ public void setInitialSortOrder_changeOrderFromServer_dataSorted() {
     }
 
     @Test
+    @Ignore("Fix reverted for https://github.com/vaadin/vaadin-flow-components/issues/427")
     public void setInitialSortOrderGridHidden_showGrid_dataPresentAndSorted() {
         findElement(By.id("sort-hidden-by-age")).click();
         findElement(By.id("show-hidden-grid")).click();

diff --git a/...w-parent/vaadin-grid-flow/src/main/resources/META-INF/resources/frontend/gridConnector.js b/...w-parent/vaadin-grid-flow/src/main/resources/META-INF/resources/frontend/gridConnector.js
@@ -367,11 +367,6 @@
         }
       })
 
-      // Need to flush FlattenedNodesObserver in order to update `grid._columnTree`
-      // before `_dataProviderChanged` is called. Otherwise, the first page won't
-      // be correctly loaded because of `_canPopulate` returns incorrect result.
-      grid._observer.flush();
-
       grid.dataProvider = tryCatchWrapper(function(params, callback) {
         if (params.pageSize != grid.pageSize) {
           throw 'Invalid pageSize';