inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-31 17:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-3763] fixed subscription for node child and invalid node id (#3991)

Browse Source 
* [ADF-3763] fixed subscription for node child and invalid node id

* [ADF-3763] removed fdescribe

* [ADF-3763] added line for updating documentation
This commit is contained in:
Vito
2018-11-21 16:50:11 +00:00
committed by Eugenio Romano
parent 49c69c58f0
commit a5bf0d27e4
7 changed files with 112 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/content-services/tree-view/data/tree-view-datasource.ts
View File

@@ -28,6 +28,8 @@ export class TreeViewDataSource {
treeNodes: TreeBaseNode[];
dataChange = new BehaviorSubject<TreeBaseNode[]>([]);
childrenSubscription = null;
changeSubscription = null;
get data(): TreeBaseNode[] {
return this.treeNodes;
@@ -44,7 +46,7 @@ export class TreeViewDataSource {
}
connect(collectionViewer: CollectionViewer): Observable<TreeBaseNode[]> {
this.treeControl.expansionModel.onChange!.subscribe(change => {
this.changeSubscription = this.treeControl.expansionModel.onChange.subscribe(change => {
if ((change as SelectionChange<TreeBaseNode>).added &&
(change as SelectionChange<TreeBaseNode>).added.length > 0) {
this.expandTreeNodes(change as SelectionChange<TreeBaseNode>);
@@ -55,6 +57,15 @@ export class TreeViewDataSource {
return merge(collectionViewer.viewChange, this.dataChange).pipe(map(() => this.data));
}
disconnect() {
if (this.childrenSubscription) {
this.childrenSubscription.unsubscribe();
}
if (this.changeSubscription) {
this.changeSubscription.unsubscribe();
}
}
private expandTreeNodes(change: SelectionChange<TreeBaseNode>) {
change.added.forEach(node => this.expandNode(node));
}
@@ -64,19 +75,20 @@ export class TreeViewDataSource {
}
private expandNode(node: TreeBaseNode) {
this.treeViewService.getTreeNodes(node.nodeId).subscribe((children) => {
const index = this.data.indexOf(node);
if (!children || index < 0) {
node.expandable = false;
return;
}
const nodes = children.map(actualNode => {
actualNode.level = node.level + 1;
return actualNode;
this.childrenSubscription = this.treeViewService.getTreeNodes(node.nodeId)
.subscribe((children) => {
const index = this.data.indexOf(node);
if (!children || index < 0) {
node.expandable = false;
return;
}
const nodes = children.map(actualNode => {
actualNode.level = node.level + 1;
return actualNode;
});
this.data.splice(index + 1, 0, ...nodes);
this.dataChange.next(this.data);
});
this.data.splice(index + 1, 0, ...nodes);
this.dataChange.next(this.data);
});
}
toggleNode(node: TreeBaseNode) {