search.component.ts (dspace-angular-dspace-7.0) | : | search.component.ts (dspace-angular-dspace-7.1) | ||
---|---|---|---|---|
skipping to change at line 59 | skipping to change at line 59 | |||
* The current paginated search options | * The current paginated search options | |||
*/ | */ | |||
searchOptions$: Observable<PaginatedSearchOptions>; | searchOptions$: Observable<PaginatedSearchOptions>; | |||
/** | /** | |||
* The current available sort options | * The current available sort options | |||
*/ | */ | |||
sortOptions$: Observable<SortOptions[]>; | sortOptions$: Observable<SortOptions[]>; | |||
/** | /** | |||
* The current relevant scopes | ||||
*/ | ||||
scopeListRD$: Observable<DSpaceObject[]>; | ||||
/** | ||||
* Emits true if were on a small screen | * Emits true if were on a small screen | |||
*/ | */ | |||
isXsOrSm$: Observable<boolean>; | isXsOrSm$: Observable<boolean>; | |||
/** | /** | |||
* Subscription to unsubscribe from | * Subscription to unsubscribe from | |||
*/ | */ | |||
sub: Subscription; | sub: Subscription; | |||
/** | /** | |||
skipping to change at line 140 | skipping to change at line 135 | |||
this.searchLink = this.getSearchLink(); | this.searchLink = this.getSearchLink(); | |||
this.searchOptions$ = this.getSearchOptions(); | this.searchOptions$ = this.getSearchOptions(); | |||
this.sub = this.searchOptions$.pipe( | this.sub = this.searchOptions$.pipe( | |||
switchMap((options) => this.service.search( | switchMap((options) => this.service.search( | |||
options, undefined, true, true, followLink<Item>('thumbnail', { isOpti onal: true }) | options, undefined, true, true, followLink<Item>('thumbnail', { isOpti onal: true }) | |||
).pipe(getFirstSucceededRemoteData(), startWith(undefined)) | ).pipe(getFirstSucceededRemoteData(), startWith(undefined)) | |||
) | ) | |||
).subscribe((results) => { | ).subscribe((results) => { | |||
this.resultsRD$.next(results); | this.resultsRD$.next(results); | |||
}); | }); | |||
this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe( | ||||
switchMap((scopeId) => this.service.getScopes(scopeId)) | ||||
); | ||||
if (isEmpty(this.configuration$)) { | if (isEmpty(this.configuration$)) { | |||
this.configuration$ = this.searchConfigService.getCurrentConfiguration('de fault'); | this.configuration$ = this.searchConfigService.getCurrentConfiguration('de fault'); | |||
} | } | |||
const searchConfig$ = this.searchConfigService.getConfigurationSearchConfigO bservable(this.configuration$, this.service); | const searchConfig$ = this.searchConfigService.getConfigurationSearchConfigO bservable(this.configuration$, this.service); | |||
this.sortOptions$ = this.searchConfigService.getConfigurationSortOptionsObse rvable(searchConfig$); | this.sortOptions$ = this.searchConfigService.getConfigurationSortOptionsObse rvable(searchConfig$); | |||
this.searchConfigService.initializeSortOptionsFromConfiguration(searchConfig $); | this.searchConfigService.initializeSortOptionsFromConfiguration(searchConfig $); | |||
} | } | |||
End of changes. 2 change blocks. | ||||
8 lines changed or deleted | 1 lines changed or added |