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

65528: ComCol Tree with flatlist that gets generated at every (un)collapse

Browse Source 
> Only creates flatlist with expanded nodes
This commit is contained in:
Marie Verdonck
2019-10-10 10:30:49 +02:00
parent 4feba32157
commit 69e8221867
3 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/app/community-list-page/CommunityListDataSource.ts
View File

@@ -1,7 +1,7 @@
import {CommunityForList, CommunityListService} from './CommunityListService';
import {CollectionViewer, DataSource} from '@angular/cdk/typings/collections';
import {BehaviorSubject, Observable, of} from 'rxjs';
import {catchError, finalize, map} from 'rxjs/operators';
import {catchError, finalize, map, take} from 'rxjs/operators';
export interface CommunityFlatNode {
expandable: boolean;
@@ -30,17 +30,18 @@ export class CommunityListDataSource implements DataSource<CommunityFlatNode> {
this.loadingSubject.complete();
}
loadCommunities() {
loadCommunities(expandedNodes: CommunityFlatNode[]) {
this.loadingSubject.next(true);
this.communityListService.getCommunityList()
.pipe(
take(1),
catchError(() => of([])),
finalize(() => this.loadingSubject.next(false)),
map((result: CommunityForList[]) => {
const communityFlatNodes: CommunityFlatNode[] = [];
const level = 0;
return this.transformListOfCommunities(result, level, communityFlatNodes, null);
return this.transformListOfCommunities(result, level, communityFlatNodes, null, expandedNodes);
})
)
.subscribe((communityFlatNode) => {
@@ -51,21 +52,28 @@ export class CommunityListDataSource implements DataSource<CommunityFlatNode> {
transformListOfCommunities(listOfCommunities: CommunityForList[],
level: number,
communityFlatNodes: CommunityFlatNode[],
parent: CommunityFlatNode): CommunityFlatNode[] {
parent: CommunityFlatNode,
expandedNodes: CommunityFlatNode[]): CommunityFlatNode[] {
level++;
for (const community of listOfCommunities) {
const hasSubComs = ((!!community.subcoms && community.subcoms.length > 0));
let expanded = false;
if (expandedNodes != null) {
const expandedNodesFound = expandedNodes.filter((node) => (node.name === community.name));
expanded = (expandedNodesFound.length > 0);
}
console.log(community.name + 'is expanded: ' + expanded);
const communityFlatNode: CommunityFlatNode = {
expandable: hasSubComs,
name: community.name,
level: level,
isExpanded: false,
isExpanded: expanded,
community: community,
parent: parent
}
communityFlatNodes.push(communityFlatNode);
if (hasSubComs) {
this.transformListOfCommunities(community.subcoms, level, communityFlatNodes, communityFlatNode);
if (hasSubComs && communityFlatNode.isExpanded) {
this.transformListOfCommunities(community.subcoms, level, communityFlatNodes, communityFlatNode, expandedNodes);
}
}
return communityFlatNodes;