Merge pull request #5 from fouadgm/feature/net-core-31

.NET Core 3.1, EF LINQ performance, Library updates

Author: DavidSuescunPelegay

src/jQueryDatatableServerSideNetCore/Controllers/TestRegistersController.cs

@@ -33,7 +33,8 @@ public async Task<IActionResult> LoadTable([FromBody]DtParameters dtParameters)
         {
             var searchBy = dtParameters.Search?.Value;
 
-            var orderCriteria = string.Empty;
+            // if we have an empty search then just order the results by Id ascending
+            var orderCriteria = "Id";
             var orderAscendingDirection = true;
 
             if (dtParameters.Order != null)
@@ -42,14 +43,8 @@ public async Task<IActionResult> LoadTable([FromBody]DtParameters dtParameters)
                 orderCriteria = dtParameters.Columns[dtParameters.Order[0].Column].Data;
                 orderAscendingDirection = dtParameters.Order[0].Dir.ToString().ToLower() == "asc";
             }
-            else
-            {
-                // if we have an empty search then just order the results by Id ascending
-                orderCriteria = "Id";
-                orderAscendingDirection = true;
-            }
 
-            var result = await _context.TestRegisters.ToListAsync();
+            var result = _context.TestRegisters.AsQueryable();
 
             if (!string.IsNullOrEmpty(searchBy))
             {
@@ -60,25 +55,24 @@ public async Task<IActionResult> LoadTable([FromBody]DtParameters dtParameters)
                                            r.Phone != null && r.Phone.ToUpper().Contains(searchBy.ToUpper()) ||
                                            r.ZipCode != null && r.ZipCode.ToUpper().Contains(searchBy.ToUpper()) ||
                                            r.Country != null && r.Country.ToUpper().Contains(searchBy.ToUpper()) ||
-                                           r.Notes != null && r.Notes.ToUpper().Contains(searchBy.ToUpper()))
-                    .ToList();
+                                           r.Notes != null && r.Notes.ToUpper().Contains(searchBy.ToUpper()));
             }
 
-            result = orderAscendingDirection ? result.AsQueryable().OrderByDynamic(orderCriteria, DtOrderDir.Asc).ToList() : result.AsQueryable().OrderByDynamic(orderCriteria, DtOrderDir.Desc).ToList();
+            result = orderAscendingDirection ? result.OrderByDynamic(orderCriteria, DtOrderDir.Asc) : result.OrderByDynamic(orderCriteria, DtOrderDir.Desc);
 
             // now just get the count of items (without the skip and take) - eg how many could be returned with filtering
-            var filteredResultsCount = result.Count();
+            var filteredResultsCount = await result.CountAsync();
             var totalResultsCount = await _context.TestRegisters.CountAsync();
 
-            return Json(new
+            return Json(new DtResult<TestRegister>
             {
-                draw = dtParameters.Draw,
-                recordsTotal = totalResultsCount,
-                recordsFiltered = filteredResultsCount,
-                data = result
+                Draw = dtParameters.Draw,
+                RecordsTotal = totalResultsCount,
+                RecordsFiltered = filteredResultsCount,
+                Data = await result
                     .Skip(dtParameters.Start)
                     .Take(dtParameters.Length)
-                    .ToList()
+                    .ToListAsync()
             });
         }
 

src/jQueryDatatableServerSideNetCore/Models/AuxiliaryModels/DatatableModels.cs

@@ -33,11 +33,18 @@ public class DtResult<T>
         /// <summary>
         /// The data to be displayed in the table.
         /// This is an array of data source objects, one for each row, which will be used by DataTables.
-        /// Note that this parameter's name can be changed using the ajaxDT option's dataSrc property.
+        /// Note that this parameter's name can be changed using the ajax option's dataSrc property.
         /// </summary>
         [JsonProperty("data")]
         public IEnumerable<T> Data { get; set; }
 
+        /// <summary>
+        /// Optional: If an error occurs during the running of the server-side processing script, you can inform the user of this error by passing back the error message to be displayed using this parameter.
+        /// Do not include if there is no error.
+        /// </summary>
+        [JsonProperty("error", NullValueHandling = NullValueHandling.Ignore)]
+        public string Error { get; set; }
+
         public string PartialView { get; set; }
     }
 
@@ -59,11 +66,19 @@ public abstract class DtRow
         public virtual string DtRowClass => null;
 
         /// <summary>
-        /// Add this data property to the row's dt-tag tr node allowing abstract data to be added to the node, using the HTML5 data-* attributes.
-        /// This uses the jQuery data() method to set the data, which can also then be used for later retrieval (for example on a click event).
+        /// Add the data contained in the object to the row using the jQuery data() method to set the data, which can also then be used for later retrieval (for example on a click event).
         /// </summary>
         [JsonProperty("DT_RowData")]
         public virtual object DtRowData => null;
+
+        /// <summary>
+        /// Add the data contained in the object to the row dt-tag tr node as attributes.
+        /// The object keys are used as the attribute keys and the values as the corresponding attribute values.
+        /// This is performed using using the jQuery param() method.
+        /// Please note that this option requires DataTables 1.10.5 or newer.
+        /// </summary>
+        [JsonProperty("DT_RowAttr")]
+        public virtual object DtRowAttr => null;
     }
 
     /// <summary>
@@ -147,7 +162,7 @@ public class DtColumn
         public bool Orderable { get; set; }
 
         /// <summary>
-        /// Specific search value.
+        /// Search value to apply to this specific column.
         /// </summary>
         public DtSearch Search { get; set; }
     }

src/jQueryDatatableServerSideNetCore/jQueryDatatableServerSideNetCore.csproj

@@ -1,18 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <UserSecretsId>aspnet-jQueryDatatableServerSideNetCore-F30D421D-7C39-47E7-8247-3E3BE3C0B128</UserSecretsId>
   </PropertyGroup>
 
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="3.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="3.1.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.6">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="RandomGen" Version="1.1.4" />
   </ItemGroup>
 

src/jQueryDatatableServerSideNetCore/wwwroot/lib/bootstrap/LICENSE

@@ -1,7 +1,7 @@
 The MIT License (MIT)
 
-Copyright (c) 2011-2018 Twitter, Inc.
-Copyright (c) 2011-2018 The Bootstrap Authors
+Copyright (c) 2011-2020 Twitter, Inc.
+Copyright (c) 2011-2020 The Bootstrap Authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal