diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/DashboardOptionsExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/DashboardOptionsExtensions.cs deleted file mode 100644 index bacba13b62..0000000000 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/DashboardOptionsExtensions.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Volo.Abp.AspNetCore.Mvc.UI.Dashboards -{ - public static class WidgetOptionsExtensions - { - public static void AddDashboards(this DashboardOptions options) - where T : IDashboardDefinitionProvider, new() - { - var widgets = new T().GetDefinitions(); - options.Dashboards.AddRange(widgets); - } - } -} diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/IDashboardDefinitionProvider.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/IDashboardDefinitionProvider.cs deleted file mode 100644 index 049dc3fd05..0000000000 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/IDashboardDefinitionProvider.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Collections.Generic; - -namespace Volo.Abp.AspNetCore.Mvc.UI.Dashboards -{ - public interface IDashboardDefinitionProvider - { - List GetDefinitions(); - } -} diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/IWidgetDefinitionProvider.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/IWidgetDefinitionProvider.cs deleted file mode 100644 index f1f94f7e09..0000000000 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/IWidgetDefinitionProvider.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Collections.Generic; - -namespace Volo.Abp.AspNetCore.Mvc.UI.Widgets -{ - public interface IWidgetDefinitionProvider - { - List GetDefinitions(); - } -} diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetOptionsExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetOptionsExtensions.cs deleted file mode 100644 index 4a7b3be9e8..0000000000 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetOptionsExtensions.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Volo.Abp.AspNetCore.Mvc.UI.Widgets -{ - public static class WidgetOptionsExtensions - { - public static void AddWidgets(this WidgetOptions options) - where T : IWidgetDefinitionProvider, new() - { - var widgets = new T().GetDefinitions(); - options.Widgets.AddRange(widgets); - } - } -} diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs index 85b2dc21b7..2854db7807 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs @@ -87,7 +87,7 @@ namespace DashboardDemo { Configure(options => { - options.AddWidgets(); + options.Widgets.AddRange(WidgetDefinitionProvider.GetDefinitions()); }); } @@ -95,7 +95,7 @@ namespace DashboardDemo { Configure(options => { - options.AddDashboards(); + options.Dashboards.AddRange(DashboardDefinitionProvider.GetDefinitions()); }); } diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Dashboards/DashboardDefinitionProvider.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Dashboards/DashboardDefinitionProvider.cs index 914f8dd233..8f6d21a720 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Dashboards/DashboardDefinitionProvider.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Dashboards/DashboardDefinitionProvider.cs @@ -7,9 +7,9 @@ using Volo.Abp.Localization; namespace DashboardDemo.Dashboards { - public class DashboardDefinitionProvider : IDashboardDefinitionProvider + public static class DashboardDefinitionProvider { - public List GetDefinitions() + public static List GetDefinitions() { var myDashboard = new DashboardDefinition( DashboardNames.MyDashboard, diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Widgets/WidgetDefinitionProvider.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Widgets/WidgetDefinitionProvider.cs index 36392bb6e5..57a583e732 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Widgets/WidgetDefinitionProvider.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Widgets/WidgetDefinitionProvider.cs @@ -6,9 +6,9 @@ using Volo.Abp.Localization; namespace DashboardDemo.Widgets { - public class WidgetDefinitionProvider : IWidgetDefinitionProvider + public static class WidgetDefinitionProvider { - public List GetDefinitions() + public static List GetDefinitions() { return new List {