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

75832: [Issue 962]: Fix unnecessary calls creating/deleting groups - feedback

Browse Source
This commit is contained in:
Marie Verdonck
2021-02-04 12:11:18 +01:00
parent f1407b7f5b
commit dde149acea
2 changed files with 96 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.ts
View File

@@ -2,8 +2,14 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core';
import { FormBuilder } from '@angular/forms'; import { FormBuilder } from '@angular/forms';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { Observable, of as observableOf, Subscription, BehaviorSubject, ObservedValueOf, combineLatest as observableCombineLatest} from 'rxjs'; import {
import { map, mergeMap, take } from 'rxjs/operators'; Observable,
of as observableOf,
Subscription,
BehaviorSubject,
combineLatest as observableCombineLatest, ObservedValueOf,
} from 'rxjs';
import { map, mergeMap, switchMap, take } from 'rxjs/operators';
import {buildPaginatedList, PaginatedList} from '../../../../../core/data/paginated-list.model'; import {buildPaginatedList, PaginatedList} from '../../../../../core/data/paginated-list.model';
import { RemoteData } from '../../../../../core/data/remote-data'; import { RemoteData } from '../../../../../core/data/remote-data';
import { EPersonDataService } from '../../../../../core/eperson/eperson-data.service'; import { EPersonDataService } from '../../../../../core/eperson/eperson-data.service';
@@ -13,7 +19,7 @@ import { Group } from '../../../../../core/eperson/models/group.model';
import { import {
getRemoteDataPayload, getRemoteDataPayload,
getFirstSucceededRemoteData, getFirstSucceededRemoteData,
getFirstCompletedRemoteData getFirstCompletedRemoteData, getAllCompletedRemoteData
} from '../../../../../core/shared/operators'; } from '../../../../../core/shared/operators';
import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
import { PaginationComponentOptions } from '../../../../../shared/pagination/pagination-component-options.model'; import { PaginationComponentOptions } from '../../../../../shared/pagination/pagination-component-options.model';
@@ -23,9 +29,7 @@ import {EpersonDtoModel} from '../../../../../core/eperson/models/eperson-dto.mo
* Keys to keep track of specific subscriptions * Keys to keep track of specific subscriptions
*/ */
enum SubKey { enum SubKey {
Members,
ActiveGroup, ActiveGroup,
SearchResults,
MembersDTO, MembersDTO,
SearchResultsDTO, SearchResultsDTO,
} }
@@ -45,12 +49,10 @@ export class MembersListComponent implements OnInit, OnDestroy {
/** /**
* EPeople being displayed in search result, initially all members, after search result of search * EPeople being displayed in search result, initially all members, after search result of search
*/ */
searchResults$: BehaviorSubject<RemoteData<PaginatedList<EPerson>>> = new BehaviorSubject(undefined);
ePeopleSearchDtos: BehaviorSubject<PaginatedList<EpersonDtoModel>> = new BehaviorSubject<PaginatedList<EpersonDtoModel>>(undefined); ePeopleSearchDtos: BehaviorSubject<PaginatedList<EpersonDtoModel>> = new BehaviorSubject<PaginatedList<EpersonDtoModel>>(undefined);
/** /**
* List of EPeople members of currently active group being edited * List of EPeople members of currently active group being edited
*/ */
members$: BehaviorSubject<RemoteData<PaginatedList<EPerson>>> = new BehaviorSubject(undefined);
ePeopleMembersOfGroupDtos: BehaviorSubject<PaginatedList<EpersonDtoModel>> = new BehaviorSubject<PaginatedList<EpersonDtoModel>>(undefined); ePeopleMembersOfGroupDtos: BehaviorSubject<PaginatedList<EpersonDtoModel>> = new BehaviorSubject<PaginatedList<EpersonDtoModel>>(undefined);
/** /**
@@ -135,17 +137,58 @@ export class MembersListComponent implements OnInit, OnDestroy {
* @private * @private
*/ */
private retrieveMembers(page: number) { private retrieveMembers(page: number) {
this.unsubFrom(SubKey.Members); this.unsubFrom(SubKey.MembersDTO);
this.subs.set( this.subs.set(SubKey.MembersDTO, this.ePersonDataService.findAllByHref(this.groupBeingEdited._links.epersons.href, {
SubKey.Members, currentPage: page,
this.ePersonDataService.findAllByHref(this.groupBeingEdited._links.epersons.href, { elementsPerPage: this.config.pageSize
currentPage: page, }).pipe(
elementsPerPage: this.config.pageSize getAllCompletedRemoteData(),
} map((rd: RemoteData<any>) => {
).subscribe((rd: RemoteData<PaginatedList<EPerson>>) => { if (rd.hasFailed) {
this.members$.next(rd); this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure', {cause: rd.errorMessage}));
if (rd.payload !== undefined) { } else {
this.setEpersonDTOsFromResult(rd, this.ePeopleMembersOfGroupDtos, SubKey.MembersDTO); return rd;
}
}),
switchMap((epersonListRD: RemoteData<PaginatedList<EPerson>>) => {
const dtos$ = observableCombineLatest(...epersonListRD.payload.page.map((member: EPerson) => {
const dto$: Observable<EpersonDtoModel> = observableCombineLatest(
this.isMemberOfGroup(member), (isMember: ObservedValueOf<Observable<boolean>>) => {
const epersonDtoModel: EpersonDtoModel = new EpersonDtoModel();
epersonDtoModel.eperson = member;
epersonDtoModel.memberOfGroup = isMember;
return epersonDtoModel;
});
return dto$;
}));
return dtos$.pipe(map((dtos: EpersonDtoModel[]) => {
return buildPaginatedList(epersonListRD.payload.pageInfo, dtos);
}))
}))
.subscribe((paginatedListOfDTOs: PaginatedList<EpersonDtoModel>) => {
this.ePeopleMembersOfGroupDtos.next(paginatedListOfDTOs);
}));
}
/**
* Whether or not the given ePerson is a member of the group currently being edited
* @param possibleMember EPerson that is a possible member (being tested) of the group currently being edited
*/
isMemberOfGroup(possibleMember: EPerson): Observable<boolean> {
return this.groupDataService.getActiveGroup().pipe(take(1),
mergeMap((group: Group) => {
if (group != null) {
return this.ePersonDataService.findAllByHref(group._links.epersons.href, {
currentPage: 1,
elementsPerPage: 9999
}, false)
.pipe(
getFirstSucceededRemoteData(),
getRemoteDataPayload(),
map((listEPeopleInGroup: PaginatedList<EPerson>) => listEPeopleInGroup.page.filter((ePersonInList: EPerson) => ePersonInList.id === possibleMember.id)),
map((epeople: EPerson[]) => epeople.length > 0));
} else {
return observableOf(false);
} }
})); }));
} }
@@ -173,6 +216,7 @@ export class MembersListComponent implements OnInit, OnDestroy {
if (activeGroup != null) { if (activeGroup != null) {
const response = this.groupDataService.deleteMemberFromGroup(activeGroup, ePerson.eperson); const response = this.groupDataService.deleteMemberFromGroup(activeGroup, ePerson.eperson);
this.showNotifications('deleteMember', response, ePerson.eperson.name, activeGroup); this.showNotifications('deleteMember', response, ePerson.eperson.name, activeGroup);
this.search({ scope: this.currentSearchScope, query: this.currentSearchQuery });
} else { } else {
this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.noActiveGroup')); this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.noActiveGroup'));
} }
@@ -195,29 +239,6 @@ export class MembersListComponent implements OnInit, OnDestroy {
}); });
} }
/**
* Whether or not the given ePerson is a member of the group currently being edited
* @param possibleMember EPerson that is a possible member (being tested) of the group currently being edited
*/
isMemberOfGroup(possibleMember: EPerson): Observable<boolean> {
return this.groupDataService.getActiveGroup().pipe(take(1),
mergeMap((group: Group) => {
if (group != null) {
return this.ePersonDataService.findAllByHref(group._links.epersons.href, {
currentPage: 1,
elementsPerPage: 9999
})
.pipe(
getFirstSucceededRemoteData(),
getRemoteDataPayload(),
map((listEPeopleInGroup: PaginatedList<EPerson>) => listEPeopleInGroup.page.filter((ePersonInList: EPerson) => ePersonInList.id === possibleMember.id)),
map((epeople: EPerson[]) => epeople.length > 0));
} else {
return observableOf(false);
}
}));
}
/** /**
* Search in the EPeople by name, email or metadata * Search in the EPeople by name, email or metadata
* @param data Contains scope and query param * @param data Contains scope and query param
@@ -237,34 +258,38 @@ export class MembersListComponent implements OnInit, OnDestroy {
} }
this.searchDone = true; this.searchDone = true;
this.unsubFrom(SubKey.SearchResults); this.unsubFrom(SubKey.SearchResultsDTO);
this.subs.set(SubKey.SearchResults, this.ePersonDataService.searchByScope(this.currentSearchScope, this.currentSearchQuery, { this.subs.set(SubKey.SearchResultsDTO,
currentPage: this.configSearch.currentPage, this.ePersonDataService.searchByScope(this.currentSearchScope, this.currentSearchQuery, {
elementsPerPage: this.configSearch.pageSize currentPage: this.configSearch.currentPage,
}).subscribe((rd: RemoteData<PaginatedList<EPerson>>) => { elementsPerPage: this.configSearch.pageSize
this.searchResults$.next(rd); }, false).pipe(
if (rd.payload !== undefined) { getAllCompletedRemoteData(),
this.setEpersonDTOsFromResult(rd, this.ePeopleSearchDtos, SubKey.SearchResultsDTO); map((rd: RemoteData<any>) => {
} if (rd.hasFailed) {
})); this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure', {cause: rd.errorMessage}));
} } else {
return rd;
private setEpersonDTOsFromResult(rd: RemoteData<PaginatedList<EPerson>>, addTo: BehaviorSubject<PaginatedList<EpersonDtoModel>>, subkey) { }
this.unsubFrom(subkey); }),
const dtos$ = observableCombineLatest(...rd.payload.page.map((member: EPerson) => { switchMap((epersonListRD: RemoteData<PaginatedList<EPerson>>) => {
const dto$: Observable<EpersonDtoModel> = observableCombineLatest( const dtos$ = observableCombineLatest(...epersonListRD.payload.page.map((member: EPerson) => {
this.isMemberOfGroup(member), (isMember: ObservedValueOf<Observable<boolean>>) => { const dto$: Observable<EpersonDtoModel> = observableCombineLatest(
const epersonDtoModel: EpersonDtoModel = new EpersonDtoModel(); this.isMemberOfGroup(member), (isMember: ObservedValueOf<Observable<boolean>>) => {
epersonDtoModel.eperson = member; const epersonDtoModel: EpersonDtoModel = new EpersonDtoModel();
epersonDtoModel.memberOfGroup = isMember; epersonDtoModel.eperson = member;
return epersonDtoModel; epersonDtoModel.memberOfGroup = isMember;
}); return epersonDtoModel;
return dto$; });
})); return dto$;
this.subs.set(subkey,dtos$.pipe(map((dtos: EpersonDtoModel[]) => { }));
const paginatedListOfDTOs = buildPaginatedList(rd.payload.pageInfo, dtos); return dtos$.pipe(map((dtos: EpersonDtoModel[]) => {
addTo.next(paginatedListOfDTOs); return buildPaginatedList(epersonListRD.payload.pageInfo, dtos);
})).subscribe()); }))
}))
.subscribe((paginatedListOfDTOs: PaginatedList<EpersonDtoModel>) => {
this.ePeopleSearchDtos.next(paginatedListOfDTOs);
}));
} }
/** /**

2
src/assets/i18n/en.json5
View File

@@ -402,6 +402,8 @@
"admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search", "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
"admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
"admin.access-control.groups.form.subgroups-list.head": "Groups", "admin.access-control.groups.form.subgroups-list.head": "Groups",
"admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup", "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",