From df386b9ba76579a406dd85279592971b855a7271 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:57:54 +0300 Subject: [PATCH] NavigationOptions to AbpNavigationOptions --- .../{NavigationOptions.cs => AbpNavigationOptions.cs} | 4 ++-- .../Volo/Abp/Ui/Navigation/AbpUiNavigationModule.cs | 2 +- .../Volo/Abp/Ui/Navigation/MenuManager.cs | 4 ++-- .../Volo/Abp/Ui/Navigation/MenuManager_Tests.cs | 2 +- .../account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs | 2 +- modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs | 2 +- modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs | 2 +- .../src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs | 2 +- .../AbpSettingManagementWebModule.cs | 2 +- .../AbpTenantManagementWebModule.cs | 2 +- .../application/src/Acme.BookStore.Web/BookStoreWebModule.cs | 2 +- .../test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs | 2 +- .../BookManagementWebModule.cs | 2 +- .../BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs | 2 +- .../test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs | 2 +- .../src/DashboardDemo.Web/DashboardDemoWebModule.cs | 2 +- .../DashboardDemo.Web.Tests/DashboardDemoWebTestModule.cs | 2 +- .../PublicWebSite.Host/PublicWebSiteHostModule.cs | 2 +- .../src/ProductManagement.Web/ProductManagementWebModule.cs | 2 +- .../MyProjectNameWebModule.cs | 2 +- .../MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs | 2 +- .../MyProjectNameWebTestModule.cs | 2 +- .../MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs | 2 +- 23 files changed, 25 insertions(+), 25 deletions(-) rename framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/{NavigationOptions.cs => AbpNavigationOptions.cs} (78%) diff --git a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/NavigationOptions.cs b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpNavigationOptions.cs similarity index 78% rename from framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/NavigationOptions.cs rename to framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpNavigationOptions.cs index 2237add732..75c2d426d9 100644 --- a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/NavigationOptions.cs +++ b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpNavigationOptions.cs @@ -3,12 +3,12 @@ using JetBrains.Annotations; namespace Volo.Abp.UI.Navigation { - public class NavigationOptions + public class AbpNavigationOptions { [NotNull] public List MenuContributors { get; } - public NavigationOptions() + public AbpNavigationOptions() { MenuContributors = new List(); } diff --git a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpUiNavigationModule.cs b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpUiNavigationModule.cs index 5ee47556c7..47889336a8 100644 --- a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpUiNavigationModule.cs +++ b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpUiNavigationModule.cs @@ -23,7 +23,7 @@ namespace Volo.Abp.UI.Navigation .AddVirtualJson("/Volo/Abp/Ui/Navigation/Localization/Resource"); }); - Configure(options => + Configure(options => { options.MenuContributors.Add(new DefaultMenuContributor()); }); diff --git a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuManager.cs b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuManager.cs index 9c96006b02..5c33866aa2 100644 --- a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuManager.cs +++ b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuManager.cs @@ -9,11 +9,11 @@ namespace Volo.Abp.UI.Navigation { public class MenuManager : IMenuManager, ITransientDependency { - protected NavigationOptions Options { get; } + protected AbpNavigationOptions Options { get; } protected IHybridServiceScopeFactory ServiceScopeFactory { get; } public MenuManager( - IOptions options, + IOptions options, IHybridServiceScopeFactory serviceScopeFactory) { ServiceScopeFactory = serviceScopeFactory; diff --git a/framework/test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs b/framework/test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs index 3361dc72ba..5fed48c828 100644 --- a/framework/test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs +++ b/framework/test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs @@ -39,7 +39,7 @@ namespace Volo.Abp.UI.Navigation { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.MenuContributors.Add(new TestMenuContributor1()); options.MenuContributors.Add(new TestMenuContributor2()); diff --git a/modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs b/modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs index 4d7e41d663..288439a97a 100644 --- a/modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs +++ b/modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs @@ -40,7 +40,7 @@ namespace Volo.Abp.Account.Web options.FileSets.AddEmbedded("Volo.Abp.Account.Web"); }); - Configure(options => + Configure(options => { options.MenuContributors.Add(new AbpAccountUserMenuContributor()); }); diff --git a/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs b/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs index b50570a461..063ecebf5b 100644 --- a/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs +++ b/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs @@ -35,7 +35,7 @@ namespace Volo.Blogging public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.MenuContributors.Add(new BloggingMenuContributor()); }); diff --git a/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs b/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs index cb165e3576..de404a5884 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs +++ b/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs @@ -36,7 +36,7 @@ namespace Volo.Docs.Admin public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.MenuContributors.Add(new DocsMenuContributor()); }); diff --git a/modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs b/modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs index 0c4ab84dee..8d2ba91695 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs +++ b/modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs @@ -35,7 +35,7 @@ namespace Volo.Abp.Identity.Web public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.MenuContributors.Add(new AbpIdentityWebMainMenuContributor()); }); diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs index a9043eb115..3e0cd0a7f1 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs @@ -23,7 +23,7 @@ namespace Volo.Abp.SettingManagement.Web public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.MenuContributors.Add(new SettingManagementMainMenuContributor()); }); diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs index dacf80475a..a3f066594e 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs @@ -37,7 +37,7 @@ namespace Volo.Abp.TenantManagement.Web public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.MenuContributors.Add(new AbpTenantManagementWebMainMenuContributor()); }); diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs index 89c3264848..3c16c12a3d 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs @@ -147,7 +147,7 @@ namespace Acme.BookStore.Web private void ConfigureNavigationServices() { - Configure(options => + Configure(options => { options.MenuContributors.Add(new BookStoreMenuContributor()); }); diff --git a/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs b/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs index 5a3017a53e..b9d79b1baa 100644 --- a/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs +++ b/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs @@ -62,7 +62,7 @@ namespace Acme.BookStore private static void ConfigureNavigationServices(IServiceCollection services) { - services.Configure(options => + services.Configure(options => { options.MenuContributors.Add(new BookStoreMenuContributor()); }); diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/BookManagementWebModule.cs b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/BookManagementWebModule.cs index e038ca13d8..362908f5bb 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/BookManagementWebModule.cs +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/BookManagementWebModule.cs @@ -27,7 +27,7 @@ namespace Acme.BookStore.BookManagement.Web public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.MenuContributors.Add(new BookManagementMenuContributor()); }); diff --git a/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs b/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs index 06662e9b5f..800e6d463b 100644 --- a/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs +++ b/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs @@ -139,7 +139,7 @@ namespace Acme.BookStore.Web private void ConfigureNavigationServices() { - Configure(options => + Configure(options => { options.MenuContributors.Add(new BookStoreMenuContributor()); }); diff --git a/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs b/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs index c544d97116..166ade18d6 100644 --- a/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs +++ b/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs @@ -62,7 +62,7 @@ namespace Acme.BookStore private static void ConfigureNavigationServices(IServiceCollection services) { - services.Configure(options => + services.Configure(options => { options.MenuContributors.Add(new BookStoreMenuContributor()); }); diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs index 77177b4aa5..120e29466b 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs @@ -146,7 +146,7 @@ namespace DashboardDemo.Web private void ConfigureNavigationServices() { - Configure(options => + Configure(options => { options.MenuContributors.Add(new DashboardDemoMenuContributor()); }); diff --git a/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestModule.cs b/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestModule.cs index 017113a95a..9e551d04d1 100644 --- a/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestModule.cs +++ b/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestModule.cs @@ -62,7 +62,7 @@ namespace DashboardDemo private static void ConfigureNavigationServices(IServiceCollection services) { - services.Configure(options => + services.Configure(options => { options.MenuContributors.Add(new DashboardDemoMenuContributor()); }); diff --git a/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSiteHostModule.cs b/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSiteHostModule.cs index 2bd53de87b..0843eae579 100644 --- a/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSiteHostModule.cs +++ b/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSiteHostModule.cs @@ -40,7 +40,7 @@ namespace PublicWebSite.Host options.Languages.Add(new LanguageInfo("en", "en", "English")); }); - Configure(options => + Configure(options => { options.MenuContributors.Add(new PublicWebSiteMenuContributor()); }); diff --git a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Web/ProductManagementWebModule.cs b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Web/ProductManagementWebModule.cs index a544b49644..aa1c36303f 100644 --- a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Web/ProductManagementWebModule.cs +++ b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Web/ProductManagementWebModule.cs @@ -28,7 +28,7 @@ namespace ProductManagement public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.MenuContributors.Add(new ProductManagementMenuContributor()); }); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs index fea25f5908..0171ea9386 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs @@ -171,7 +171,7 @@ namespace MyCompanyName.MyProjectName.Web private void ConfigureNavigationServices(IConfigurationRoot configuration) { - Configure(options => + Configure(options => { options.MenuContributors.Add(new MyProjectNameMenuContributor(configuration)); }); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index 547dabe001..3ea6dc5f8a 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -159,7 +159,7 @@ namespace MyCompanyName.MyProjectName.Web private void ConfigureNavigationServices() { - Configure(options => + Configure(options => { options.MenuContributors.Add(new MyProjectNameMenuContributor()); }); diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs index 9da3a72716..4c32a7b00a 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs @@ -62,7 +62,7 @@ namespace MyCompanyName.MyProjectName private static void ConfigureNavigationServices(IServiceCollection services) { - services.Configure(options => + services.Configure(options => { options.MenuContributors.Add(new MyProjectNameMenuContributor()); }); diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index c48e57542c..213161e296 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -32,7 +32,7 @@ namespace MyCompanyName.MyProjectName.Web public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.MenuContributors.Add(new MyProjectNameMenuContributor()); });