Migrate Grid PDF export example to v3.0 (#159)

dimodi · Dimo Dimov · web-flow · commit 88e88f948457 · 2022-02-20T20:34:25.000+02:00
Co-authored-by: Dimo Dimov &lt;dimo@Dimos-MacBook-Pro.local&gt;
diff --git a/grid/pdf-export-server/Client/Pages/Index.razor b/grid/pdf-export-server/Client/Pages/Index.razor
@@ -10,7 +10,7 @@
 
 <TelerikGrid Height="550px" FilterMode="@GridFilterMode.FilterMenu"
              Sortable="true" Pageable="true" PageSize="20"
-             Data=@GridData TotalCount=@Total OnRead=@ReadItems>
+             TItem="@WeatherForecast" OnRead="@ReadItems">
     <GridColumns>
         <GridColumn Field="Id" Width="100px" />
         <GridColumn Field="Date" DisplayFormat="{0:dddd, dd MMM yyyy}" />
@@ -25,8 +25,6 @@
 </TelerikGrid>
 
 @code {
-    List<WeatherForecast> GridData { get; set; }
-    public int Total { get; set; } = 0;
     bool ExportAllPages { get; set; }
     DataSourceRequest lastRequest { get; set; }
 
@@ -37,13 +35,12 @@
         lastRequest = args.Request;
 
         DataEnvelope<WeatherForecast> result = await ForecastService.GetForecastListAsync(args.Request);
-        GridData = result.CurrentPageData;
-        Total = result.TotalItemCount;
-        StateHasChanged();
+        args.Data = result.CurrentPageData;
+        args.Total = result.TotalItemCount;
     }
 
     async Task ExportToPdf()
     {
         await PdfService.GetPdf(lastRequest, ExportAllPages, UseSpreadStreamProcessing);
     }
-}
+}
diff --git a/grid/pdf-export-server/Client/ServerPdfExport.Client.csproj b/grid/pdf-export-server/Client/ServerPdfExport.Client.csproj
@@ -4,10 +4,10 @@
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.14" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.14" PrivateAssets="all" />
     <PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
-    <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\ServerPdfExport.Shared.csproj" />
diff --git a/grid/pdf-export-server/PdfExport/PdfExport.csproj b/grid/pdf-export-server/PdfExport/PdfExport.csproj
@@ -1,19 +1,19 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
         <LangVersion>latest</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Telerik.Documents.Core" Version="2020.3.1019" />
-        <PackageReference Include="Telerik.Documents.Fixed" Version="2020.3.1019" />
-        <PackageReference Include="Telerik.Zip" Version="2020.3.1019" />
+        <PackageReference Include="Telerik.Documents.Core" Version="2022.1.106" />
+        <PackageReference Include="Telerik.Documents.Fixed" Version="2022.1.106" />
+        <PackageReference Include="Telerik.Zip" Version="2022.1.106" />
 
-        <PackageReference Include="Telerik.Documents.Spreadsheet" Version="2020.3.1019" />
-        <PackageReference Include="Telerik.Documents.Spreadsheet.FormatProviders.Pdf" Version="2020.3.1019" />
+        <PackageReference Include="Telerik.Documents.Spreadsheet" Version="2022.1.106" />
+        <PackageReference Include="Telerik.Documents.Spreadsheet.FormatProviders.Pdf" Version="2022.1.106" />
 
-        <PackageReference Include="Telerik.DataSource" Version="2.0.8" />
+        <PackageReference Include="Telerik.DataSource" Version="2.1.1" />
     </ItemGroup>
 
 </Project>
diff --git a/grid/pdf-export-server/PdfExport/RadPdfProcessingExporter.cs b/grid/pdf-export-server/PdfExport/RadPdfProcessingExporter.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Diagnostics;
diff --git a/grid/pdf-export-server/PdfExport/RadSpreadProcessingExporter.cs b/grid/pdf-export-server/PdfExport/RadSpreadProcessingExporter.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Diagnostics;
diff --git a/grid/pdf-export-server/Server/ServerPdfExport.Server.csproj b/grid/pdf-export-server/Server/ServerPdfExport.Server.csproj
@@ -5,8 +5,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.0" />
-        <PackageReference Include="Telerik.DataSource" Version="2.0.8" />
+        <PackageReference Include="Telerik.DataSource" Version="2.1.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.14" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/grid/pdf-export-server/Server/Startup.cs b/grid/pdf-export-server/Server/Startup.cs
@@ -35,7 +35,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
-                app.UseWebAssemblyDebugging();
             }
             else
             {
@@ -45,7 +44,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             }
 
             app.UseHttpsRedirection();
-            app.UseBlazorFrameworkFiles();
             app.UseStaticFiles();
 
             app.UseRouting();
diff --git a/grid/pdf-export-server/ServerPdfExport.sln b/grid/pdf-export-server/ServerPdfExport.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30717.126
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerPdfExport.Server", "Server\ServerPdfExport.Server.csproj", "{708391BA-7C83-40BF-BFAA-DFA138E0C5D2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerPdfExport.Server", "Server\ServerPdfExport.Server.csproj", "{708391BA-7C83-40BF-BFAA-DFA138E0C5D2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerPdfExport.Client", "Client\ServerPdfExport.Client.csproj", "{FE8753C4-8165-4F25-8569-CCC789DE697C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerPdfExport.Client", "Client\ServerPdfExport.Client.csproj", "{FE8753C4-8165-4F25-8569-CCC789DE697C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerPdfExport.Shared", "Shared\ServerPdfExport.Shared.csproj", "{76DE134F-BA74-4CE8-B4D0-96B6F9B8B822}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerPdfExport.Shared", "Shared\ServerPdfExport.Shared.csproj", "{76DE134F-BA74-4CE8-B4D0-96B6F9B8B822}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PdfExport", "PdfExport\PdfExport.csproj", "{D9244815-1A33-4DB9-BF1E-31FE53DA29D0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PdfExport", "PdfExport\PdfExport.csproj", "{D9244815-1A33-4DB9-BF1E-31FE53DA29D0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerSideSample", "ServerSideSample\ServerSideSample.csproj", "{491FC617-2E24-410F-B620-977A6C283E5C}"
 EndProject
diff --git a/grid/pdf-export-server/ServerSideSample/Pages/Index.razor b/grid/pdf-export-server/ServerSideSample/Pages/Index.razor
@@ -9,7 +9,7 @@
 
 <TelerikGrid Height="550px" FilterMode="@GridFilterMode.FilterMenu"
              Sortable="true" Pageable="true" PageSize="20"
-             Data=@GridData TotalCount=@Total OnRead=@ReadItems>
+             TItem="@WeatherForecast" OnRead="@ReadItems">
     <GridToolBar>
         <TelerikButton Icon="file-pdf" OnClick="@ExportToPdf">Export to PDF</TelerikButton>
         <label><TelerikCheckBox @bind-Value="@ExportAllPages" />Export All Pages</label>
@@ -24,8 +24,6 @@
 </TelerikGrid>
 
 @code {
-    List<WeatherForecast> GridData { get; set; }
-    public int Total { get; set; } = 0;
     bool ExportAllPages { get; set; }
     DataSourceRequest lastRequest { get; set; }
 
@@ -36,13 +34,12 @@
         lastRequest = args.Request;
 
         var datasourceResult = await ForecastService.GetForecastListAsync(args.Request);
-        GridData = datasourceResult.Data as List<WeatherForecast>;
-        Total = datasourceResult.Total;
-        StateHasChanged();
+        args.Data = datasourceResult.Data as List<WeatherForecast>;
+        args.Total = datasourceResult.Total;
     }
 
     async Task ExportToPdf()
     {
         await PdfService.GetPdf(lastRequest, ExportAllPages, UseSpreadStreamProcessing);
     }
-}
+}
diff --git a/grid/pdf-export-server/ServerSideSample/ServerSideSample.csproj b/grid/pdf-export-server/ServerSideSample/ServerSideSample.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Telerik.UI.for.Blazor" Version="2.20.0" />
+    <PackageReference Include="Telerik.UI.for.Blazor" Version="3.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PdfExport\PdfExport.csproj" />
diff --git a/grid/pdf-export-server/Shared/ServerPdfExport.Shared.csproj b/grid/pdf-export-server/Shared/ServerPdfExport.Shared.csproj
@@ -1,12 +1,12 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
-        <PackageReference Include="Telerik.DataSource" Version="2.0.8" />
+        <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+        <PackageReference Include="Telerik.DataSource" Version="2.1.1" />
     </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using System;`
`3`	`2`	`using System.Collections.Generic;`
`4`	`3`	`using System.Linq;`
`5`	`4`	`using System.Diagnostics;`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)`
`35`	`35`	`if (env.IsDevelopment())`
`36`	`36`	`{`
`37`	`37`	`app.UseDeveloperExceptionPage();`
`38`		`- app.UseWebAssemblyDebugging();`
`39`	`38`	`}`
`40`	`39`	`else`
`41`	`40`	`{`
`@@ -45,7 +44,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)`
`45`	`44`	`}`
`46`	`45`
`47`	`46`	`app.UseHttpsRedirection();`
`48`		`- app.UseBlazorFrameworkFiles();`
`49`	`47`	`app.UseStaticFiles();`
`50`	`48`
`51`	`49`	`app.UseRouting();`