Skip to content

Commit 502ed23

Browse files
pollyndospollyndos
committed
update example
1 parent 39133fd commit 502ed23

18 files changed

+103
-118
lines changed

‎CustomParameterEditorAngularExample.sln

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
4-
VisualStudioVersion = 17.7.34221.43
4+
VisualStudioVersion = 17.9.34723.18
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomParameterEditorAngularExample", "CustomParameterEditorAngularExample\CustomParameterEditorAngularExample.csproj", "{310F8549-51EB-4A37-9255-AB6738F39CB0}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomParameterEditorAngularExample", "CustomParameterEditorAngularExample\CustomParameterEditorAngularExample.csproj", "{27107B6F-E2C2-420E-849F-364115C20E46}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1010
Debug|Any CPU = Debug|Any CPU
1111
Release|Any CPU = Release|Any CPU
1212
EndGlobalSection
1313
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{310F8549-51EB-4A37-9255-AB6738F39CB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{310F8549-51EB-4A37-9255-AB6738F39CB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
16-
{310F8549-51EB-4A37-9255-AB6738F39CB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
17-
{310F8549-51EB-4A37-9255-AB6738F39CB0}.Release|Any CPU.Build.0 = Release|Any CPU
14+
{27107B6F-E2C2-420E-849F-364115C20E46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{27107B6F-E2C2-420E-849F-364115C20E46}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{27107B6F-E2C2-420E-849F-364115C20E46}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{27107B6F-E2C2-420E-849F-364115C20E46}.Release|Any CPU.Build.0 = Release|Any CPU
1818
EndGlobalSection
1919
GlobalSection(SolutionProperties) = preSolution
2020
HideSolutionNode = FALSE
2121
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {59B2F8B9-5173-4589-854E-434388615175}
24+
EndGlobalSection
2225
EndGlobal

‎CustomParameterEditorAngularExample/ClientApp/angular.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
"outputPath": "dist",
1818
"index": "src/index.html",
1919
"main": "src/main.ts",
20-
"polyfills": "src/polyfills.ts",
20+
"polyfills": [
21+
"zone.js"
22+
],
2123
"tsConfig": "src/tsconfig.app.json",
2224
"styles": [
2325
"node_modules/bootstrap/dist/css/bootstrap.min.css",

‎CustomParameterEditorAngularExample/ClientApp/package.json

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,39 +10,38 @@
1010
},
1111
"private": true,
1212
"dependencies": {
13-
"@angular/animations": "^15.0.0",
14-
"@angular/common": "^15.0.0",
15-
"@angular/compiler": "^15.0.0",
16-
"@angular/core": "^15.0.0",
17-
"@angular/forms": "^15.0.0",
18-
"@angular/platform-browser": "^15.0.0",
19-
"@angular/platform-browser-dynamic": "^15.0.0",
20-
"@angular/platform-server": "^15.0.0",
21-
"@angular/router": "^15.0.0",
22-
"aspnet-prerendering": "^3.0.1",
23-
"devextreme": "^23.2.3",
24-
"devextreme-angular": "^23.2.3",
25-
"@devexpress/analytics-core": "^23.2.3",
26-
"devexpress-reporting-angular": "^23.2.3",
13+
"@angular/animations": "^17.0.0",
14+
"@angular/common": "^17.0.0",
15+
"@angular/compiler": "^17.0.0",
16+
"@angular/core": "^17.0.0",
17+
"@angular/forms": "^17.0.0",
18+
"@angular/platform-browser": "^17.0.0",
19+
"@angular/platform-browser-dynamic": "^17.0.0",
20+
"@angular/platform-server": "^17.0.0",
21+
"@angular/router": "^17.0.0",
22+
"@devexpress/analytics-core": "24.1-stable",
2723
"bootstrap": "^4.3.1",
2824
"core-js": "^2.6.5",
29-
"rxjs": "~7.5.0",
25+
"devexpress-reporting-angular": "24.1-stable",
26+
"devextreme": "24.1-stable",
27+
"devextreme-angular": "24.1-stable",
28+
"rxjs": "~7.8.0",
3029
"tslib": "^2.3.0",
31-
"zone.js": "~0.12.0"
30+
"zone.js": "~0.14.2"
3231
},
3332
"devDependencies": {
34-
"@angular-devkit/build-angular": "^15.0.2",
35-
"@angular/cli": "~15.0.2",
36-
"@angular/compiler-cli": "^15.0.0",
37-
"@angular/language-service": "~15.0.2",
38-
"@types/jasmine": "~4.3.0",
33+
"@angular-devkit/build-angular": "^17.0.0",
34+
"@angular/cli": "^17.0.0",
35+
"@angular/compiler-cli": "^17.0.0",
36+
"@angular/language-service": "^17.0.0",
37+
"@types/jasmine": "~5.1.0",
3938
"@types/node": "^18.11.9",
40-
"jasmine-core": "~4.5.0",
39+
"jasmine-core": "~5.1.0",
4140
"karma": "~6.4.0",
42-
"karma-chrome-launcher": "~3.1.0",
41+
"karma-chrome-launcher": "~3.2.0",
4342
"karma-coverage": "~2.2.0",
4443
"karma-jasmine": "~5.1.0",
45-
"karma-jasmine-html-reporter": "~2.0.0",
46-
"typescript": "~4.8.2"
44+
"karma-jasmine-html-reporter": "~2.1.0",
45+
"typescript": "~5.2.2"
4746
}
4847
}

‎CustomParameterEditorAngularExample/ClientApp/src/app/app.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ export class AppComponent implements AfterViewInit {
1313
ngAfterViewInit(): void {
1414
this._templateEngine.register('custom-parameter-text-editor', this.myCustomInput);
1515
}
16-
}
16+
}

‎CustomParameterEditorAngularExample/ClientApp/src/app/reportviewer/report-viewer.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ export class ReportViewerComponent {
1919
const parameter = event.args.parameter;
2020
const info = event.args.info;
2121
if (parameter.type === 'CustomParameterType') {
22-
info.validationRules = info.validationRules || [];
23-
info.validationRules.push(
24-
{ type: 'email', message: 'Email parameter value has invalid format.' });
25-
info.editor.header = "custom-parameter-text-editor";
22+
info.validationRules = info.validationRules || [];
23+
info.validationRules.push(
24+
{ type: 'email', message: 'Email parameter value has invalid format.' });
25+
info.editor.header = "custom-parameter-text-editor";
2626
}
2727
}
2828

‎CustomParameterEditorAngularExample/ClientApp/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
"moduleResolution": "node",
1010
"emitDecoratorMetadata": true,
1111
"experimentalDecorators": true,
12-
"target": "es2017",
12+
"target": "es2020",
1313
"typeRoots": [
1414
"node_modules/@types"
1515
],
1616
"lib": [
17-
"es2018",
17+
"es2020",
1818
"dom"
1919
]
2020
}

‎CustomParameterEditorAngularExample/Controllers/HomeController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ public IActionResult Error() {
1616
return View();
1717
}
1818
}
19-
}
19+
}

‎CustomParameterEditorAngularExample/Controllers/ReportingControllers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ public class CustomWebDocumentViewerController : WebDocumentViewerController {
77
public CustomWebDocumentViewerController(IWebDocumentViewerMvcControllerService controllerService) : base(controllerService) {
88
}
99
}
10-
}
10+
}

‎CustomParameterEditorAngularExample/CustomParameterEditorAngularExample.csproj

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
55
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
66
<IsPackable>false</IsPackable>
@@ -10,11 +10,10 @@
1010
<BuildServerSideRenderer>false</BuildServerSideRenderer>
1111
</PropertyGroup>
1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
14-
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.0" />
15-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
13+
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.0" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
1615
<PackageReference Include="System.Data.SQLite" Version="1.0.114.4" />
17-
<PackageReference Include="DevExpress.AspNetCore.Reporting" Version="23.2.*-*" />
16+
<PackageReference Include="DevExpress.AspNetCore.Reporting" Version="24.1.*-*" />
1817
</ItemGroup>
1918
<ItemGroup>
2019
<!-- Files not to publish (note that the 'dist' subfolders are re-added below) -->
@@ -52,7 +51,7 @@
5251
<ItemGroup>
5352
<DistFiles Include="$(SpaRoot)dist\**; $(SpaRoot)dist-server\**" />
5453
<DistFiles Include="$(SpaRoot)node_modules\**" Condition="'$(BuildServerSideRenderer)' == 'true'" />
55-
<ResolvedFileToPublish Include="@(DistFiles-&gt;'%(FullPath)')" Exclude="@(ResolvedFileToPublish)">
54+
<ResolvedFileToPublish Include="@(DistFiles->'%(FullPath)')" Exclude="@(ResolvedFileToPublish)">
5655
<RelativePath>%(DistFiles.Identity)</RelativePath>
5756
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
5857
</ResolvedFileToPublish>

‎CustomParameterEditorAngularExample/Data/ReportDbContext.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Linq;
1+
using System.Linq;
22
using Microsoft.EntityFrameworkCore;
33

44
namespace CustomParameterEditorAngularExample.Data {
@@ -60,4 +60,4 @@ public void InitializeDatabase() {
6060
SaveChanges();
6161
}
6262
}
63-
}
63+
}

‎CustomParameterEditorAngularExample/Data/reportsData.db

0 Bytes
Binary file not shown.

‎CustomParameterEditorAngularExample/Pages/Error.cshtml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ public void OnGet()
2020
RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
2121
}
2222
}
23-
}
23+
}

‎CustomParameterEditorAngularExample/PredefinedReports/ReportsFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ public static class ReportsFactory
1313
["CustomParameterReport"] = () => new CustomParameterReport()
1414
};
1515
}
16-
}
16+
}

‎CustomParameterEditorAngularExample/Program.cs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,13 @@
2929
var builder = WebApplication.CreateBuilder(args);
3030
builder.Services.AddDevExpressControls();
3131
builder.Services.AddScoped<ReportStorageWebExtension, CustomReportStorageWebExtension>();
32-
builder.Services
33-
.AddMvc()
34-
.AddNewtonsoftJson();
32+
builder.Services.AddMvc();
3533
builder.Services.ConfigureReportingServices(configurator => {
36-
if(builder.Environment.IsDevelopment())
34+
if (builder.Environment.IsDevelopment())
3735
configurator.UseDevelopmentMode();
3836

3937
configurator.ConfigureReportDesigner(designerConfigurator => {
40-
});
38+
});
4139
configurator.ConfigureWebDocumentViewer(viewerConfigurator => {
4240
viewerConfigurator.UseCachedReportSourceBuilder();
4341
});
@@ -49,13 +47,13 @@
4947
builder.Services.AddDbContext<ReportDbContext>(options => options.UseSqlite(builder.Configuration.GetConnectionString("ReportsDataConnectionString")));
5048

5149
var app = builder.Build();
52-
using(var scope = app.Services.CreateScope()) {
50+
using (var scope = app.Services.CreateScope()) {
5351
var db = scope.ServiceProvider.GetService<ReportDbContext>();
5452
db.InitializeDatabase();
5553
}
5654
var contentDirectoryAllowRule = DirectoryAccessRule.Allow(new DirectoryInfo(Path.Combine(app.Environment.ContentRootPath, "..", "Content")).FullName);
5755
AccessSettings.ReportingSpecificResources.TrySetRules(contentDirectoryAllowRule, UrlAccessRule.Allow());
58-
if(app.Environment.IsDevelopment()) {
56+
if (app.Environment.IsDevelopment()) {
5957
app.UseDeveloperExceptionPage();
6058
} else {
6159
app.UseExceptionHandler("/Home/Error");
@@ -64,7 +62,7 @@
6462

6563
app.UseHttpsRedirection();
6664
app.UseStaticFiles();
67-
if(!app.Environment.IsDevelopment()) {
65+
if (!app.Environment.IsDevelopment()) {
6866
app.UseSpaStaticFiles();
6967
}
7068
app.UseRouting();
@@ -84,10 +82,10 @@
8482

8583
spa.Options.SourcePath = "ClientApp";
8684

87-
if(app.Environment.IsDevelopment()) {
85+
if (app.Environment.IsDevelopment()) {
8886
spa.UseAngularCliServer(npmScript: "start");
8987
spa.Options.StartupTimeout = TimeSpan.FromSeconds(240);
9088
}
9189
});
9290

93-
app.Run();
91+
app.Run();

‎CustomParameterEditorAngularExample/Services/CustomDataSerializer.cs

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,33 @@
1-
using System;
1+
using System;
22
using System.Collections.Generic;
33
using System.ComponentModel;
44
using System.Linq;
55
using CustomParameterEditorAngularExample;
66
using DevExpress.XtraReports.Native;
77

8-
namespace CustomParameterEditorAngularExample
9-
{
8+
namespace CustomParameterEditorAngularExample {
109
[TypeConverter(typeof(CustomParameterTypeConverter))]
11-
public class CustomDataSerializer : IDataSerializer
12-
{
10+
public class CustomDataSerializer : IDataSerializer {
1311
public const string Name = "myCustomDataSerializer";
1412

15-
public bool CanDeserialize(string value, string typeName, object extensionProvider)
16-
{
13+
public bool CanDeserialize(string value, string typeName, object extensionProvider) {
1714
return typeName == typeof(CustomParameterType).FullName;
1815
}
1916

20-
public bool CanSerialize(object data, object extensionProvider)
21-
{
17+
public bool CanSerialize(object data, object extensionProvider) {
2218
return data is CustomParameterType;
2319
}
2420

25-
public object Deserialize(string value, string typeName, object extensionProvider)
26-
{
27-
if (typeName == typeof(CustomParameterType).FullName)
28-
{
21+
public object Deserialize(string value, string typeName, object extensionProvider) {
22+
if (typeName == typeof(CustomParameterType).FullName) {
2923
return new CustomParameterType { Value = value };
3024
}
3125
return null;
3226
}
3327

34-
public string Serialize(object data, object extensionProvider)
35-
{
28+
public string Serialize(object data, object extensionProvider) {
3629
var parameter = data as CustomParameterType;
3730
return parameter != null ? parameter.Value : null;
3831
}
3932
}
40-
}
33+
}

0 commit comments

Comments
 (0)