Fix mission order

equinor · Oct 19, 2023 · a3e9e87 · a3e9e87
1 parent 22e76a8
commit a3e9e87
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/backend/api/Services/SortingService.cs b/backend/api/Services/SortingService.cs
@@ -9,9 +9,6 @@ public class SortingService
     {
         public static void ApplySort<T>(ref IQueryable<T> missions, string orderByQueryString) where T : SortableRecord
         {
-            if (!missions.Any())
-                return;
-
             if (string.IsNullOrWhiteSpace(orderByQueryString))
             {
                 missions = missions.OrderBy(x => x.Name);

diff --git a/backend/api/Utilities/PagedList.cs b/backend/api/Utilities/PagedList.cs
@@ -33,14 +33,8 @@ public static async Task<PagedList<T>> ToPagedListAsync(
             int pageSize
         )
         {
-            // Adding order by constant value 1, which does not change order of rows
-            // but stops the runtime warning
             int totalCount = await source.CountAsync();
-            List<T> items;
-            if (source.Expression.Type is IOrderedQueryable)
-                items = await source.Skip((pageNumber - 1) * pageSize).Take(pageSize).ToListAsync();
-            else
-                items = await source.OrderBy(x => 1).Skip((pageNumber - 1) * pageSize).Take(pageSize).ToListAsync();
+            var items = await source.Skip((pageNumber - 1) * pageSize).Take(pageSize).ToListAsync();
             return new PagedList<T>(items, pageNumber, pageSize, totalCount);
         }
     }