Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Flow main layout #2662

Merged
merged 12 commits into from
Aug 27, 2024
Merged

feat: Flow main layout #2662

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2a40705
Add layout to configuration
caalador Aug 14, 2024
efcf2ff
Add withLayouts to RouterConfigurationBuilder
caalador Aug 19, 2024
b564a21
method doc
caalador Aug 19, 2024
b4f8c78
Better explanation
caalador Aug 21, 2024
ebac3be
Add test for withLayouts
caalador Aug 21, 2024
738cf00
Merge branch 'main' into feat/flow-main-layout
caalador Aug 22, 2024
220bd58
add child route
caalador Aug 22, 2024
07fdfde
add test for no routes path in withLayouts
caalador Aug 23, 2024
1936797
Add new field
caalador Aug 26, 2024
805f9ae
Merge branch 'main' into feat/flow-main-layout
caalador Aug 26, 2024
c278cf1
Apply suggestions from code review
caalador Aug 27, 2024
614736b
Changfe to layout from layouts
caalador Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions packages/java/endpoint/src/test/java/com/vaadin/hilla/route/RouteUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void test_role_allowed() {

AvailableViewInfo config = new AvailableViewInfo("Test",
new String[] { "ROLE_ADMIN" }, false, "/test", false, false,
null, null, null);
null, null, null, false);
routeUtil.setRoutes(Collections.singletonMap("/test", config));

Assert.assertTrue("Route should be allowed for ADMIN role.",
Expand All @@ -52,7 +52,7 @@ public void test_role_not_allowed() {

AvailableViewInfo config = new AvailableViewInfo("Test",
new String[] { "ROLE_ADMIN" }, false, "/test", false, false,
null, null, null);
null, null, null, false);
routeUtil.setRoutes(Collections.singletonMap("/test", config));

Assert.assertFalse("USER role should not allow ADMIN route.",
Expand All @@ -67,7 +67,7 @@ public void test_login_required() {
request.setUserPrincipal(Mockito.mock(Principal.class));

AvailableViewInfo config = new AvailableViewInfo("Test", null, true,
"/test", false, false, null, null, null);
"/test", false, false, null, null, null, false);
routeUtil.setRoutes(Collections.singletonMap("/test", config));

Assert.assertTrue("Request with user principal should be allowed",
Expand All @@ -82,7 +82,7 @@ public void test_login_required_failed() {
request.setUserPrincipal(null);

AvailableViewInfo config = new AvailableViewInfo("Test", null, true,
"/test", false, false, null, null, null);
"/test", false, false, null, null, null, false);
routeUtil.setRoutes(Collections.singletonMap("/test", config));

Assert.assertFalse("No login should be denied access",
Expand All @@ -97,11 +97,11 @@ public void test_login_required_on_layout() {
request.setUserPrincipal(null);

AvailableViewInfo pageWithoutLogin = new AvailableViewInfo("Test Page",
null, false, "/test", false, false, null, null, null);
null, false, "/test", false, false, null, null, null, false);

AvailableViewInfo layoutWithLogin = new AvailableViewInfo("Test Layout",
null, true, "", false, false, null,
Collections.singletonList(pageWithoutLogin), null);
Collections.singletonList(pageWithoutLogin), null, false);
routeUtil.setRoutes(Map.ofEntries(entry("/test", pageWithoutLogin),
entry("", layoutWithLogin)));

Expand All @@ -118,11 +118,11 @@ public void test_login_required_on_page() {
request.setUserPrincipal(null);

AvailableViewInfo pageWithLogin = new AvailableViewInfo("Test Page",
null, true, "/test", false, false, null, null, null);
null, true, "/test", false, false, null, null, null, false);

AvailableViewInfo layoutWithoutLogin = new AvailableViewInfo(
"Test Layout", null, false, "", false, false, null,
Collections.singletonList(pageWithLogin), null);
Collections.singletonList(pageWithLogin), null, false);
routeUtil.setRoutes(Map.ofEntries(entry("/test", pageWithLogin),
entry("", layoutWithoutLogin)));

Expand All @@ -142,7 +142,7 @@ public void test_login_not_required_on_root() {
request.setUserPrincipal(null);

AvailableViewInfo config = new AvailableViewInfo("Root", null, false,
"", false, false, null, null, null);
"", false, false, null, null, null, false);
routeUtil.setRoutes(Collections.singletonMap("", config));

Assert.assertTrue("Login no required should allow access",
Expand Down
24 changes: 16 additions & 8 deletions packages/java/endpoint/src/test/resources/META-INF/VAADIN/available-views-admin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"route": "/foo",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/bar": {
"params": {},
Expand All @@ -17,7 +18,8 @@
"route": "/bar",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/home": {
"params": {},
Expand All @@ -27,7 +29,8 @@
"route": "/home",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/wildcard": {
"params": {
Expand All @@ -39,7 +42,8 @@
"route": "/wildcard",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/comments": {
"params": {
Expand All @@ -51,7 +55,8 @@
"route": "/comments",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/profile": {
"params": {},
Expand All @@ -64,7 +69,8 @@
"route": "/profile",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/": {
"params": {},
Expand All @@ -74,7 +80,8 @@
"route": "/",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/orders": {
"params": {},
Expand All @@ -84,6 +91,7 @@
"route": "/orders",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
}
}
21 changes: 14 additions & 7 deletions packages/java/endpoint/src/test/resources/META-INF/VAADIN/available-views-anonymous.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"route": "/home",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/foo": {
"params": {},
Expand All @@ -17,7 +18,8 @@
"route": "/foo",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/wildcard": {
"params": {
Expand All @@ -29,7 +31,8 @@
"route": "/wildcard",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/bar": {
"params": {},
Expand All @@ -39,7 +42,8 @@
"route": "/bar",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/comments": {
"params": {
Expand All @@ -51,7 +55,8 @@
"route": "/comments",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/": {
"params": {},
Expand All @@ -61,7 +66,8 @@
"route": "/",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/orders": {
"params": {},
Expand All @@ -71,6 +77,7 @@
"route": "/orders",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
}
}
24 changes: 16 additions & 8 deletions packages/java/endpoint/src/test/resources/META-INF/VAADIN/available-views-user.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"route": "/foo",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/bar": {
"params": {},
Expand All @@ -17,7 +18,8 @@
"route": "/bar",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/home": {
"params": {},
Expand All @@ -27,7 +29,8 @@
"route": "/home",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/wildcard": {
"params": {
Expand All @@ -39,7 +42,8 @@
"route": "/wildcard",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/comments": {
"params": {
Expand All @@ -51,7 +55,8 @@
"route": "/comments",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/profile": {
"params": {},
Expand All @@ -64,7 +69,8 @@
"route": "/profile",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/": {
"params": {},
Expand All @@ -74,7 +80,8 @@
"route": "/",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/orders": {
"params": {},
Expand All @@ -84,6 +91,7 @@
"route": "/orders",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
}
}
12 changes: 8 additions & 4 deletions packages/java/endpoint/src/test/resources/META-INF/VAADIN/only-client-views.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"route": "/home",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/profile": {
"params": {},
Expand All @@ -20,7 +21,8 @@
"route": "/profile",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/": {
"params": {},
Expand All @@ -30,7 +32,8 @@
"route": "/",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/orders": {
"params": {},
Expand All @@ -40,6 +43,7 @@
"route": "/orders",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
}
}
18 changes: 12 additions & 6 deletions packages/java/endpoint/src/test/resources/META-INF/VAADIN/server-and-client-views.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"route": "/foo",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/bar": {
"params": {},
Expand All @@ -17,7 +18,8 @@
"route": "/bar",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/home": {
"params": {},
Expand All @@ -27,7 +29,8 @@
"route": "/home",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/comments": {
"params": {
Expand All @@ -39,7 +42,8 @@
"route": "/comments",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/wildcard": {
"params": {
Expand All @@ -51,7 +55,8 @@
"route": "/wildcard",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
},
"/profile": {
"params": {},
Expand All @@ -64,6 +69,7 @@
"route": "/profile",
"lazy": false,
"register": false,
"menu": null
"menu": null,
"flowLayout":false
}
}
Loading