Skip to content

Commit

Permalink
fix(router): shouldn't execute CanLoad when a route has been loaded
Browse files Browse the repository at this point in the history
Closes #14475
Closes #15438
  • Loading branch information
Dzmitry Shylovich authored and vicb committed Mar 29, 2017
1 parent ce3e03f commit 2360676
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 8 deletions.
16 changes: 9 additions & 7 deletions packages/router/src/apply_redirects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -293,16 +293,18 @@ class ApplyRedirects {
}

if (route.loadChildren) {
if ((<any>route)._loadedConfig !== void 0) {
return of ((<any>route)._loadedConfig);
}

return mergeMap.call(runCanLoadGuard(ngModule.injector, route), (shouldLoad: boolean) => {

if (shouldLoad) {
return (<any>route)._loadedConfig ?
of ((<any>route)._loadedConfig) :
map.call(
this.configLoader.load(ngModule.injector, route), (cfg: LoadedRouterConfig) => {
(<any>route)._loadedConfig = cfg;
return cfg;
});
return map.call(
this.configLoader.load(ngModule.injector, route), (cfg: LoadedRouterConfig) => {
(<any>route)._loadedConfig = cfg;
return cfg;
});
}

return canLoadFails(route);
Expand Down
47 changes: 46 additions & 1 deletion packages/router/test/integration.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2075,7 +2075,9 @@ describe('Integration', () => {
});

describe('CanLoad', () => {
let canLoadRunCount = 0;
beforeEach(() => {
canLoadRunCount = 0;
TestBed.configureTestingModule({
providers: [
{provide: 'alwaysFalse', useValue: (a: any) => false},
Expand All @@ -2087,7 +2089,13 @@ describe('Integration', () => {
},
deps: [Router],
},
{provide: 'alwaysTrue', useValue: (a: any) => true},
{
provide: 'alwaysTrue',
useValue: () => {
canLoadRunCount++;
return true;
}
},
]
});
});
Expand Down Expand Up @@ -2173,6 +2181,43 @@ describe('Integration', () => {
[NavigationStart, '/blank'], [RoutesRecognized, '/blank'], [NavigationEnd, '/blank']
]);
})));

it('should execute CanLoad only once',
fakeAsync(inject(
[Router, Location, NgModuleFactoryLoader],
(router: Router, location: Location, loader: SpyNgModuleFactoryLoader) => {

@Component({selector: 'lazy', template: 'lazy-loaded'})
class LazyLoadedComponent {
}

@NgModule({
declarations: [LazyLoadedComponent],
imports:
[RouterModule.forChild([{path: 'loaded', component: LazyLoadedComponent}])]
})
class LazyLoadedModule {
}

loader.stubbedModules = {lazy: LazyLoadedModule};
const fixture = createRoot(router, RootCmp);

router.resetConfig([{path: 'lazy', canLoad: ['alwaysTrue'], loadChildren: 'lazy'}]);

router.navigateByUrl('/lazy/loaded');
advance(fixture);
expect(location.path()).toEqual('/lazy/loaded');
expect(canLoadRunCount).toEqual(1);

router.navigateByUrl('/');
advance(fixture);
expect(location.path()).toEqual('/');

router.navigateByUrl('/lazy/loaded');
advance(fixture);
expect(location.path()).toEqual('/lazy/loaded');
expect(canLoadRunCount).toEqual(1);
})));
});

describe('order', () => {
Expand Down

0 comments on commit 2360676

Please sign in to comment.