Skip to content

fix(router): lazy loaded empty root path loads with auxiliary outlet #32526

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

Closed
asvishnyakov wants to merge 10 commits into from
Closed

fix(router): lazy loaded empty root path loads with auxiliary outlet #32526

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7d5fd24
fix(router): lazy loaded empty root path loads with auxiliary outlet
asvishnyakov Sep 7, 2019
c6d6323
fix(router): added missed import
asvishnyakov Sep 7, 2019
7cabc79
fix(router): fix lint errors using auto format tool
asvishnyakov Sep 9, 2019
76df7da
fix(router): fixed type casting
asvishnyakov Sep 9, 2019
9c9ea12
fix(router): attempt to fix null reference fails in tests
asvishnyakov Sep 9, 2019
f2c4096
fix(router): fix lint errors using auto format tool
asvishnyakov Sep 9, 2019
b0758e1
test(router): added tests to cover #12842
asvishnyakov Sep 9, 2019
2eecce7
fix(router): fixed null reference handling
asvishnyakov Sep 9, 2019
372f5dc
fix(router): fixed error handling
asvishnyakov Sep 9, 2019
16e9633
fix(router): removed of left by mistake
asvishnyakov Sep 9, 2019
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
Prev Previous commit
Next Next commit
fix(router): fixed null reference handling
  • Loading branch information
@asvishnyakov
asvishnyakov committed Sep 9, 2019
commit 2eecce700113cf51d054fa4da1172365205c9846
11 changes: 9 additions & 2 deletions packages/router/src/apply_redirects.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,20 @@ class ApplyRedirects {
ngModule, segmentGroup, routes, r, segments, outlet, allowRedirects);
return expanded$.pipe(catchError((e: any) => {
if (e instanceof NoMatch) {
return of (new UrlSegmentGroup([], {}));
return of (null);
}
throw e;
}));
}))
.pipe(
map(x => x.find((s: any) => !!s) || new UrlSegmentGroup([], {})),
map(x => {
const match = x.find((s: any) => !!s);
if (match) {
return match;
} else {
throw new EmptyError();
}
}),
catchError((e: any, _: any) => {
if (e instanceof EmptyError || e.name === 'EmptyError') {
if (this.noLeftoversInUrl(segmentGroup, segments, outlet)) {
Expand Down