Version 1.0.315

KeyVaultExplorer/ViewModels/FilterService.cs

@@ -15,8 +15,6 @@ public static IList<KvSubscriptionModel> Filter(IList<KvSubscriptionModel> allSu
             return allSubscriptions;
         }
 
-        var filteredSubscriptions = new List<KvSubscriptionModel>();
-
         foreach (var subscription in allSubscriptions)
         {
             var filteredResourceGroups = subscription.ResourceGroups
@@ -40,10 +38,19 @@ public static IList<KvSubscriptionModel> Filter(IList<KvSubscriptionModel> allSu
                     ResourceGroups = new ObservableCollection<KvResourceGroupModel>(filteredResourceGroups)
                 };
 
-                filteredSubscriptions.Add(filteredSubscription);
+                new List<KvSubscriptionModel>().Add(filteredSubscription);
             }
         }
 
-        return filteredSubscriptions;
+        // Sort the filtered results alphabetically
+        var sortedSubscriptions = SortService.SortSubscriptions(new List<KvSubscriptionModel>());
+
+        // Sort the nested collections within each subscription
+        foreach (var subscription in sortedSubscriptions)
+        {
+            SortService.SortSubscriptionTree(subscription);
+        }
+
+        return sortedSubscriptions;
     }
 }

KeyVaultExplorer/ViewModels/KeyVaultTreeListViewModel.cs

@@ -1,5 +1,4 @@
-using Avalonia.Input;
-using Avalonia.Threading;
+using Avalonia.Threading;
 using Azure.Core;
 using Azure.ResourceManager;
 using Azure.ResourceManager.KeyVault;
@@ -9,9 +8,6 @@
 using KeyVaultExplorer.Models;
 using KeyVaultExplorer.Services;
 using System;
-using System.Buffers;
-using System.Collections;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
@@ -118,6 +114,8 @@ await DelaySetIsBusy(async () =>
                         quickAccess.ResourceGroups[0].KeyVaultResources.Add(kvrResponse);
                         quickAccess.PropertyChanged += KvSubscriptionModel_PropertyChanged;
                     }
+                    quickAccess.ResourceGroups[0].KeyVaultResources = SortService.SortKeyVaults(quickAccess.ResourceGroups[0].KeyVaultResources);
+
                     quickAccess.ResourceGroups[0].ResourceGroupDisplayName = "Pinned";
                     quickAccess.ResourceGroups[0].IsExpanded = true;
 
@@ -139,6 +137,7 @@ await DelaySetIsBusy(async () =>
         var searched = await Task.Run(() =>
         {
             return new ObservableCollection<KvSubscriptionModel>(_treeViewList);
+            return SortService.SortSubscriptions(_treeViewList);
         });
         Dispatcher.UIThread.Post(() => {
             TreeViewList = searched;
@@ -190,6 +189,10 @@ public async Task PinVaultToQuickAccess(KeyVaultResource model)
         await _dbContext.InsertQuickAccessItemAsync(qa);
 
         TreeViewList[0].ResourceGroups[0].KeyVaultResources.Add(model);
+
+        // Sort the quick access key vaults alphabetically
+        TreeViewList[0].ResourceGroups[0].KeyVaultResources = SortService.SortKeyVaults(TreeViewList[0].ResourceGroups[0].KeyVaultResources);
+
         var quickAccess = new KvSubscriptionModel
         {
             SubscriptionDisplayName = "Quick Access",
@@ -251,6 +254,9 @@ await DelaySetIsBusy(async () =>
                         {
                             kvResourceModel.KeyVaultResources.Add(vault);
                         }
+
+                        // Sort the key vaults alphabetically
+                        kvResourceModel.KeyVaultResources = SortService.SortKeyVaults(kvResourceModel.KeyVaultResources);
                     });
                 }, DispatcherPriority.ContextIdle);
             }
@@ -291,6 +297,10 @@ await DelaySetIsBusy(async () =>
                                     KeyVaultResources = [placeholder]
                                 });
                         }
+
+                        // Sort the resource groups alphabetically
+                        kvSubModel.ResourceGroups = SortService.SortResourceGroups(kvSubModel.ResourceGroups);
+
                         kvSubModel.HasSubNodeDataBeenFetched = true;
                         kvSubModel.ResourceGroups.CollectionChanged += TreeViewSubNode_CollectionChanged;
                     });

KeyVaultExplorer/ViewModels/SortService.cs

@@ -0,0 +1,58 @@
+using Azure.ResourceManager.KeyVault;
+using KeyVaultExplorer.Models;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace KeyVaultExplorer.ViewModels;
+
+public static class SortService
+{
+    /// <summary>
+    /// Sorts key vaults alphabetically by name
+    /// </summary>
+    public static ObservableCollection<KeyVaultResource> SortKeyVaults(IEnumerable<KeyVaultResource> keyVaults)
+    {
+        var sorted = keyVaults.OrderBy(kv => kv.HasData ? kv.Data.Name : string.Empty);
+        return new ObservableCollection<KeyVaultResource>(sorted);
+    }
+
+    /// <summary>
+    /// Sorts resource groups alphabetically by display name
+    /// </summary>
+    public static ObservableCollection<KvResourceGroupModel> SortResourceGroups(IEnumerable<KvResourceGroupModel> resourceGroups)
+    {
+        var sorted = resourceGroups.OrderBy(rg => rg.ResourceGroupDisplayName ?? string.Empty);
+        return new ObservableCollection<KvResourceGroupModel>(sorted);
+    }
+
+    /// <summary>
+    /// Sorts subscriptions alphabetically by display name, keeping "Quick Access" at the top
+    /// </summary>
+    public static ObservableCollection<KvSubscriptionModel> SortSubscriptions(IEnumerable<KvSubscriptionModel> subscriptions)
+    {
+        var subscriptionsList = subscriptions.ToList();
+
+        var quickAccess = subscriptionsList.Where(s => s.SubscriptionDisplayName == "Quick Access").ToList();
+        var regularSubscriptions = subscriptionsList.Where(s => s.SubscriptionDisplayName != "Quick Access").ToList();
+
+        var sortedRegular = regularSubscriptions.OrderBy(s => s.SubscriptionDisplayName ?? string.Empty);
+
+        var result = new List<KvSubscriptionModel>();
+        result.AddRange(quickAccess);
+        result.AddRange(sortedRegular);
+
+        return new ObservableCollection<KvSubscriptionModel>(result);
+    }
+    /// <summary>
+    /// Sorts an entire subscription model tree, including all nested collections
+    /// </summary>
+    public static void SortSubscriptionTree(KvSubscriptionModel subscription)
+    {
+        subscription.ResourceGroups = SortResourceGroups(subscription.ResourceGroups);
+        foreach (var resourceGroup in subscription.ResourceGroups)
+        {
+            resourceGroup.KeyVaultResources = SortKeyVaults(resourceGroup.KeyVaultResources);
+        }
+    }
+}