From 8aa3dd9f23d25596368475e130927596bdb72fde Mon Sep 17 00:00:00 2001
From: Dave Thaler <dthaler1968@gmail.com>
Date: Tue, 8 Oct 2024 18:40:34 -0700
Subject: [PATCH] Fix node sort order on dashboard

Signed-off-by: Dave Thaler <dthaler1968@gmail.com>
---
 OrcanodeMonitor/Pages/Index.cshtml    | 8 ++++----
 OrcanodeMonitor/Pages/Index.cshtml.cs | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/OrcanodeMonitor/Pages/Index.cshtml b/OrcanodeMonitor/Pages/Index.cshtml
index 018e75d..39962df 100644
--- a/OrcanodeMonitor/Pages/Index.cshtml
+++ b/OrcanodeMonitor/Pages/Index.cshtml
@@ -11,8 +11,8 @@
     </p>
     <table>
         <tr>
-            <th>Location</th>
             <th>Type</th>
+            <th>Location</th>
             <!--
             <th>Latest recorded</th>
             <th>Latest uploaded</th>
@@ -33,12 +33,12 @@
     @foreach (Models.Orcanode item in Model.Nodes)
     {
         <tr>
-            <td title="@Html.DisplayFor(modelItem => item.DataplicityDescription)">
-                @Html.DisplayFor(modelItem => item.DisplayName)
-            </td>
             <td>
                 @Html.DisplayFor(modelItem => item.Type)
             </td>
+            <td title="@Html.DisplayFor(modelItem => item.DataplicityDescription)">
+                @Html.DisplayFor(modelItem => item.DisplayName)
+            </td>
             <!--
             <td>
                 @Html.DisplayFor(modelItem => item.LatestRecordedLocal)
diff --git a/OrcanodeMonitor/Pages/Index.cshtml.cs b/OrcanodeMonitor/Pages/Index.cshtml.cs
index 05593f5..4697c32 100644
--- a/OrcanodeMonitor/Pages/Index.cshtml.cs
+++ b/OrcanodeMonitor/Pages/Index.cshtml.cs
@@ -93,7 +93,8 @@ public async Task OnGetAsync()
             _nodes = nodes.Where(n => n.DataplicityConnectionStatus != OrcanodeOnlineStatus.Absent ||
                                           n.OrcasoundStatus != OrcanodeOnlineStatus.Absent ||
                                           n.S3StreamStatus != OrcanodeOnlineStatus.Absent)
-                              .OrderBy(n => n.DisplayName)
+                              .OrderByDescending(n => n.Type)
+                              .ThenBy(n => n.DisplayName)
                               .ToList();
         }
     }