From 71894f4ba9cd8495bb676a7c1a32e3353369a380 Mon Sep 17 00:00:00 2001 From: Joseph Doherty Date: Mon, 23 Mar 2026 02:38:25 -0400 Subject: [PATCH] refactor(ui): replace manual area tree rendering with TreeView component --- .../Components/Pages/Admin/Areas.razor | 66 +++++++------------ 1 file changed, 22 insertions(+), 44 deletions(-) diff --git a/src/ScadaLink.CentralUI/Components/Pages/Admin/Areas.razor b/src/ScadaLink.CentralUI/Components/Pages/Admin/Areas.razor index c93df3a..c617872 100644 --- a/src/ScadaLink.CentralUI/Components/Pages/Admin/Areas.razor +++ b/src/ScadaLink.CentralUI/Components/Pages/Admin/Areas.razor @@ -96,31 +96,27 @@ } - @if (_areas.Count == 0) - { -
No areas configured for this site.
- } - else - { -
-
- @foreach (var node in BuildFlatTree()) - { -
- - @(node.HasChildren ? "[+]" : " -") - - @node.Area.Name - - -
- } -
-
- } + + + @area.Name + + + + + + + + No areas for this site. Add one above. + + } @@ -176,25 +172,7 @@ } } - private record AreaTreeNode(Area Area, int Depth, bool HasChildren); - - private List BuildFlatTree() - { - var result = new List(); - AddChildren(null, 0, result); - return result; - } - - private void AddChildren(int? parentId, int depth, List result) - { - var children = _areas.Where(a => a.ParentAreaId == parentId).OrderBy(a => a.Name); - foreach (var child in children) - { - var hasChildren = _areas.Any(a => a.ParentAreaId == child.Id); - result.Add(new AreaTreeNode(child, depth, hasChildren)); - AddChildren(child.Id, depth + 1, result); - } - } + private List _rootAreas => _areas.Where(a => a.ParentAreaId == null).OrderBy(a => a.Name).ToList(); private string GetAreaPath(Area area) {