-
Notifications
You must be signed in to change notification settings - Fork 169
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Create MenuRegistry for getting automatic menu views for population. Fixes #19321
- Loading branch information
Showing
11 changed files
with
862 additions
and
98 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
92 changes: 92 additions & 0 deletions
92
flow-server/src/main/java/com/vaadin/flow/router/internal/ParameterInfo.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| /* | ||
| * Copyright 2000-2024 Vaadin Ltd. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not | ||
| * use this file except in compliance with the License. You may obtain a copy of | ||
| * the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations under | ||
| * the License. | ||
| */ | ||
|
|
||
| package com.vaadin.flow.router.internal; | ||
|
|
||
| import java.io.Serializable; | ||
| import java.util.Optional; | ||
|
|
||
| /** | ||
| * Define a route url parameter details. | ||
| * <p> | ||
| * For internal use only. May be renamed or removed in a future release. | ||
| */ | ||
| public class ParameterInfo implements Serializable { | ||
|
|
||
| private final String name; | ||
|
|
||
| private final String template; | ||
|
|
||
| private final boolean optional; | ||
|
|
||
| private final boolean varargs; | ||
|
|
||
| private final String regex; | ||
|
|
||
| public ParameterInfo(String template) { | ||
| this.template = template; | ||
|
|
||
| if (!RouteFormat.isParameter(template)) { | ||
| throw new IllegalArgumentException( | ||
| "The given string is not a parameter template."); | ||
| } | ||
|
|
||
| optional = RouteFormat.isOptionalParameter(template); | ||
| if (optional) { | ||
| template = template.replaceFirst("\\?", ""); | ||
| } | ||
| varargs = RouteFormat.isVarargsParameter(template); | ||
| if (varargs) { | ||
| template = template.replaceFirst("\\*", ""); | ||
| } | ||
|
|
||
| // Remove : | ||
| template = template.substring(1); | ||
|
|
||
| // Extract the template defining the value of the parameter. | ||
| final int regexStartIndex = template.indexOf('('); | ||
| if (regexStartIndex != -1) { | ||
|
|
||
| name = template.substring(0, regexStartIndex); | ||
|
|
||
| regex = template.substring(regexStartIndex + 1, | ||
| template.length() - 1); | ||
| } else { | ||
| name = template; | ||
| regex = null; | ||
| } | ||
| } | ||
|
|
||
| public String getName() { | ||
| return name; | ||
| } | ||
|
|
||
| public String getTemplate() { | ||
| return template; | ||
| } | ||
|
|
||
| public boolean isOptional() { | ||
| return optional; | ||
| } | ||
|
|
||
| public boolean isVarargs() { | ||
| return varargs; | ||
| } | ||
|
|
||
| public Optional<String> getRegex() { | ||
| return Optional.ofNullable(regex); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 85 additions & 0 deletions
85
flow-server/src/main/java/com/vaadin/flow/server/menu/AvailableViewInfo.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /* | ||
| * Copyright 2000-2024 Vaadin Ltd. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not | ||
| * use this file except in compliance with the License. You may obtain a copy of | ||
| * the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations under | ||
| * the License. | ||
| */ | ||
|
|
||
| package com.vaadin.flow.server.menu; | ||
|
|
||
| import java.io.Serializable; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
|
|
||
| import com.vaadin.flow.router.MenuData; | ||
|
|
||
| /** | ||
| * Represents a view configuration for use with a menu. | ||
| * | ||
| * @param title | ||
| * @param rolesAllowed | ||
| * @param loginRequired | ||
| * @param route | ||
| * @param lazy | ||
| * @param register | ||
| * @param menu | ||
| * @param children | ||
| * @param routeParameters | ||
| */ | ||
| public record AvailableViewInfo(String title, String[] rolesAllowed, | ||
| boolean loginRequired, String route, boolean lazy, | ||
| boolean register, MenuData menu, | ||
| List<AvailableViewInfo> children, @JsonProperty( | ||
| "params") Map<String, RouteParamType> routeParameters) implements Serializable { | ||
|
|
||
| @Override | ||
| public boolean equals(final Object o) { | ||
| if (this == o) { | ||
| return true; | ||
| } else if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
| final AvailableViewInfo that = (AvailableViewInfo) o; | ||
| return Objects.equals(title, that.title) | ||
| && Arrays.equals(rolesAllowed, that.rolesAllowed) | ||
| && Objects.equals(loginRequired, that.loginRequired) | ||
| && Objects.equals(route, that.route) | ||
| && Objects.equals(lazy, that.lazy) | ||
| && Objects.equals(register, that.register) | ||
| && Objects.equals(menu, that.menu) | ||
| && Objects.equals(routeParameters, that.routeParameters); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| int result = Objects.hash(title, loginRequired, route, lazy, register, menu, routeParameters); | ||
| result = 31 * result + Arrays.hashCode(rolesAllowed); | ||
| return result; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "AvailableViewInfo{" + "title='" + title | ||
| + '\'' + ", rolesAllowed=" + Arrays.toString(rolesAllowed) | ||
| + ", loginRequired=" + loginRequired | ||
| + ", route='" + route + '\'' | ||
| + ", lazy=" + lazy | ||
| + ", register=" + register | ||
| + ", menu=" + menu | ||
| + ", routeParameters=" + routeParameters + '}'; | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.