Migrate Grid OData examples to v3.0 (#155)

dimodi · Dimo Dimov · marin-bratanov · web-flow · commit be5865d512e8 · 2022-02-20T19:19:51.000+02:00
* Migrate Grid OData examples to v3.0

* chore(grid): revert to 3.1 wasm server ref

Co-authored-by: Dimo Dimov &lt;dimo@Dimos-MacBook-Pro.local&gt;
Co-authored-by: Marin Bratanov &lt;m.bratanov@gmail.com&gt;
diff --git a/grid/odata/ServerApp/Pages/Index.razor b/grid/odata/ServerApp/Pages/Index.razor
@@ -3,15 +3,14 @@
 @inject ODataOrdersService OrdersService
 @using ServerApp.Data
 
-<TelerikGrid Data=@GridDataOrders
+<TelerikGrid TItem="@ODataOrder"
+             OnRead="@ReadOrders"
              Height="460px"
              RowHeight="60"
              PageSize="10"
              Pageable="true"
              Sortable="true"
-             FilterMode="@GridFilterMode.FilterRow"
-             OnRead=@ReadOrders
-             TotalCount=@TotalOrders>
+             FilterMode="@GridFilterMode.FilterRow">
     <GridColumns>
         <GridColumn Field="OrderID" />
         <GridColumn Field="ShipName" />
@@ -20,15 +19,11 @@
 </TelerikGrid>
 
 @code{
-    public List<ODataOrder> GridDataOrders { get; set; } = new List<ODataOrder>();
-
-    public int TotalOrders { get; set; } = 0;
-
     protected async Task ReadOrders(GridReadEventArgs args)
     {
         ODataOrdersResponse data = await OrdersService.GetOrders(args.Request);
 
-        GridDataOrders = data.Orders;
-        TotalOrders = data.Total;
+        args.Data = data.Orders;
+        args.Total = data.Total;
     }
-}
+}
diff --git a/grid/odata/ServerApp/Pages/_Host.cshtml b/grid/odata/ServerApp/Pages/_Host.cshtml
@@ -11,8 +11,9 @@
     <base href="~/" />
     <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css" />
     <link href="css/site.css" rel="stylesheet" />
-    <link rel="stylesheet" href="https://unpkg.com/@@progress/kendo-theme-default@@latest/dist/all.css" />
-    <script src="_content/telerik.ui.for.blazor/js/telerik-blazor.js" defer></script>
+
+    <link rel="stylesheet" href="_content/Telerik.UI.for.Blazor/css/kendo-theme-default/all.css" />
+    <script src="_content/Telerik.UI.for.Blazor/js/telerik-blazor.js" defer></script>
 </head>
 <body>
     <app>@(await Html.RenderComponentAsync<App>(RenderMode.ServerPrerendered))</app>
diff --git a/grid/odata/ServerApp/ServerApp.csproj b/grid/odata/ServerApp/ServerApp.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Telerik.UI.for.Blazor" Version="2.20.0" />
+    <PackageReference Include="Telerik.UI.for.Blazor" Version="3.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/grid/odata/WasmApp/Client/Pages/Index.razor b/grid/odata/WasmApp/Client/Pages/Index.razor
@@ -5,15 +5,14 @@
 @using WasmApp.Shared
 @inject HttpClient Http
 
-<TelerikGrid Data=@GridData
+<TelerikGrid TItem="@ODataProduct"
+             OnRead="@ReadItems"
              Height="460px"
              RowHeight="60"
              PageSize="10"
              Pageable="true"
              Sortable="true"
-             FilterMode="@GridFilterMode.FilterRow"
-             OnRead=@ReadItems
-             TotalCount=@Total>
+             FilterMode="@GridFilterMode.FilterRow">
     <GridColumns>
         <GridColumn Field="ProductID" />
         <GridColumn Field="ProductName" />
@@ -22,18 +21,15 @@
 </TelerikGrid>
 
 @code{
-    public List<ODataProduct> GridData { get; set; } = new List<ODataProduct>();
-    public int Total { get; set; } = 0;
-
-    protected async Task ReadItems(GridReadEventArgs args)
+    async Task ReadItems(GridReadEventArgs args)
     {
         var baseUrl = "https://demos.telerik.com/kendo-ui/service-v4/odata/Products?";
 
         var requestUrl = $"{baseUrl}{args.Request.ToODataString()}";
 
         ODataResponseOrders response = await Http.GetFromJsonAsync<ODataResponseOrders>(requestUrl);
 
-        GridData = response.Products;
-        Total = response.Total;
+        args.Data = response.Products;
+        args.Total = response.Total;
     }
-}
+}
diff --git a/grid/odata/WasmApp/Client/WasmApp.Client.csproj b/grid/odata/WasmApp/Client/WasmApp.Client.csproj
@@ -10,7 +10,7 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" PrivateAssets="all" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.1" PrivateAssets="all" />
         <PackageReference Include="System.Net.Http.Json" Version="3.2.1" />
-        <PackageReference Include="Telerik.UI.for.Blazor" Version="2.20.0" />
+        <PackageReference Include="Telerik.UI.for.Blazor" Version="3.0.1" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Shared\WasmApp.Shared.csproj" />
diff --git a/grid/odata/WasmApp/Client/wwwroot/index.html b/grid/odata/WasmApp/Client/wwwroot/index.html
@@ -7,8 +7,9 @@
     <base href="/" />
     <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet" />
     <link href="css/site.css" rel="stylesheet" />
-    <link rel="stylesheet" href="https://unpkg.com/@progress/kendo-theme-default@latest/dist/all.css" />
-    <script src="_content/telerik.ui.for.blazor/js/telerik-blazor.js" defer></script>
+
+    <link rel="stylesheet" href="_content/Telerik.UI.for.Blazor/css/kendo-theme-default/all.css" />
+    <script src="_content/Telerik.UI.for.Blazor/js/telerik-blazor.js" defer></script>
 </head>
 <body>
     <app>Loading...</app>
diff --git a/grid/odata/WasmApp/Server/Startup.cs b/grid/odata/WasmApp/Server/Startup.cs
@@ -3,7 +3,6 @@
 using Microsoft.AspNetCore.ResponseCompression;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Newtonsoft.Json.Serialization;
 using System.Linq;
 
 namespace WasmApp.Server
@@ -24,7 +23,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
-                app.UseWebAssemblyDebugging();
             }
             else
             {
@@ -34,7 +32,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             }
 
             app.UseHttpsRedirection();
-            app.UseBlazorFrameworkFiles();
             app.UseStaticFiles();
 
             app.UseRouting();

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`using Microsoft.AspNetCore.ResponseCompression;`
`4`	`4`	`using Microsoft.Extensions.DependencyInjection;`
`5`	`5`	`using Microsoft.Extensions.Hosting;`
`6`		`-using Newtonsoft.Json.Serialization;`
`7`	`6`	`using System.Linq;`
`8`	`7`
`9`	`8`	`namespace WasmApp.Server`
`@@ -24,7 +23,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)`
`24`	`23`	`if (env.IsDevelopment())`
`25`	`24`	`{`
`26`	`25`	`app.UseDeveloperExceptionPage();`
`27`		`- app.UseWebAssemblyDebugging();`
`28`	`26`	`}`
`29`	`27`	`else`
`30`	`28`	`{`
`@@ -34,7 +32,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)`
`34`	`32`	`}`
`35`	`33`
`36`	`34`	`app.UseHttpsRedirection();`
`37`		`- app.UseBlazorFrameworkFiles();`
`38`	`35`	`app.UseStaticFiles();`
`39`	`36`
`40`	`37`	`app.UseRouting();`