fix(router): cancel navigation when at least one resolver completes with no "next" emission (#24621)

This change aligns behavior for resolvers which return EMPTY. Currently EMPTY resolvers have inconsistent behavior:
- One resolver that returns EMPTY => won't navigate and just ends on ResolveStart router event.
- Two resolvers where both return EMPTY => throws "Error: Uncaught (in promise): EmptyError: no elements in sequence"
- Two resolvers where one returns a value and the other one returns EMPTY => Navigates successfully.
With this change any EMPTY resolver will cancel navigation.

BREAKING CHANGE: Any resolver which return EMPTY will cancel navigation.
If you want to allow the navigation to continue, you will need to update the resolvers to emit
some value, (i.e. defaultIfEmpty(...), of(...), etc).
PR Close #24195

PR Close #24621
This commit is contained in:
Martin Sikora
2020-04-17 11:48:19 +02:00
committed by Alex Rickabaugh
parent 12fcc7cafe
commit d9c4840a9c
5 changed files with 296 additions and 25 deletions

View File

@ -7,8 +7,8 @@
*/
import {Injector} from '@angular/core';
import {from, MonoTypeOperatorFunction, Observable, of} from 'rxjs';
import {concatMap, last, map, mergeMap, reduce} from 'rxjs/operators';
import {EMPTY, from, MonoTypeOperatorFunction, Observable, of} from 'rxjs';
import {concatMap, map, mergeMap, takeLast, tap} from 'rxjs/operators';
import {ResolveData} from '../config';
import {NavigationTransition} from '../router';
@ -26,13 +26,16 @@ export function resolveData(
if (!canActivateChecks.length) {
return of(t);
}
let canActivateChecksResolved = 0;
return from(canActivateChecks)
.pipe(
concatMap(
check => runResolve(
check.route, targetSnapshot!, paramsInheritanceStrategy, moduleInjector)),
reduce((_: any, __: any) => _), map(_ => t));
tap(() => canActivateChecksResolved++),
takeLast(1),
mergeMap(_ => canActivateChecksResolved === canActivateChecks.length ? of(t) : EMPTY),
);
}));
};
}
@ -59,22 +62,23 @@ function resolveNode(
if (keys.length === 0) {
return of({});
}
if (keys.length === 1) {
const key = keys[0];
return getResolver(resolve[key], futureARS, futureRSS, moduleInjector)
.pipe(map((value: any) => {
return {[key]: value};
}));
}
const data: {[k: string]: any} = {};
const runningResolvers$ = from(keys).pipe(mergeMap((key: string) => {
return getResolver(resolve[key], futureARS, futureRSS, moduleInjector)
.pipe(map((value: any) => {
data[key] = value;
return value;
}));
}));
return runningResolvers$.pipe(last(), map(() => data));
return from(keys).pipe(
mergeMap(
(key: string) => getResolver(resolve[key], futureARS, futureRSS, moduleInjector)
.pipe(tap((value: any) => {
data[key] = value;
}))),
takeLast(1),
mergeMap(() => {
// Ensure all resolvers returned values, otherwise don't emit any "next" and just complete
// the chain which will cancel navigation
if (Object.keys(data).length === keys.length) {
return of(data);
}
return EMPTY;
}),
);
}
function getResolver(
@ -83,4 +87,4 @@ function getResolver(
const resolver = getToken(injectionToken, futureARS, moduleInjector);
return resolver.resolve ? wrapIntoObservable(resolver.resolve(futureARS, futureRSS)) :
wrapIntoObservable(resolver(futureARS, futureRSS));
}
}