Update Sample project (#382)

Author: AlekseyMartynov

net/Sample/Controllers/NorthwindController.cs

@@ -19,7 +19,7 @@ public NorthwindController(NorthwindContext nwind) {
         }
 
         [HttpGet("orders")]
-        public async Task<object>Orders(DataSourceLoadOptions loadOptions) {
+        public async Task<IActionResult> Orders(DataSourceLoadOptions loadOptions) {
             var source = _nwind.Orders.Select(o => new {
                 o.OrderId,
                 o.CustomerId,
@@ -33,44 +33,45 @@ public async Task<object>Orders(DataSourceLoadOptions loadOptions) {
             loadOptions.PrimaryKey = new[] { "OrderId" };
             loadOptions.PaginateViaPrimaryKey = true;
 
-            return await DataSourceLoader.LoadAsync(source, loadOptions);
+            return Json(await DataSourceLoader.LoadAsync(source, loadOptions));
         }
 
         [HttpGet("order-details")]
-        public async Task<object> OrderDetails(int orderId, DataSourceLoadOptions options) {
-            return await DataSourceLoader.LoadAsync(
-                from i in _nwind.OrderDetails
-                where i.OrderId == orderId
-                select new {
+        public async Task<IActionResult> OrderDetails(int orderId, DataSourceLoadOptions loadOptions) {
+            var source = _nwind.OrderDetails
+                .Where(i => i.OrderId == orderId)
+                .Select(i => new {
                     Product = i.Product.ProductName,
                     Price = i.UnitPrice,
-                    Quantity = i.Quantity,
+                    i.Quantity,
                     Sum = i.UnitPrice * i.Quantity
-                },
-                options
-            );
+                });
+
+            return Json(await DataSourceLoader.LoadAsync(source, loadOptions));
         }
 
         [HttpGet("customers-lookup")]
-        public async Task<object> CustomersLookup(DataSourceLoadOptions options) {
-            return await DataSourceLoader.LoadAsync(
-                from c in _nwind.Customers orderby c.CompanyName select new {
+        public async Task<object> CustomersLookup(DataSourceLoadOptions loadOptions) {
+            var source = _nwind.Customers
+                .OrderBy(c => c.CompanyName)
+                .Select(c => new {
                     Value = c.CustomerId,
                     Text = $"{c.CompanyName} ({c.Country})"
-                },
-                options
-            );
+                });
+
+            return Json(await DataSourceLoader.LoadAsync(source, loadOptions));
         }
 
         [HttpGet("shippers-lookup")]
-        public async Task<object> ShippersLookup(DataSourceLoadOptions options) {
-            return await DataSourceLoader.LoadAsync(
-                from s in _nwind.Shippers orderby s.CompanyName select new {
+        public async Task<object> ShippersLookup(DataSourceLoadOptions loadOptions) {
+            var source = _nwind.Shippers
+                .OrderBy(s => s.CompanyName)
+                .Select(s => new {
                     Value = s.ShipperId,
                     Text = s.CompanyName
-                },
-                options
-            );
+                });
+
+            return Json(await DataSourceLoader.LoadAsync(source, loadOptions));
         }
 
         [HttpPut("update-order")]
@@ -116,15 +117,15 @@ public async Task<IActionResult> DeleteOrder(int key) {
         }
 
         [HttpGet("products")]
-        public async Task<object> Products(DataSourceLoadOptions loadOptions) {
-            var projection = _nwind.Products.Select(p => new {
+        public async Task<IActionResult> Products(DataSourceLoadOptions loadOptions) {
+            var source = _nwind.Products.Select(p => new {
                 p.ProductId,
                 p.ProductName,
                 p.Category.CategoryName,
                 p.UnitPrice
             });
 
-            return await DataSourceLoader.LoadAsync(projection, loadOptions);
+            return Json(await DataSourceLoader.LoadAsync(source, loadOptions));
         }
 
     }

net/Sample/Program.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Logging;
 
 namespace Sample {
     public class Program {
@@ -13,6 +14,7 @@ public static void Main(string[] args) {
                 .UseContentRoot(Directory.GetCurrentDirectory())
                 .UseIISIntegration()
                 .UseStartup<Startup>()
+                .ConfigureLogging(logging => logging.AddConsole())
                 .Build();
 
             host.Run();

net/Sample/Sample.csproj

@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\DevExtreme.AspNet.Data\DevExtreme.AspNet.Data.csproj" />
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
   <!-- https://github.com/dotnet/sdk/issues/1055#issuecomment-292792445 -->

net/Sample/Startup.cs

@@ -5,7 +5,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using Sample.Models;
 
 namespace Sample {
@@ -24,8 +23,7 @@ public void ConfigureServices(IServiceCollection services) {
                 );
         }
 
-        public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) {
-            loggerFactory.AddConsole(LogLevel.Information);
+        public void Configure(IApplicationBuilder app) {
             app.UseMvc();
             app.UseStaticFiles();
         }

net/Sample/Views/Home/Index.cshtml

@@ -91,7 +91,8 @@
                                 loadUrl: "@Url.Action("OrderDetails", "Northwind")",
                                 loadParams: { orderId: options.data.orderId }
                             }),
-                            remoteOperations: true
+                            remoteOperations: true,
+                            showBorders: true
                         })
                         .appendTo(container);
                 }

net/Sample/bower.json

@@ -2,7 +2,7 @@
     "name": "Sample",
     "private": true,
     "dependencies": {
-        "devextreme": "~18.1.0",
-        "jquery": "3.1.1"
+        "devextreme": "~19.1.0",
+        "jquery": "3.4.1"
     }
 }