11import { ActivatedRouteSnapshot , ResolveFn , RouterStateSnapshot } from '@angular/router' ;
22import { SignpostingLink } from '../../../core/data/signposting-links.model' ;
3- import { Observable , of , switchMap } from 'rxjs' ;
3+ import { Observable , of , switchMap } from 'rxjs' ;
44import { inject } from '@angular/core' ;
55import { hasValue } from '../../../shared/empty.util' ;
66import { SignpostingDataService } from '../../../core/data/signposting-data.service' ;
77import { ItemDataService } from '../../../core/data/item-data.service' ;
88import { getFirstCompletedRemoteData } from '../../../core/shared/operators' ;
99import { RemoteData } from '../../../core/data/remote-data' ;
1010import { Item } from '../../../core/shared/item.model' ;
11+ import { getItemPageLinksToFollow } from '../../item.resolver' ;
1112
1213/**
1314 * Resolver to retrieve signposting links before an eventual redirect of any route guard
@@ -27,10 +28,9 @@ export const signpostingLinksResolver: ResolveFn<Observable<SignpostingLink[]>>
2728 if ( ! hasValue ( uuid ) ) {
2829 return of ( [ ] ) ;
2930 }
30- return itemService . findById ( uuid ) . pipe (
31+ return itemService . findById ( uuid , true , true , ... getItemPageLinksToFollow ( ) , ) . pipe (
3132 getFirstCompletedRemoteData ( ) ,
3233 switchMap ( ( itemRD : RemoteData < Item > ) => {
33- console . log ( uuid , itemRD ) ;
3434 return itemRD . hasSucceeded ? signpostingDataService . getLinks ( itemRD . payload . uuid ) : of ( [ ] ) ;
3535 } ) ,
3636 ) ;
0 commit comments