chore: update launch settings and refactor sorting

telerik · Nov 28, 2022 · 57b8749 · 57b8749
1 parent 1104afc
commit 57b8749
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/core/KendoCoreService/Extensions/SortingExtension.cs b/core/KendoCoreService/Extensions/SortingExtension.cs
@@ -17,9 +17,6 @@ public static IQueryable<T> Sort<T>(this IQueryable<T> data, List<Sort> sorts)
 
             foreach (var sort in sorts)
             {
-                var propInfo = CommonExtension.GetPropertyInfo(typeof(T), sort.Field);
-                var expr = ExpressionExtension.BuildLambda(typeof(T), propInfo);
-
                 string methodName = string.Empty;
 
                 if (isFirst)
@@ -32,21 +29,23 @@ public static IQueryable<T> Sort<T>(this IQueryable<T> data, List<Sort> sorts)
                     methodName = sort.Dir == "asc" ? "ThenBy" : "ThenByDescending";
                 }
 
-                var method = typeof(Queryable).GetMethods().FirstOrDefault(m => m.Name == methodName && m.GetParameters().Length == 2);
-                var genericMethod = method.MakeGenericMethod(typeof(T), propInfo.PropertyType);
-
-                data = (IQueryable<T>)genericMethod.Invoke(null, new object[] { data, expr });
+                data = data.ApplySort(methodName, sort.Field);
             }
 
             return data;
         }
 
         public static IQueryable<T> GroupSort<T>(this IQueryable<T> data, string dir)
         {
-            var propInfo = CommonExtension.GetPropertyInfo(typeof(T), "Key");
-            var expr = ExpressionExtension.BuildLambda(typeof(T), propInfo);
             var methodName = dir == "asc" ? "OrderBy" : "OrderByDescending";
 
+            return data.ApplySort(methodName, "Key");
+        }
+
+        private static IQueryable<T> ApplySort<T>(this IQueryable<T> data, string methodName, string field)
+        {
+            var propInfo = CommonExtension.GetPropertyInfo(typeof(T), field);
+            var expr = ExpressionExtension.BuildLambda(typeof(T), propInfo);
 
             var method = typeof(Queryable).GetMethods().FirstOrDefault(m => m.Name == methodName && m.GetParameters().Length == 2);
             var genericMethod = method.MakeGenericMethod(typeof(T), propInfo.PropertyType);

diff --git a/core/KendoCoreService/Properties/launchSettings.json b/core/KendoCoreService/Properties/launchSettings.json
@@ -12,17 +12,15 @@
     "KendoCoreService": {
       "commandName": "Project",
       "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "weatherforecast",
+      "launchBrowser": false,
       "applicationUrl": "https://localhost:7099;http://localhost:5099",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
     "IIS Express": {
       "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "weatherforecast",
+      "launchBrowser": false,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }