Sorting various lists of extensions and accounts alphabetically (micr…

…osoft#1821)
florelis · Nov 3, 2023 · 3d5b6ca · 3d5b6ca
1 parent 95a44bf
commit 3d5b6ca
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/settings/DevHome.Settings/ViewModels/AccountsViewModel.cs b/settings/DevHome.Settings/ViewModels/AccountsViewModel.cs
@@ -17,8 +17,9 @@ public class AccountsViewModel : ObservableObject
 
     public AccountsViewModel()
     {
-        var devIdProviders = Task.Run(async () => await Application.Current.GetService<IAccountsService>().GetDevIdProviders()).Result;
-        devIdProviders.ToList().ForEach((devIdProvider) =>
+        var devIdProviders = Task.Run(async () => await Application.Current.GetService<IAccountsService>().GetDevIdProviders()).Result.ToList();
+        devIdProviders.Sort((a, b) => string.Compare(a.DisplayName, b.DisplayName, System.StringComparison.OrdinalIgnoreCase));
+        devIdProviders.ForEach((devIdProvider) =>
         {
             AccountsProviders.Add(new AccountsProviderViewModel(devIdProvider));
         });

diff --git a/settings/DevHome.Settings/ViewModels/ExtensionsViewModel.cs b/settings/DevHome.Settings/ViewModels/ExtensionsViewModel.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.ObjectModel;
+using System.Linq;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
@@ -78,6 +79,8 @@ private void DisplaySettings()
             return await extensionService.GetInstalledExtensionsAsync(true);
         }).Result;
 
+        extensionWrappers = extensionWrappers.OrderBy(extensionWrapper => extensionWrapper.Name);
+
         SettingsList.Clear();
 
         foreach (var extensionWrapper in extensionWrappers)

diff --git a/tools/ExtensionLibrary/DevHome.ExtensionLibrary/ViewModels/ExtensionLibraryViewModel.cs b/tools/ExtensionLibrary/DevHome.ExtensionLibrary/ViewModels/ExtensionLibraryViewModel.cs
@@ -76,6 +76,8 @@ private async Task GetInstalledExtensionsAsync()
 
         InstalledPackagesList.Clear();
 
+        extensionWrappers = extensionWrappers.OrderBy(extensionWrapper => extensionWrapper.Name);
+
         foreach (var extensionWrapper in extensionWrappers)
         {
             // Don't show self as an extension.

diff --git a/tools/SetupFlow/DevHome.SetupFlow/ViewModels/AddRepoViewModel.cs b/tools/SetupFlow/DevHome.SetupFlow/ViewModels/AddRepoViewModel.cs
@@ -332,7 +332,7 @@ public void GetExtensions()
 
         var extensions = extensionWrappers.Where(
             extension => extension.HasProviderType(ProviderType.Repository) &&
-            extension.HasProviderType(ProviderType.DeveloperId));
+            extension.HasProviderType(ProviderType.DeveloperId)).OrderBy(extensionWrapper => extensionWrapper.Name);
 
         _providers = new RepositoryProviders(extensions);