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

[CTS-3090] - fix

Browse Source
This commit is contained in:
Danilo Di Nuzzo
2020-06-16 15:51:56 +02:00
parent be16134329
commit 5f0f665501
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/shared/collection-dropdown/collection-dropdown.component.ts
View File

@@ -10,7 +10,7 @@ import { Community } from 'src/app/core/shared/community.model';
import { CollectionDataService } from 'src/app/core/data/collection-data.service'; import { CollectionDataService } from 'src/app/core/data/collection-data.service';
import { Collection } from '../../core/shared/collection.model'; import { Collection } from '../../core/shared/collection.model';
import { followLink } from '../utils/follow-link-config.model'; import { followLink } from '../utils/follow-link-config.model';
import { getFirstSucceededRemoteDataPayload, getAllSucceededRemoteData, getSucceededRemoteWithNotEmptyData } from '../../core/shared/operators';
/** /**
* An interface to represent a collection entry * An interface to represent a collection entry
*/ */
@@ -178,17 +178,15 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy {
this.searchListCollection$ = this.collectionDataService this.searchListCollection$ = this.collectionDataService
.getAuthorizedCollection(query, findOptions, followLink('parentCommunity')) .getAuthorizedCollection(query, findOptions, followLink('parentCommunity'))
.pipe( .pipe(
find((collections: RemoteData<PaginatedList<Collection>>) => !collections.isResponsePending && collections.hasSucceeded), getSucceededRemoteWithNotEmptyData(),
mergeMap((collections: RemoteData<PaginatedList<Collection>>) => { mergeMap((collections: RemoteData<PaginatedList<Collection>>) => {
if ( (this.searchListCollection.length + findOptions.elementsPerPage) >= collections.payload.totalElements ) { if ( (this.searchListCollection.length + findOptions.elementsPerPage) >= collections.payload.totalElements ) {
this.hasNextPage = false; this.hasNextPage = false;
} }
return collections.payload.page; return collections.payload.page;
}), }),
filter((collectionData: Collection) => isNotEmpty(collectionData)),
mergeMap((collection: Collection) => collection.parentCommunity.pipe( mergeMap((collection: Collection) => collection.parentCommunity.pipe(
find((communityResponse: RemoteData<Community>) => !communityResponse.isResponsePending && communityResponse.hasSucceeded), getFirstSucceededRemoteDataPayload(),
mergeMap((communityResponse: RemoteData<Community>) => of(communityResponse.payload)),
map((community: Community) => ({ map((community: Community) => ({
communities: [{ id: community.id, name: community.name }], communities: [{ id: community.id, name: community.name }],
collection: { id: collection.id, uuid: collection.id, name: collection.name } collection: { id: collection.id, uuid: collection.id, name: collection.name }