Correct Sorting for all types

FMS.Domain/Dto/Facility/FacilitySpec.cs

@@ -7,7 +7,9 @@ namespace FMS.Domain.Dto
 {
     public class FacilitySpec
     {
-        public FacilitySort SortBy { get; set; } = FacilitySort.Name;
+        public FacilitySort SortBy { get; set; } = FacilitySort.Name;
+
+        public bool FirstPass { get; set; } = true;
 
         [Display(Name = "Facility Number")]
         public string FacilityNumber { get; set; }
@@ -115,6 +117,7 @@ public class FacilitySpec
                 {nameof(PostalCode), PostalCode},
                 {nameof(State), State},
                 {nameof(ShowPendingOnly), ShowPendingOnly.ToString()},
+                {nameof(FirstPass), FirstPass.ToString()},
             };
     }
 }

FMS.Infrastructure/Repositories/FacilityRepository.cs

@@ -169,7 +169,6 @@
                 {
                     item.Cabinets = cabinets.GetCabinetsForFile(item.FileLabel);
                 }
-
             }
 
             return items;
@@ -309,7 +308,7 @@
                     if (file == null)
                         throw new ArgumentException($"File Label {facilityUpdates.FileLabel} does not exist.");
                     facility.File = file;
                     facility.FileId = file?.Id;
                 }
             }
 

FMS/Pages/Facilities/Index.cshtml

@@ -164,6 +164,7 @@
                                 <input type="hidden" asp-for="Spec.ShowDeleted" />
                                 <input type="hidden" asp-for="Spec.ShowPendingOnly" />
                                 <input type="hidden" asp-for="Spec.SortBy" />
+                                <input type="hidden" asp-for="Spec.FirstPass" />
                                 <button id="ExportButton" asp-page-handler="ExportButton"
                                         class="btn btn-sm btn-outline-primary mb-1">
                                     Excel Export

FMS/Pages/Facilities/Index.cshtml.cs

@@ -62,22 +62,30 @@ public IndexModel(
 
         public async Task<IActionResult> OnGetAsync()
         {
-            Spec = new FacilitySpec();
+            // First time through search will sort by name,
+            // but for pending RNs will sort by ReceivedDate
+            Spec = new FacilitySpec() { FirstPass = true };
             await PopulateSelectsAsync();
             return Page();
         }
 
         public async Task<IActionResult> OnGetSearchAsync(FacilitySpec spec, [FromQuery] int p = 1)
         {
-            // Get the list of facilities matching the "Spec" criteria.
+
             // Sort by Received Date for Pending Release Notifications
-            spec.SortBy = spec.ShowPendingOnly ? FacilitySort.RNDateReceived : FacilitySort.Name;
+            if (spec.ShowPendingOnly && spec.FirstPass) 
+            {
+                spec.SortBy = FacilitySort.RNDateReceived;
+                spec.FirstPass = false;
+            };
+
+            // Get the list of facilities matching the "Spec" criteria.
             FacilityList = await _repository.GetFacilityPaginatedListAsync(spec, p, GlobalConstants.PageSize);
             Spec = spec;
 
             ShowPendingOnlyCheckBox = await _repositoryType.GetFacilityTypeNameAsync(Spec.FacilityTypeId) == "RN";
 
-            ShowResults = true;
+            ShowResults = true;  
             await PopulateSelectsAsync();
             return Page();
         }