Skip to content

Commit fd734ce

Browse files
pollyndospollyndos
authored
Merge pull request #4 from DevExpress-Examples/example-update
update example
2 parents 2da62d8 + 700a106 commit fd734ce

File tree

11 files changed

+298
-101
lines changed

11 files changed

+298
-101
lines changed

‎CS/MVCDashboardDesigner/App_Start/DashboardConfig.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class DashboardConfig {
1313
public static void RegisterService(RouteCollection routes) {
1414
routes.MapDashboardRoute("api/dashboard", "DefaultDashboard");
1515

16-
var dataBaseDashboardStorage = new DataBaseEditaleDashboardStorage(
16+
var dataBaseDashboardStorage = new DataBaseEditableDashboardStorage(
1717
ConfigurationManager.ConnectionStrings["DashboardStorageConnection"].ConnectionString);
1818

1919
DashboardConfigurator.Default.SetDashboardStorage(dataBaseDashboardStorage);

‎CS/MVCDashboardDesigner/DataBaseEditaleDashboardStorage.cs renamed to ‎CS/MVCDashboardDesigner/DataBaseEditableDashboardStorage.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
using System;
33
using System.Collections.Generic;
44
using System.Data;
5-
using System.Data.SqlClient;
5+
using Microsoft.Data.SqlClient;
66
using System.IO;
77
using System.Xml.Linq;
88

99
namespace MVCDashboardDesigner {
10-
public class DataBaseEditaleDashboardStorage : IEditableDashboardStorage {
10+
public class DataBaseEditableDashboardStorage : IEditableDashboardStorage {
1111
private string connectionString;
1212

13-
public DataBaseEditaleDashboardStorage(string connectionString) {
13+
public DataBaseEditableDashboardStorage(string connectionString) {
1414
this.connectionString = connectionString;
1515
}
1616

‎CS/MVCDashboardDesigner/Global.asax.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1+
using DevExpress.Utils;
2+
using MVCDashboardDesigner.App_Start;
13
using System;
2-
using System.Configuration;
34
using System.Web.Http;
45
using System.Web.Mvc;
56
using System.Web.Routing;
6-
using DevExpress.DashboardCommon;
7-
using DevExpress.DashboardWeb;
8-
using DevExpress.Utils;
9-
using MVCDashboardDesigner.App_Start;
107

118
namespace MVCDashboardDesigner {
129
// Note: For instructions on enabling IIS6 or IIS7 classic mode,
@@ -20,7 +17,6 @@ protected void Application_Start() {
2017
WebApiConfig.Register(GlobalConfiguration.Configuration);
2118
FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
2219
RouteConfig.RegisterRoutes(RouteTable.Routes);
23-
2420
ModelBinders.Binders.DefaultBinder = new DevExpress.Web.Mvc.DevExpressEditorsBinder();
2521

2622
DevExpress.Web.ASPxWebControl.CallbackError += Application_Error;

‎CS/MVCDashboardDesigner/MVCDashboardDesigner.csproj

Lines changed: 165 additions & 41 deletions
Large diffs are not rendered by default.

‎CS/MVCDashboardDesigner/Web.config

Lines changed: 84 additions & 44 deletions
Large diffs are not rendered by default.

‎CS/MVCDashboardDesigner/packages.config

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="Azure.Core" version="1.38.0" targetFramework="net472" />
4+
<package id="Azure.Identity" version="1.11.4" targetFramework="net472" />
35
<package id="EntityFramework" version="6.1.3" targetFramework="net452" />
46
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net452" />
57
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net452" />
@@ -9,6 +11,41 @@
911
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net452" />
1012
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net452" />
1113
<package id="Microsoft.AspNet.WebPages.Data" version="3.2.3" targetFramework="net452" />
14+
<package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net472" />
15+
<package id="Microsoft.Bcl.Cryptography" version="8.0.0" targetFramework="net472" />
16+
<package id="Microsoft.Data.SqlClient" version="6.0.2" targetFramework="net472" />
17+
<package id="Microsoft.Data.SqlClient.SNI" version="6.0.2" targetFramework="net472" />
18+
<package id="Microsoft.Extensions.Caching.Abstractions" version="8.0.0" targetFramework="net472" />
19+
<package id="Microsoft.Extensions.Caching.Memory" version="8.0.1" targetFramework="net472" />
20+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.2" targetFramework="net472" />
21+
<package id="Microsoft.Extensions.Logging.Abstractions" version="8.0.2" targetFramework="net472" />
22+
<package id="Microsoft.Extensions.Options" version="8.0.2" targetFramework="net472" />
23+
<package id="Microsoft.Extensions.Primitives" version="8.0.0" targetFramework="net472" />
24+
<package id="Microsoft.Identity.Client" version="4.61.3" targetFramework="net472" />
25+
<package id="Microsoft.Identity.Client.Extensions.Msal" version="4.61.3" targetFramework="net472" />
26+
<package id="Microsoft.IdentityModel.Abstractions" version="7.5.0" targetFramework="net472" />
27+
<package id="Microsoft.IdentityModel.JsonWebTokens" version="7.5.0" targetFramework="net472" />
28+
<package id="Microsoft.IdentityModel.Logging" version="7.5.0" targetFramework="net472" />
29+
<package id="Microsoft.IdentityModel.Protocols" version="7.5.0" targetFramework="net472" />
30+
<package id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="7.5.0" targetFramework="net472" />
31+
<package id="Microsoft.IdentityModel.Tokens" version="7.5.0" targetFramework="net472" />
1232
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
1333
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net452" />
34+
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
35+
<package id="System.ClientModel" version="1.0.0" targetFramework="net472" />
36+
<package id="System.Diagnostics.DiagnosticSource" version="8.0.1" targetFramework="net472" />
37+
<package id="System.IdentityModel.Tokens.Jwt" version="7.5.0" targetFramework="net472" />
38+
<package id="System.IO.FileSystem.AccessControl" version="5.0.0" targetFramework="net472" />
39+
<package id="System.Memory" version="4.5.5" targetFramework="net472" />
40+
<package id="System.Memory.Data" version="1.0.2" targetFramework="net472" />
41+
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
42+
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
43+
<package id="System.Security.AccessControl" version="5.0.0" targetFramework="net472" />
44+
<package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net472" />
45+
<package id="System.Security.Cryptography.ProtectedData" version="4.7.0" targetFramework="net472" />
46+
<package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net472" />
47+
<package id="System.Text.Encodings.Web" version="6.0.0" targetFramework="net472" />
48+
<package id="System.Text.Json" version="6.0.10" targetFramework="net472" />
49+
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
50+
<package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
1451
</packages>

‎Readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
This example shows how to create a custom dashboard storage to load and save dashboards in a database. To create custom dashboard storage, implement [IDashboardStorage](https://docs.devexpress.com/Dashboard/DevExpress.DashboardWeb.IDashboardStorage?p=netframework) or [IEditableDashboardStorage](https://docs.devexpress.com/Dashboard/DevExpress.DashboardWeb.IEditableDashboardStorage).
1111

12-
This example also contains an SQL file ([SavedDashboards.sql](./CS/MVCDashboardDesigner/SavedDashboards.sql)). You can use it to recreate a database on your side. Update the connection string in the **Web.config** file to make it valid in your environment. The example uses the [System.Data.SqlClient](https://msdn.microsoft.com/en-us/library/system.data.sqlclient(v=vs.110).aspx) members to connect and manage an MS SQL server database.
12+
This example also contains an SQL file ([SavedDashboards.sql](./CS/MVCDashboardDesigner/SavedDashboards.sql)). You can use it to recreate a database on your side. Update the connection string in the **Web.config** file to make it valid in your environment. The example uses the [Microsoft.Data.SqlClient](https://learn.microsoft.com/en-us/dotnet/api/microsoft.data.sqlclient?view=sqlclient-dotnet-6.0) members to connect and manage an MS SQL server database.
1313

1414
The following API used in the example:
1515

@@ -29,7 +29,7 @@ The following API used in the example:
2929

3030
## Files to Review
3131

32-
* [DataBaseEditaleDashboardStorage.cs](./CS/MVCDashboardDesigner/DataBaseEditaleDashboardStorage.cs) (VB: [DataBaseEditaleDashboardStorage.vb](./VB/MVCDashboardDesigner/DataBaseEditaleDashboardStorage.vb))
32+
* [DataBaseEditableDashboardStorage.cs](./CS/MVCDashboardDesigner/DataBaseEditableDashboardStorage.cs) (VB: [DataBaseEditableDashboardStorage.vb](./VB/MVCDashboardDesigner/DataBaseEditableDashboardStorage.vb))
3333
* [Global.asax.cs](./CS/MVCDashboardDesigner/Global.asax.cs) (VB: [Global.asax.vb](./VB/MVCDashboardDesigner/Global.asax.vb))
3434

3535
## Documentation

‎VB/MVCDashboardDesigner/App_Start/DashboardConfig.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Public Class DashboardConfig
99
Public Shared Sub RegisterService(ByVal routes As RouteCollection)
1010
routes.MapDashboardRoute("api/dashboard", "DefaultDashboard")
1111

12-
Dim dataBaseDashboardStorage = New DataBaseEditaleDashboardStorage(ConfigurationManager.ConnectionStrings("DashboardStorageConnection").ConnectionString)
12+
Dim dataBaseDashboardStorage = New DataBaseEditableDashboardStorage(ConfigurationManager.ConnectionStrings("DashboardStorageConnection").ConnectionString)
1313

1414
DashboardConfigurator.Default.SetDashboardStorage(dataBaseDashboardStorage)
1515

‎VB/MVCDashboardDesigner/DataBaseEditaleDashboardStorage.vb renamed to ‎VB/MVCDashboardDesigner/DataBaseEditableDashboardStorage.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Imports System.IO
77
Imports System.Xml.Linq
88

99
Namespace MVCDashboardDesigner
10-
Public Class DataBaseEditaleDashboardStorage
10+
Public Class DataBaseEditableDashboardStorage
1111
Implements IEditableDashboardStorage
1212

1313
Private connectionString As String

‎VB/MVCDashboardDesigner/Global.asax.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Namespace MVCDashboardDesigner
2424

2525
AddHandler DevExpress.Web.ASPxWebControl.CallbackError, AddressOf Application_Error
2626

27-
Dim dataBaseDashboardStorage = New DataBaseEditaleDashboardStorage(ConfigurationManager.ConnectionStrings("DashboardStorageConnection").ConnectionString)
27+
Dim dataBaseDashboardStorage = New DataBaseEditableDashboardStorage(ConfigurationManager.ConnectionStrings("DashboardStorageConnection").ConnectionString)
2828

2929
DashboardConfigurator.Default.SetDashboardStorage(dataBaseDashboardStorage)
3030

0 commit comments

Comments
 (0)