From ae37c634ef6fc28c604bcbb0da40fe603f5d173b Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 2 Aug 2016 18:45:25 -0400 Subject: [PATCH] sort sites and folders --- src/App/Pages/Settings/SettingsListFoldersPage.cs | 2 +- src/App/Pages/Vault/VaultListSitesPage.cs | 4 ++-- src/iOS.Extension/SiteListViewController.cs | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/App/Pages/Settings/SettingsListFoldersPage.cs b/src/App/Pages/Settings/SettingsListFoldersPage.cs index e77190c1c..608a80072 100644 --- a/src/App/Pages/Settings/SettingsListFoldersPage.cs +++ b/src/App/Pages/Settings/SettingsListFoldersPage.cs @@ -51,7 +51,7 @@ namespace Bit.App.Pages private async Task LoadFoldersAsync() { var folders = await _folderService.GetAllAsync(); - var pageFolders = folders.Select(f => new SettingsFolderPageModel(f)); + var pageFolders = folders.Select(f => new SettingsFolderPageModel(f)).OrderBy(f => f.Name); Folders.ResetWithRange(pageFolders); } diff --git a/src/App/Pages/Vault/VaultListSitesPage.cs b/src/App/Pages/Vault/VaultListSitesPage.cs index 4db32ddc9..7ed1f6bbd 100644 --- a/src/App/Pages/Vault/VaultListSitesPage.cs +++ b/src/App/Pages/Vault/VaultListSitesPage.cs @@ -201,8 +201,8 @@ namespace Bit.App.Pages var folders = await foldersTask; var sites = await sitesTask; - Folders = folders.Select(f => new VaultListPageModel.Folder(f)); - Sites = sites.Select(s => new VaultListPageModel.Site(s)); + Folders = folders.Select(f => new VaultListPageModel.Folder(f)).OrderBy(s => s.Name); + Sites = sites.Select(s => new VaultListPageModel.Site(s)).OrderBy(s => s.Name).ThenBy(s => s.Username); FilterResults(Search.Text); }); diff --git a/src/iOS.Extension/SiteListViewController.cs b/src/iOS.Extension/SiteListViewController.cs index 2de16391b..1fc8676c3 100644 --- a/src/iOS.Extension/SiteListViewController.cs +++ b/src/iOS.Extension/SiteListViewController.cs @@ -100,6 +100,7 @@ namespace Bit.iOS.Extension var siteModels = sites.Select(s => new SiteViewModel(s)); _tableItems = siteModels .Where(s => s.Domain != null && s.Domain.BaseDomain == _context.DomainName.BaseDomain) + .OrderBy(s => s.Name).ThenBy(s => s.Username) .ToList(); } }