Skip to content

refactor(router): Add handling for empty observables in guards #63546

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
atscott wants to merge 1 commit into from
Closed

refactor(router): Add handling for empty observables in guards #63546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion packages/router/src/recognize.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import {
} from './utils/config_matching';
import {TreeNode} from './utils/tree';
import {firstValueFrom} from './utils/first_value_from';
import {isEmptyError} from './utils/type_guards';

/**
* Class used to indicate there were no additional route config matches but that all segments of
Expand Down Expand Up @@ -257,7 +258,7 @@ export class Recognizer {
parentRoute,
);
} catch (e: any) {
if (e?.name === NO_MATCH_ERROR_NAME) {
if (e?.name === NO_MATCH_ERROR_NAME || isEmptyError(e)) {
continue;
}
throw e;
Expand Down
18 changes: 17 additions & 1 deletion packages/router/test/integration/guards.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
EnvironmentInjector,
} from '@angular/core';
import {TestBed, ComponentFixture} from '@angular/core/testing';
import {Subject, Observable, of, concat} from 'rxjs';
import {Subject, Observable, of, concat, EMPTY} from 'rxjs';
import {tap, mapTo, first, takeWhile, last, switchMap} from 'rxjs/operators';
import {
ActivatedRouteSnapshot,
Expand Down Expand Up @@ -2048,6 +2048,22 @@ export function guardsIntegrationSuite() {
await advance(fixture);
expect(fixture.nativeElement.innerHTML).toContain('simple');
});
it('falls back to second route when canMatch returns EMPTY', async () => {
const router = TestBed.inject(Router);
router.resetConfig([
{
path: 'a',
canMatch: [() => EMPTY],
component: BlankCmp,
},
{path: 'a', component: SimpleCmp},
]);
const fixture = await createRoot(router, RootCmp);

router.navigateByUrl('/a');
await advance(fixture);
expect(fixture.nativeElement.innerHTML).toContain('simple');
});

it('uses route when canMatch returns true', async () => {
const router = TestBed.inject(Router);
Expand Down