Clean up

Author: JamesNK

src/Aspire.Dashboard/Components/Pages/Resources.razor.cs

@@ -133,57 +133,6 @@ static bool UnionWithKeys(ConcurrentDictionary<string, bool> left, ConcurrentDic
         }
     }
 
-    private static string? GetResourcePropertyValue(ResourceViewModel resourceViewModel)
-    {
-        if (resourceViewModel.Properties.TryGetValue(KnownProperties.Resource.ParentName, out var value))
-        {
-            if (value.Value.TryConvertToString(out var s))
-            {
-                return s;
-            }
-        }
-        
-        return null;
-    }
-
-    private List<ResourceGridViewModel> OrderNestedResources(List<ResourceGridViewModel> initialGridVMs)
-    {
-        // This method loops over the list of grid view models to build the nested list.
-        // Apps shouldn't have a huge number of resources (thousands) so this shouldn't impact performance,
-        // but if that changes then this method will need to be improved.
-
-        var gridViewModels = new List<ResourceGridViewModel>();
-        var depth = 0;
-
-        foreach (var gridVM in initialGridVMs.Where(r => GetResourcePropertyValue(r.Resource) is null))
-        {
-            gridVM.Depth = depth;
-            gridVM.IsCollapsed = !_expandedResourceNames.Contains(gridVM.Resource.Name);
-            gridVM.IsHidden = false;
-
-            gridViewModels.Add(gridVM);
-
-            AddChildViewModel(gridVM.Resource, gridVM, depth + 1, hidden: gridVM.IsCollapsed);
-        }
-
-        return gridViewModels;
-
-        void AddChildViewModel(ResourceViewModel resource, ResourceGridViewModel parent, int depth, bool hidden)
-        {
-            foreach (var childGridVM in initialGridVMs.Where(r => GetResourcePropertyValue(r.Resource) == resource.Name))
-            {
-                childGridVM.Depth = depth;
-                childGridVM.IsCollapsed = !_expandedResourceNames.Contains(childGridVM.Resource.Name);
-                childGridVM.IsHidden = hidden;
-
-                parent.Children.Add(childGridVM);
-                gridViewModels.Add(childGridVM);
-
-                AddChildViewModel(childGridVM.Resource, childGridVM, depth + 1, hidden: childGridVM.IsHidden || childGridVM.IsCollapsed);
-            }
-        }
-    }
-
     private readonly GridSort<ResourceGridViewModel> _nameSort = GridSort<ResourceGridViewModel>.ByAscending(p => p.Resource, ResourceViewModelNameComparer.Instance);
     private readonly GridSort<ResourceGridViewModel> _stateSort = GridSort<ResourceGridViewModel>.ByAscending(p => p.Resource.State).ThenAscending(p => p.Resource, ResourceViewModelNameComparer.Instance);
     private readonly GridSort<ResourceGridViewModel> _startTimeSort = GridSort<ResourceGridViewModel>.ByDescending(p => p.Resource.CreationTimeStamp).ThenAscending(p => p.Resource, ResourceViewModelNameComparer.Instance);
@@ -289,7 +238,9 @@ private ValueTask<GridItemsProviderResult<ResourceGridViewModel>> GetData(GridIt
         // Rearrange resources based on parent information.
         // This must happen after resources are ordered so nested resources are in the right order.
         // Collapsed resources are filtered out of results.
-        var orderedResources = OrderNestedResources(filteredResources.ToList()).Where(r => !r.IsHidden).ToList();
+        var orderedResources = ResourceGridViewModel.OrderNestedResources(filteredResources.ToList(), r => !_expandedResourceNames.Contains(r.Name))
+            .Where(r => !r.IsHidden)
+            .ToList();
 
         // Paging visible resources.
         var query = orderedResources.Skip(request.StartIndex);

src/Aspire.Dashboard/Model/ResourceGridViewModel.cs

@@ -33,4 +33,42 @@ private void UpdateHidden(bool isParentCollapsed = false)
             child.UpdateHidden(isParentCollapsed || IsCollapsed);
         }
     }
+
+    public static List<ResourceGridViewModel> OrderNestedResources(List<ResourceGridViewModel> initialGridVMs, Func<ResourceViewModel, bool> isCollapsed)
+    {
+        // This method loops over the list of grid view models to build the nested list.
+        // Apps shouldn't have a huge number of resources so this shouldn't impact performance,
+        // but if that changes then this method will need to be improved.
+
+        var gridViewModels = new List<ResourceGridViewModel>();
+        var depth = 0;
+
+        foreach (var gridVM in initialGridVMs.Where(r => r.Resource.GetResourcePropertyValue(KnownProperties.Resource.ParentName) is null))
+        {
+            gridVM.Depth = depth;
+            gridVM.IsCollapsed = isCollapsed(gridVM.Resource);
+            gridVM.IsHidden = false;
+
+            gridViewModels.Add(gridVM);
+
+            AddChildViewModel(gridVM.Resource, gridVM, depth + 1, hidden: gridVM.IsCollapsed);
+        }
+
+        return gridViewModels;
+
+        void AddChildViewModel(ResourceViewModel resource, ResourceGridViewModel parent, int depth, bool hidden)
+        {
+            foreach (var childGridVM in initialGridVMs.Where(r => r.Resource.GetResourcePropertyValue(KnownProperties.Resource.ParentName) == resource.Name))
+            {
+                childGridVM.Depth = depth;
+                childGridVM.IsCollapsed = isCollapsed(childGridVM.Resource);
+                childGridVM.IsHidden = hidden;
+
+                parent.Children.Add(childGridVM);
+                gridViewModels.Add(childGridVM);
+
+                AddChildViewModel(childGridVM.Resource, childGridVM, depth + 1, hidden: childGridVM.IsHidden || childGridVM.IsCollapsed);
+            }
+        }
+    }
 }

src/Aspire.Dashboard/Model/ResourceViewModel.cs

@@ -66,6 +66,19 @@ internal bool MatchesFilter(string filter)
         return Name.Contains(filter, StringComparisons.UserTextSearch);
     }
 
+    public string? GetResourcePropertyValue(string propertyName)
+    {
+        if (Properties.TryGetValue(propertyName, out var value))
+        {
+            if (value.Value.TryConvertToString(out var s))
+            {
+                return s;
+            }
+        }
+
+        return null;
+    }
+
     internal static HealthStatus? ComputeHealthStatus(ImmutableArray<HealthReportViewModel> healthReports, KnownResourceState? state)
     {
         if (state != KnownResourceState.Running)