Skip to content

Commit 0b2ee17

Browse files
fix: apply route parameters to side nav item correctly (#5253)
* fix: apply route parameters to side nav item correctly * refactor: remove static modifier --------- Co-authored-by: Sascha Ißbrücker <sissbruecker@vaadin.com>
1 parent 7d71bac commit 0b2ee17

2 files changed

Lines changed: 51 additions & 8 deletions

File tree

  • vaadin-side-nav-flow-parent/vaadin-side-nav-flow/src

‎vaadin-side-nav-flow-parent/vaadin-side-nav-flow/src/main/java/com/vaadin/flow/component/sidenav/SideNavItem.java‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@
3939
import java.util.Arrays;
4040
import java.util.Collections;
4141
import java.util.HashSet;
42+
import java.util.Map;
4243
import java.util.Objects;
4344
import java.util.Set;
45+
import java.util.function.Function;
4446
import java.util.stream.Collectors;
4547

4648
/**
@@ -368,9 +370,23 @@ private Set<String> getPathAliasesFromView(Class<? extends Component> view,
368370

369371
private String updateAliasWithRouteParameters(String alias,
370372
RouteParameters routeParameters) {
373+
if (!alias.contains(":")) {
374+
return alias;
375+
}
371376
ConfigureRoutes configuredAliases = new ConfigureRoutes();
372377
configuredAliases.setRoute(alias, getClass());
373-
return configuredAliases.getTargetUrl(getClass(), routeParameters);
378+
return configuredAliases.getTargetUrl(getClass(),
379+
getRouteParametersForAlias(alias, routeParameters));
380+
}
381+
382+
private RouteParameters getRouteParametersForAlias(String alias,
383+
RouteParameters routeParameters) {
384+
Map<String, String> parametersMapForAlias = routeParameters
385+
.getParameterNames().stream()
386+
.filter(paramName -> alias.contains(":" + paramName))
387+
.collect(Collectors.toMap(Function.identity(),
388+
paramName -> routeParameters.get(paramName).get()));
389+
return new RouteParameters(parametersMapForAlias);
374390
}
375391

376392
private String updateQueryParameters(String path) {

‎vaadin-side-nav-flow-parent/vaadin-side-nav-flow/src/test/java/com/vaadin/flow/component/sidenav/tests/SideNavItemTest.java‎

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -542,22 +542,47 @@ public void setPathAndRouteParametersAsComponent_pathContainsParameters() {
542542
}
543543

544544
@Test
545-
public void createFromComponentWithRouteParameters_aliasContainsParameters() {
545+
public void setPathAndRouteParametersAsComponent_aliasesWithMatchingParamsUpdated() {
546+
runWithMockRouter(() -> {
547+
sideNavItem.setPath(TestRouteWithAliases.class, new RouteParameters(
548+
Map.of("key1", "value1", "key2", "value2")));
549+
550+
assertPathAliases(Set.of("foo/baz", "foo/qux", "foo/value1/bar",
551+
"foo/value1/value1/bar", "foo/value1/value2/bar"));
552+
}, TestRouteWithAliases.class);
553+
}
554+
555+
@Test
556+
public void createFromComponentWithRouteParameters_aliasesWithMatchingParamsUpdated() {
546557
runWithMockRouter(() -> {
547558
sideNavItem = new SideNavItem("test", TestRouteWithAliases.class,
548-
new RouteParameters(Map.of("key", "value")));
559+
new RouteParameters(
560+
Map.of("key1", "value1", "key2", "value2")));
549561

550-
assertPathAliases(Set.of("foo/value/bar"));
562+
assertPathAliases(Set.of("foo/baz", "foo/qux", "foo/value1/bar",
563+
"foo/value1/value1/bar", "foo/value1/value2/bar"));
551564
}, TestRouteWithAliases.class);
552565
}
553566

554567
@Test
555-
public void setPathAndRouteParametersAsComponent_aliasContainsParameters() {
568+
public void setPathAndRouteParametersAsComponent_aliasWithMissingParamNotAdded() {
556569
runWithMockRouter(() -> {
557570
sideNavItem.setPath(TestRouteWithAliases.class,
558-
new RouteParameters(Map.of("key", "value")));
571+
new RouteParameters(Map.of("key1", "value1")));
572+
573+
assertPathAliases(Set.of("foo/baz", "foo/qux", "foo/value1/bar",
574+
"foo/value1/value1/bar"));
575+
}, TestRouteWithAliases.class);
576+
}
577+
578+
@Test
579+
public void createFromComponentWithRouteParameters_aliasWithMissingParamNotAdded() {
580+
runWithMockRouter(() -> {
581+
sideNavItem = new SideNavItem("test", TestRouteWithAliases.class,
582+
new RouteParameters(Map.of("key1", "value1")));
559583

560-
assertPathAliases(Set.of("foo/value/bar"));
584+
assertPathAliases(Set.of("foo/baz", "foo/qux", "foo/value1/bar",
585+
"foo/value1/value1/bar"));
561586
}, TestRouteWithAliases.class);
562587
}
563588

@@ -687,7 +712,9 @@ private static class TestRouteWithRouteParams extends Component {
687712
@Route("foo/bar")
688713
@RouteAlias("foo/baz")
689714
@RouteAlias("foo/qux")
690-
@RouteAlias("foo/:key/bar")
715+
@RouteAlias("foo/:key1/bar")
716+
@RouteAlias("foo/:key1/:key1/bar")
717+
@RouteAlias("foo/:key1/:key2/bar")
691718
private static class TestRouteWithAliases extends Component {
692719

693720
}

0 commit comments

Comments
 (0)