Skip to content

Commit 3f3b786

Browse files
vaadin-botJohannes Eriksson
andauthored
fix: remove duplicates when collecting BeforeEnterObservers (#12451) (#12476)
Fixes a bug where the stream of BeforeEnterObservers could contain duplicates, causing extraneous calls to BeforeEnterObserver::beforeEnter for non-root components. Fixes #12356 Co-authored-by: Johannes Eriksson <joheriks@vaadin.com>
1 parent 567bd21 commit 3f3b786

4 files changed

Lines changed: 77 additions & 1 deletion

File tree

‎flow-server/src/main/java/com/vaadin/flow/router/EventUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public static List<BeforeEnterObserver> collectBeforeEnterObserversFromChain(
132132
return chain.stream()
133133
.flatMap(chainRoot -> collectBeforeEnterObserversStream(
134134
chainRoot.getElement(), childrenExclusionElements))
135-
.collect(Collectors.toList());
135+
.distinct().collect(Collectors.toList());
136136
}
137137

138138
/**
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package com.vaadin.flow.uitest.ui;
2+
3+
import com.vaadin.flow.component.html.Div;
4+
import com.vaadin.flow.component.html.Span;
5+
import com.vaadin.flow.router.BeforeEnterEvent;
6+
import com.vaadin.flow.router.BeforeEnterObserver;
7+
8+
public class PreserveOnRefreshNestedBeforeEnterCounter extends Div
9+
implements BeforeEnterObserver {
10+
private int beforeEnterCount = 0;
11+
private final Span count = new Span();
12+
13+
public PreserveOnRefreshNestedBeforeEnterCounter() {
14+
count.setId(getClass().getSimpleName() + "-before-enter-count");
15+
add(count);
16+
}
17+
18+
@Override
19+
public void beforeEnter(BeforeEnterEvent event) {
20+
count.setText(Integer.toString(++beforeEnterCount));
21+
}
22+
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package com.vaadin.flow.uitest.ui;
2+
3+
import com.vaadin.flow.router.ParentLayout;
4+
import com.vaadin.flow.router.PreserveOnRefresh;
5+
import com.vaadin.flow.router.Route;
6+
import com.vaadin.flow.router.RouterLayout;
7+
8+
@Route(value = "com.vaadin.flow.uitest.ui.PreserveOnRefreshNestedBeforeEnterView", layout = PreserveOnRefreshNestedBeforeEnterView.NestedLayout.class)
9+
public class PreserveOnRefreshNestedBeforeEnterView
10+
extends PreserveOnRefreshNestedBeforeEnterCounter {
11+
12+
@PreserveOnRefresh
13+
public static class RootLayout extends
14+
PreserveOnRefreshNestedBeforeEnterCounter implements RouterLayout {
15+
}
16+
17+
@ParentLayout(RootLayout.class)
18+
public static class NestedLayout extends
19+
PreserveOnRefreshNestedBeforeEnterCounter implements RouterLayout {
20+
}
21+
}
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.vaadin.flow.uitest.ui;
2+
3+
import org.junit.Assert;
4+
import org.junit.Test;
5+
import com.vaadin.flow.component.html.testbench.SpanElement;
6+
import com.vaadin.flow.testutil.ChromeBrowserTest;
7+
8+
// IT for https://github.com/vaadin/flow/issues/12356
9+
public class PreserveOnRefreshNestedBeforeEnterIT extends ChromeBrowserTest {
10+
11+
@Test
12+
public void refreshViewWithNestedLayouts_eachBeforeEnterIsCalledOnlyOnce() {
13+
open();
14+
15+
Assert.assertEquals("1", $(SpanElement.class)
16+
.id("RootLayout-before-enter-count").getText());
17+
Assert.assertEquals("1", $(SpanElement.class)
18+
.id("NestedLayout-before-enter-count").getText());
19+
Assert.assertEquals("1", $(SpanElement.class)
20+
.id("PreserveOnRefreshNestedBeforeEnterView-before-enter-count")
21+
.getText());
22+
23+
open();
24+
25+
Assert.assertEquals("2", $(SpanElement.class)
26+
.id("RootLayout-before-enter-count").getText());
27+
Assert.assertEquals("2", $(SpanElement.class)
28+
.id("NestedLayout-before-enter-count").getText());
29+
Assert.assertEquals("2", $(SpanElement.class)
30+
.id("PreserveOnRefreshNestedBeforeEnterView-before-enter-count")
31+
.getText());
32+
}
33+
}

0 commit comments

Comments
 (0)