"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts" between
dspace-angular-dspace-7.0.tar.gz and dspace-angular-dspace-7.1.tar.gz

About: dspace-angular is the Angular-based frontend of DSpace, a digital repository system to capture, store, index, preserve and redistribute an organization’s research material in digital formats.

subgroups-list.component.ts  (dspace-angular-dspace-7.0):subgroups-list.component.ts  (dspace-angular-dspace-7.1)
skipping to change at line 20 skipping to change at line 20
import { Group } from '../../../../core/eperson/models/group.model'; import { Group } from '../../../../core/eperson/models/group.model';
import { import {
getFirstCompletedRemoteData, getFirstCompletedRemoteData,
getFirstSucceededRemoteData, getFirstSucceededRemoteData,
getRemoteDataPayload getRemoteDataPayload
} from '../../../../core/shared/operators'; } from '../../../../core/shared/operators';
import { NotificationsService } from '../../../../shared/notifications/notificat ions.service'; import { NotificationsService } from '../../../../shared/notifications/notificat ions.service';
import { PaginationComponentOptions } from '../../../../shared/pagination/pagina tion-component-options.model'; import { PaginationComponentOptions } from '../../../../shared/pagination/pagina tion-component-options.model';
import { NoContent } from '../../../../core/shared/NoContent.model'; import { NoContent } from '../../../../core/shared/NoContent.model';
import { PaginationService } from '../../../../core/pagination/pagination.servic e'; import { PaginationService } from '../../../../core/pagination/pagination.servic e';
import { followLink } from '../../../../shared/utils/follow-link-config.model';
/** /**
* Keys to keep track of specific subscriptions * Keys to keep track of specific subscriptions
*/ */
enum SubKey { enum SubKey {
Members, Members,
ActiveGroup, ActiveGroup,
SearchResults, SearchResults,
} }
skipping to change at line 120 skipping to change at line 121
* @private * @private
*/ */
private retrieveSubGroups() { private retrieveSubGroups() {
this.unsubFrom(SubKey.Members); this.unsubFrom(SubKey.Members);
this.subs.set( this.subs.set(
SubKey.Members, SubKey.Members,
this.paginationService.getCurrentPagination(this.config.id, this.config).p ipe( this.paginationService.getCurrentPagination(this.config.id, this.config).p ipe(
switchMap((config) => this.groupDataService.findAllByHref(this.groupBein gEdited._links.subgroups.href, { switchMap((config) => this.groupDataService.findAllByHref(this.groupBein gEdited._links.subgroups.href, {
currentPage: config.currentPage, currentPage: config.currentPage,
elementsPerPage: config.pageSize elementsPerPage: config.pageSize
} },
true,
true,
followLink('object')
)) ))
).subscribe((rd: RemoteData<PaginatedList<Group>>) => { ).subscribe((rd: RemoteData<PaginatedList<Group>>) => {
this.subGroups$.next(rd); this.subGroups$.next(rd);
})); }));
} }
/** /**
* Whether or not the given group is a subgroup of the group currently being e dited * Whether or not the given group is a subgroup of the group currently being e dited
* @param possibleSubgroup Group that is a possible subgroup (being tested) of the group currently being edited * @param possibleSubgroup Group that is a possible subgroup (being tested) of the group currently being edited
*/ */
skipping to change at line 220 skipping to change at line 224
this.currentSearchQuery = query; this.currentSearchQuery = query;
this.configSearch.currentPage = 1; this.configSearch.currentPage = 1;
} }
this.searchDone = true; this.searchDone = true;
this.unsubFrom(SubKey.SearchResults); this.unsubFrom(SubKey.SearchResults);
this.subs.set(SubKey.SearchResults, this.paginationService.getCurrentPaginat ion(this.configSearch.id, this.configSearch).pipe( this.subs.set(SubKey.SearchResults, this.paginationService.getCurrentPaginat ion(this.configSearch.id, this.configSearch).pipe(
switchMap((config) => this.groupDataService.searchGroups(this.currentSearc hQuery, { switchMap((config) => this.groupDataService.searchGroups(this.currentSearc hQuery, {
currentPage: config.currentPage, currentPage: config.currentPage,
elementsPerPage: config.pageSize elementsPerPage: config.pageSize
})) }, true, true, followLink('object')
))
).subscribe((rd: RemoteData<PaginatedList<Group>>) => { ).subscribe((rd: RemoteData<PaginatedList<Group>>) => {
this.searchResults$.next(rd); this.searchResults$.next(rd);
})); }));
} }
/** /**
* Unsubscribe from a subscription if it's still subscribed, and remove it fro m the map of * Unsubscribe from a subscription if it's still subscribed, and remove it fro m the map of
* active subscriptions * active subscriptions
* *
* @param key The key of the subscription to unsubscribe from * @param key The key of the subscription to unsubscribe from
 End of changes. 3 change blocks. 
2 lines changed or deleted 7 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)