From c6f383ee5a6851614d1dffcc8240ffd2cd2642b9 Mon Sep 17 00:00:00 2001
From: Xiao Gui <xgui3783@gmail.com>
Date: Mon, 1 Oct 2018 17:33:54 +0200
Subject: [PATCH] chore: use a single aggregated region tree
---
src/ui/banner/banner.component.ts | 7 +++++++
src/ui/banner/banner.template.html | 6 +++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/ui/banner/banner.component.ts b/src/ui/banner/banner.component.ts
index 7d01ae660..71fba9c5c 100644
--- a/src/ui/banner/banner.component.ts
+++ b/src/ui/banner/banner.component.ts
@@ -237,5 +237,12 @@ export class AtlasBanner implements OnDestroy{
}
filterNameBySearchPipe = new FilterNameBySearch()
+
+ get aggregatedRegionTree(){
+ return {
+ name : this.selectedParcellation.name,
+ children : this.selectedParcellation.regions
+ }
+ }
}
diff --git a/src/ui/banner/banner.template.html b/src/ui/banner/banner.template.html
index 0a4fa76fb..04a8472c3 100644
--- a/src/ui/banner/banner.template.html
+++ b/src/ui/banner/banner.template.html
@@ -37,16 +37,16 @@
*ngIf = "showRegionTree"
hideScrollbarContainer>
- <div treeContainer>
+ <div treeContainer #treeContainer>
<div treeHeader>
<span>{{ selectedRegions.length }} {{ selectedRegions.length > 1 ? 'regions' : 'region' }} selected</span>
<span (click) = "clearRegions($event)" *ngIf = "selectedRegions.length > 0" class = "btn btn-link">clear all</span>
</div>
<flat-tree-component
- *ngFor = "let child of selectedParcellation.regions "
+ [flatTreeViewPort] = "treeContainer"
(treeNodeClick) = "handleClickRegion($event)"
- [inputItem] = "child"
+ [inputItem] = "aggregatedRegionTree"
[renderNode] = "displayTreeNode.bind(this)"
[searchFilter] = "filterTreeBySearch.bind(this)">
--
GitLab