From 36e3eeecaac184bc3dbea4a4fd3709277372dd29 Mon Sep 17 00:00:00 2001
From: Umar Bolatov <bolatovumar@gmail.com>
Date: Sun, 19 Jul 2020 14:22:26 -0700
Subject: [PATCH 1/2] Allow sorting apps by store, name or app type

close #1568
---
 BTCPayServer/Controllers/AppsController.cs | 35 ++++++++++++++++-
 BTCPayServer/Views/Apps/ListApps.cshtml    | 45 ++++++++++++++++++++--
 2 files changed, 76 insertions(+), 4 deletions(-)

diff --git a/BTCPayServer/Controllers/AppsController.cs b/BTCPayServer/Controllers/AppsController.cs
index 45496f7ee..ef756f1b1 100644
--- a/BTCPayServer/Controllers/AppsController.cs
+++ b/BTCPayServer/Controllers/AppsController.cs
@@ -47,9 +47,42 @@ namespace BTCPayServer.Controllers
 
         public string CreatedAppId { get; set; }
 
-        public async Task<IActionResult> ListApps()
+        public async Task<IActionResult> ListApps(
+            string sortOrder = null,
+            string sortOrderColumn = null
+        )
         {
             var apps = await _AppService.GetAllApps(GetUserId());
+
+            if (sortOrder != null && sortOrderColumn != null) 
+            {
+                apps = apps.OrderByDescending(app => 
+                    {
+                        switch (sortOrderColumn)
+                        {
+                            case "Name":
+                                return app.AppName;
+                            case "Store":
+                                return app.StoreName;
+                            case "AppType":
+                                return app.AppType;
+                            default:
+                                return app.Id;
+                        }
+                    }).ToArray();
+
+                switch (sortOrder)
+                {
+                    case "desc":
+                        ViewData[$"{sortOrderColumn}SortOrder"] = "asc";
+                        break;
+                    case "asc":
+                        apps = apps.Reverse().ToArray();
+                        ViewData[$"{sortOrderColumn}SortOrder"] = "desc";
+                        break;
+                }
+            }
+            
             return View(new ListAppsViewModel()
             {
                 Apps = apps
diff --git a/BTCPayServer/Views/Apps/ListApps.cshtml b/BTCPayServer/Views/Apps/ListApps.cshtml
index a218a312b..51babba39 100644
--- a/BTCPayServer/Views/Apps/ListApps.cshtml
+++ b/BTCPayServer/Views/Apps/ListApps.cshtml
@@ -31,9 +31,48 @@
                 <table class="table table-sm table-responsive-md">
                     <thead>
                         <tr>
-                            <th>Store</th>
-                            <th>Name</th>
-                            <th>App type</th>
+                            <th>
+                                <a
+                                    asp-action="ListApps"
+                                    asp-route-sortOrder="@(ViewData["StoreSortOrder"] ?? "asc")"
+                                    asp-route-sortOrderColumn="Store"
+                                    class="text-nowrap"
+                                    title="@((string)ViewData["StoreSortOrder"] == "desc" ? "Sort by descending..." : "Sort by ascending...")"
+                                >
+                                    Store  @if (ViewData["StoreSortOrder"] != null)
+                                    {
+                                        <span class="fa @((string)ViewData["StoreSortOrder"] == "asc" ? "fa-arrow-down": "fa-arrow-up")" />
+                                    }
+                                </a>
+                            </th>
+                            <th>
+                                <a
+                                    asp-action="ListApps"
+                                    asp-route-sortOrder="@(ViewData["NameSortOrder"] ?? "asc")"
+                                    asp-route-sortOrderColumn="Name"
+                                    class="text-nowrap"
+                                    title="@((string)ViewData["NameSortOrder"] == "desc" ? "Sort by descending..." : "Sort by ascending...")"
+                                >
+                                    Name  @if (ViewData["NameSortOrder"] != null)
+                                    {
+                                        <span class="fa @((string)ViewData["NameSortOrder"] == "asc" ? "fa-arrow-down": "fa-arrow-up")" />
+                                    }
+                                </a>
+                            </th>
+                            <th>
+                                <a
+                                    asp-action="ListApps"
+                                    asp-route-sortOrder="@(ViewData["AppTypeSortOrder"] ?? "asc")"
+                                    asp-route-sortOrderColumn="AppType"
+                                    class="text-nowrap"
+                                    title="@((string)ViewData["AppTypeSortOrder"] == "desc" ? "Sort by descending..." : "Sort by ascending...")"
+                                >
+                                    App Type  @if (ViewData["AppTypeSortOrder"] != null)
+                                    {
+                                        <span class="fa @((string)ViewData["AppTypeSortOrder"] == "asc" ? "fa-arrow-down": "fa-arrow-up")" />
+                                    }
+                                </a>
+                            </th>
                             <th style="text-align:right">Actions</th>
                         </tr>
                     </thead>

From 25527ec1dd99712d438353c4cb9cc9684514f24e Mon Sep 17 00:00:00 2001
From: Umar Bolatov <bolatovumar@gmail.com>
Date: Mon, 20 Jul 2020 20:02:14 -0700
Subject: [PATCH 2/2] Use nameof() instead of strings

---
 BTCPayServer/Controllers/AppsController.cs |  6 +++---
 BTCPayServer/Views/Apps/ListApps.cshtml    | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/BTCPayServer/Controllers/AppsController.cs b/BTCPayServer/Controllers/AppsController.cs
index ef756f1b1..3a788e384 100644
--- a/BTCPayServer/Controllers/AppsController.cs
+++ b/BTCPayServer/Controllers/AppsController.cs
@@ -60,11 +60,11 @@ namespace BTCPayServer.Controllers
                     {
                         switch (sortOrderColumn)
                         {
-                            case "Name":
+                            case nameof(app.AppName):
                                 return app.AppName;
-                            case "Store":
+                            case nameof(app.StoreName):
                                 return app.StoreName;
-                            case "AppType":
+                            case nameof(app.AppType):
                                 return app.AppType;
                             default:
                                 return app.Id;
diff --git a/BTCPayServer/Views/Apps/ListApps.cshtml b/BTCPayServer/Views/Apps/ListApps.cshtml
index 51babba39..4d296f6e6 100644
--- a/BTCPayServer/Views/Apps/ListApps.cshtml
+++ b/BTCPayServer/Views/Apps/ListApps.cshtml
@@ -34,28 +34,28 @@
                             <th>
                                 <a
                                     asp-action="ListApps"
-                                    asp-route-sortOrder="@(ViewData["StoreSortOrder"] ?? "asc")"
-                                    asp-route-sortOrderColumn="Store"
+                                    asp-route-sortOrder="@(ViewData["StoreNameSortOrder"] ?? "asc")"
+                                    asp-route-sortOrderColumn="StoreName"
                                     class="text-nowrap"
-                                    title="@((string)ViewData["StoreSortOrder"] == "desc" ? "Sort by descending..." : "Sort by ascending...")"
+                                    title="@((string)ViewData["StoreNameSortOrder"] == "desc" ? "Sort by descending..." : "Sort by ascending...")"
                                 >
-                                    Store  @if (ViewData["StoreSortOrder"] != null)
+                                    Store  @if (ViewData["StoreNameSortOrder"] != null)
                                     {
-                                        <span class="fa @((string)ViewData["StoreSortOrder"] == "asc" ? "fa-arrow-down": "fa-arrow-up")" />
+                                        <span class="fa @((string)ViewData["StoreNameSortOrder"] == "asc" ? "fa-arrow-down": "fa-arrow-up")" />
                                     }
                                 </a>
                             </th>
                             <th>
                                 <a
                                     asp-action="ListApps"
-                                    asp-route-sortOrder="@(ViewData["NameSortOrder"] ?? "asc")"
-                                    asp-route-sortOrderColumn="Name"
+                                    asp-route-sortOrder="@(ViewData["AppNameSortOrder"] ?? "asc")"
+                                    asp-route-sortOrderColumn="AppName"
                                     class="text-nowrap"
-                                    title="@((string)ViewData["NameSortOrder"] == "desc" ? "Sort by descending..." : "Sort by ascending...")"
+                                    title="@((string)ViewData["AppNameSortOrder"] == "desc" ? "Sort by descending..." : "Sort by ascending...")"
                                 >
-                                    Name  @if (ViewData["NameSortOrder"] != null)
+                                    Name  @if (ViewData["AppNameSortOrder"] != null)
                                     {
-                                        <span class="fa @((string)ViewData["NameSortOrder"] == "asc" ? "fa-arrow-down": "fa-arrow-up")" />
+                                        <span class="fa @((string)ViewData["AppNameSortOrder"] == "asc" ? "fa-arrow-down": "fa-arrow-up")" />
                                     }
                                 </a>
                             </th>