mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-14 05:23:06 +00:00
Change to withNotEmptyPayload to pass through if its empty
This commit is contained in:
@@ -9,7 +9,7 @@ import { BehaviorSubject, Observable, Subscription } from 'rxjs';
|
|||||||
import { GroupDataService } from '../../core/eperson/group-data.service';
|
import { GroupDataService } from '../../core/eperson/group-data.service';
|
||||||
import { LinkHeadService } from '../../core/services/link-head.service';
|
import { LinkHeadService } from '../../core/services/link-head.service';
|
||||||
import { ConfigurationDataService } from '../../core/data/configuration-data.service';
|
import { ConfigurationDataService } from '../../core/data/configuration-data.service';
|
||||||
import { getFirstCompletedRemoteData } from '../../core/shared/operators';
|
import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataWithNotEmptyPayload } from '../../core/shared/operators';
|
||||||
import { environment } from '../../../../src/environments/environment';
|
import { environment } from '../../../../src/environments/environment';
|
||||||
import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
|
import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
|
||||||
import { SortOptions } from '../../core/cache/models/sort-options.model';
|
import { SortOptions } from '../../core/cache/models/sort-options.model';
|
||||||
@@ -68,14 +68,14 @@ export class RSSComponent implements OnInit, OnDestroy {
|
|||||||
this.configuration$ = this.searchConfigurationService.getCurrentConfiguration('default');
|
this.configuration$ = this.searchConfigurationService.getCurrentConfiguration('default');
|
||||||
|
|
||||||
this.subs.push(this.configurationService.findByPropertyName('websvc.opensearch.enable').pipe(
|
this.subs.push(this.configurationService.findByPropertyName('websvc.opensearch.enable').pipe(
|
||||||
getFirstCompletedRemoteData(),
|
getFirstSucceededRemoteDataWithNotEmptyPayload(),
|
||||||
).subscribe((result) => {
|
).subscribe((result) => {
|
||||||
const enabled = (result.payload.values[0] === 'true');
|
const enabled = (result.values[0] === 'true');
|
||||||
this.isEnabled$.next(enabled);
|
this.isEnabled$.next(enabled);
|
||||||
}));
|
}));
|
||||||
this.subs.push(this.configurationService.findByPropertyName('websvc.opensearch.svccontext').pipe(
|
this.subs.push(this.configurationService.findByPropertyName('websvc.opensearch.svccontext').pipe(
|
||||||
getFirstCompletedRemoteData(),
|
getFirstSucceededRemoteDataWithNotEmptyPayload(),
|
||||||
map((response: RemoteData<any>) => response.payload.values[0]),
|
map((result) => result.values[0]),
|
||||||
switchMap((openSearchUri: string) =>
|
switchMap((openSearchUri: string) =>
|
||||||
this.searchConfigurationService.paginatedSearchOptions.pipe(
|
this.searchConfigurationService.paginatedSearchOptions.pipe(
|
||||||
map((searchOptions: PaginatedSearchOptions) => ({ openSearchUri, searchOptions }))
|
map((searchOptions: PaginatedSearchOptions) => ({ openSearchUri, searchOptions }))
|
||||||
|
Reference in New Issue
Block a user