fix: Check main layout presence separately (#2831)(CP: main) #2836
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
MenuRegistry::collectClientViews erases/overrides the layout entry by the view entry, if they have the same mapping, e.g. when you add @layout.tsx and @index.tsx in the same folder.
Thus, the ServerAndClientViewsProvider::hasMainMenu method may not get all the layouts in the input collection.
That leads to hasMainMenu=false and to skipping menu entries for Flow routes.
This patch uses vaadin/flow#20245 new method to detect top-level main layout that fulfils the same criteria: empty route, non-null children, no other root elements.
Related-to #2825
Type of change
Checklist
Additional for
Feature
type of change