hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-13 21:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert to getFirstCompletedRemoteData but check if payload has completed

Browse Source
This commit is contained in:
Nathan Buckingham
2022-05-06 14:03:14 -04:00
parent cb1b7ceb0a
commit 79bf27c659
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/app/shared/rss-feed/rss.component.ts
View File

@@ -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 { getFirstSucceededRemoteDataWithNotEmptyPayload } from '../../core/shared/operators'; import { getFirstCompletedRemoteData } 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';
@@ -17,6 +17,7 @@ import { PaginationService } from '../../core/pagination/pagination.service';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { map, switchMap } from 'rxjs/operators'; import { map, switchMap } from 'rxjs/operators';
import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model'; import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
import { RemoteData } from '../../core/data/remote-data';
/** /**
@@ -67,20 +68,30 @@ 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(
getFirstSucceededRemoteDataWithNotEmptyPayload(), getFirstCompletedRemoteData(),
).subscribe((result) => { ).subscribe((result) => {
const enabled = (result.values[0] === 'true'); if (result.hasSucceeded) {
this.isEnabled$.next(enabled); const enabled = (result.payload.values[0] === 'true');
this.isEnabled$.next(enabled);
}
})); }));
this.subs.push(this.configurationService.findByPropertyName('websvc.opensearch.svccontext').pipe( this.subs.push(this.configurationService.findByPropertyName('websvc.opensearch.svccontext').pipe(
getFirstSucceededRemoteDataWithNotEmptyPayload(), getFirstCompletedRemoteData(),
map((result) => result.values[0]), map((result: RemoteData<any>) => {
switchMap((openSearchUri: string) => if (result.hasSucceeded) {
return result.payload.values[0];
}
return null;
}),
switchMap((openSearchUri: string) =>
this.searchConfigurationService.paginatedSearchOptions.pipe( this.searchConfigurationService.paginatedSearchOptions.pipe(
map((searchOptions: PaginatedSearchOptions) => ({ openSearchUri, searchOptions })) map((searchOptions: PaginatedSearchOptions) => ({ openSearchUri, searchOptions }))
) )
), ),
).subscribe(({ openSearchUri, searchOptions }) => { ).subscribe(({ openSearchUri, searchOptions }) => {
if (!openSearchUri) {
return null;
}
this.uuid = this.groupDataService.getUUIDFromString(this.router.url); this.uuid = this.groupDataService.getUUIDFromString(this.router.url);
const route = environment.rest.baseUrl + this.formulateRoute(this.uuid, openSearchUri, searchOptions.sort, searchOptions.query); const route = environment.rest.baseUrl + this.formulateRoute(this.uuid, openSearchUri, searchOptions.sort, searchOptions.query);
this.addLinks(route); this.addLinks(route);