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

Fix count results in external source relationship lookup tab label

Browse Source
This commit is contained in:
Marie Verdonck
2020-11-05 11:44:43 +01:00
parent ecb56413e2
commit 4487e2b8ea
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/core/data/lookup-relation.service.ts
View File

@@ -1,6 +1,6 @@
import { ExternalSourceService } from './external-source.service'; import { ExternalSourceService } from './external-source.service';
import { SearchService } from '../shared/search/search.service'; import { SearchService } from '../shared/search/search.service';
import { concat, map, multicast, startWith, take, takeWhile } from 'rxjs/operators'; import { concat, distinctUntilChanged, map, multicast, startWith, take, takeWhile } from 'rxjs/operators';
import { PaginatedSearchOptions } from '../../shared/search/paginated-search-options.model'; import { PaginatedSearchOptions } from '../../shared/search/paginated-search-options.model';
import { ReplaySubject } from 'rxjs/internal/ReplaySubject'; import { ReplaySubject } from 'rxjs/internal/ReplaySubject';
import { RemoteData } from './remote-data'; import { RemoteData } from './remote-data';
@@ -91,7 +91,8 @@ export class LookupRelationService {
getAllSucceededRemoteData(), getAllSucceededRemoteData(),
getRemoteDataPayload(), getRemoteDataPayload(),
map((results: PaginatedList<ExternalSourceEntry>) => results.totalElements), map((results: PaginatedList<ExternalSourceEntry>) => results.totalElements),
startWith(0) startWith(0),
distinctUntilChanged()
); );
} }

2
src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
View File

@@ -233,7 +233,7 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
this.totalExternal$ = externalSourcesAndOptions$.pipe( this.totalExternal$ = externalSourcesAndOptions$.pipe(
switchMap(([sources, options]) => switchMap(([sources, options]) =>
observableZip(...sources.page.map((source: ExternalSource) => this.lookupRelationService.getTotalExternalResults(source, options)))) combineLatest(...sources.page.map((source: ExternalSource) => this.lookupRelationService.getTotalExternalResults(source, options))))
); );
} }