Skip to content

fix(router): recursively merge empty path matches#41584

Closed
atscott wants to merge 1 commit intoangular:masterfrom
atscott:routeroutletemptypathparent
Closed

fix(router): recursively merge empty path matches#41584
atscott wants to merge 1 commit intoangular:masterfrom
atscott:routeroutletemptypathparent

Conversation

@atscott
Copy link
Copy Markdown
Contributor

@atscott atscott commented Apr 12, 2021

When recognizing routes, the router merges nodes which map to the same
empty path config. This is because auxiliary outlets under empty path
parents need to match the parent config. This would result in two
outlet matches for that parent which need to be combined into a single
node: The regular 'primary' match and the match for the auxiliary outlet.
In addition, the children of the merged nodes should also be merged to
account for multiple levels of empty path parents.

Fixes #41481

@atscott atscott added area: router target: patch This PR is targeted for the next patch release router: aux routes labels Apr 12, 2021
@ngbot ngbot bot added this to the Backlog milestone Apr 12, 2021
@google-cla google-cla bot added the cla: yes label Apr 12, 2021
@atscott atscott force-pushed the routeroutletemptypathparent branch from 4508252 to 49e8326 Compare April 12, 2021 17:48
When recognizing routes, the router merges nodes which map to the same
empty path config. This is because auxiliary outlets under empty path
parents need to match the parent config. This would result in two
outlet matches for that parent which need to be combined into a single
node: The regular 'primary' match and the match for the auxiliary outlet.
In addition, the children of the merged nodes should also be merged to
account for multiple levels of empty path parents.

Fixes angular#41481
@atscott atscott force-pushed the routeroutletemptypathparent branch from 49e8326 to b4ddd66 Compare April 12, 2021 18:27
Copy link
Copy Markdown
Contributor

@AndrewKushnir AndrewKushnir left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@atscott
Copy link
Copy Markdown
Contributor Author

atscott commented Apr 13, 2021

presubmit

@atscott atscott added the action: presubmit The PR is in need of a google3 presubmit label Apr 13, 2021
@atscott
Copy link
Copy Markdown
Contributor Author

atscott commented Apr 13, 2021

triggering global presubmit as a precaution

@atscott
Copy link
Copy Markdown
Contributor Author

atscott commented Apr 13, 2021

global presubmit sample run (green)

@atscott atscott added action: merge The PR is ready for merge by the caretaker and removed action: presubmit The PR is in need of a google3 presubmit labels Apr 14, 2021
@zarend zarend closed this in a1b2718 Apr 14, 2021
zarend pushed a commit that referenced this pull request Apr 14, 2021
When recognizing routes, the router merges nodes which map to the same
empty path config. This is because auxiliary outlets under empty path
parents need to match the parent config. This would result in two
outlet matches for that parent which need to be combined into a single
node: The regular 'primary' match and the match for the auxiliary outlet.
In addition, the children of the merged nodes should also be merged to
account for multiple levels of empty path parents.

Fixes #41481

PR Close #41584
zarend pushed a commit that referenced this pull request Apr 14, 2021
When recognizing routes, the router merges nodes which map to the same
empty path config. This is because auxiliary outlets under empty path
parents need to match the parent config. This would result in two
outlet matches for that parent which need to be combined into a single
node: The regular 'primary' match and the match for the auxiliary outlet.
In addition, the children of the merged nodes should also be merged to
account for multiple levels of empty path parents.

Fixes #41481

PR Close #41584
@angular-automatic-lock-bot
Copy link
Copy Markdown

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators May 15, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

action: merge The PR is ready for merge by the caretaker area: router cla: yes router: aux routes target: patch This PR is targeted for the next patch release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

bug(router) 'Cannot activate an already activated outlet' error when using aux routes in lazy loaded module

2 participants