fix(router): parent resolve should complete before merging resolved data

Closes #12032
This commit is contained in:
vsavkin 2016-10-05 14:43:26 -07:00 committed by Tobias Bosch
parent 71b7654660
commit 1681e4f57f
2 changed files with 19 additions and 1 deletions

View File

@ -13,6 +13,7 @@ import {Subject} from 'rxjs/Subject';
import {Subscription} from 'rxjs/Subscription'; import {Subscription} from 'rxjs/Subscription';
import {from} from 'rxjs/observable/from'; import {from} from 'rxjs/observable/from';
import {of } from 'rxjs/observable/of'; import {of } from 'rxjs/observable/of';
import {concatMap} from 'rxjs/operator/concatMap';
import {every} from 'rxjs/operator/every'; import {every} from 'rxjs/operator/every';
import {map} from 'rxjs/operator/map'; import {map} from 'rxjs/operator/map';
import {mergeAll} from 'rxjs/operator/mergeAll'; import {mergeAll} from 'rxjs/operator/mergeAll';
@ -692,7 +693,7 @@ export class PreActivation {
resolveData(): Observable<any> { resolveData(): Observable<any> {
if (this.checks.length === 0) return of (null); if (this.checks.length === 0) return of (null);
const checks$ = from(this.checks); const checks$ = from(this.checks);
const runningChecks$ = mergeMap.call(checks$, (s: any) => { const runningChecks$ = concatMap.call(checks$, (s: any) => {
if (s instanceof CanActivate) { if (s instanceof CanActivate) {
return this.runResolve(s.route); return this.runResolve(s.route);
} else { } else {

View File

@ -48,6 +48,23 @@ describe('Router', () => {
}); });
}); });
it('should wait for the parent resolve to complete', () => {
const parentResolve = new InheritedResolve(InheritedResolve.empty, {data: 'resolver'});
const childResolve = new InheritedResolve(parentResolve, {});
const parent = createActivatedRouteSnapshot('a', {resolve: parentResolve});
const child = createActivatedRouteSnapshot('b', {resolve: childResolve});
const s = new RouterStateSnapshot(
'url', new TreeNode(empty.root, [new TreeNode(parent, [new TreeNode(child, [])])]));
const inj = {get: (token: any) => () => Promise.resolve(`${token}_value`)};
checkResolveData(s, empty, inj, () => {
expect(s.root.firstChild.firstChild.data).toEqual({data: 'resolver_value'});
});
});
it('should copy over data when creating a snapshot', () => { it('should copy over data when creating a snapshot', () => {
const r1 = new InheritedResolve(InheritedResolve.empty, {data: 'resolver1'}); const r1 = new InheritedResolve(InheritedResolve.empty, {data: 'resolver1'});
const r2 = new InheritedResolve(InheritedResolve.empty, {data: 'resolver2'}); const r2 = new InheritedResolve(InheritedResolve.empty, {data: 'resolver2'});