From 3fe381d95e5cf75b62f9d3c84a1be23aeb969344 Mon Sep 17 00:00:00 2001 From: enisn Date: Tue, 22 Jun 2021 18:03:44 +0300 Subject: [PATCH] CmsKit - Refactorins & Renamings --- .../Pages/CmsKit/Menus/MenuItems/index.js | 2 +- .../Volo/CmsKit/Menus/PageChangedHandler.cs | 8 ++++---- .../Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs | 2 +- .../Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs | 2 +- .../Volo/CmsKit/Public/Menus/IMenuItemPublicAppService.cs | 2 +- .../Volo/CmsKit/Public/Menus/MenuItemPublicAppService.cs | 2 +- .../Volo/CmsKit/Public/Menus/MenuItemPublicController.cs | 4 ++-- .../Menus/CmsKitPublicMenuContributor.cs | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/index.js index cd8f840eb5..4a85ac7c8a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/index.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/index.js @@ -2,7 +2,7 @@ $(function () { var l = abp.localization.getResource("CmsKit"); - var menuService = volo.cmsKit.admin.menus.menuAdmin; + var menuService = volo.cmsKit.admin.menus.menuItemAdmin; var createModal = new abp.ModalManager({ viewUrl: abp.appPath + 'CmsKit/Menus/MenuItems/CreateModal', modalClass: 'createMenuItem' }); var updateModal = new abp.ModalManager({ viewUrl: abp.appPath + 'CmsKit/Menus/MenuItems/UpdateModal', modalClass: 'updateMenuItem'}); diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Menus/PageChangedHandler.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Menus/PageChangedHandler.cs index ba8ce0ad47..ca1b376afc 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Menus/PageChangedHandler.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Menus/PageChangedHandler.cs @@ -1,4 +1,3 @@ -using System; using System.Linq; using System.Threading.Tasks; using Volo.Abp.DependencyInjection; @@ -8,20 +7,21 @@ using Volo.CmsKit.Pages; namespace Volo.CmsKit.Menus { - public class PageChangedHandler: ILocalEventHandler>, + public class PageChangedHandler : + ILocalEventHandler>, ITransientDependency { protected IMenuItemRepository MenuRepository { get; } protected MenuItemManager MenuManager { get; } public PageChangedHandler( - IMenuItemRepository menuRepository, + IMenuItemRepository menuRepository, MenuItemManager menuManager) { MenuRepository = menuRepository; MenuManager = menuManager; } - + public async Task HandleEventAsync(EntityUpdatedEventData eventData) { // TODO: Write a repository query. diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs index e970a3d48a..d1fca18b18 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs @@ -39,7 +39,7 @@ namespace Volo.CmsKit.MongoDB public IMongoCollection MediaDescriptors => Collection(); - public IMongoCollection Menus => Collection(); + public IMongoCollection MenuItems => Collection(); protected override void CreateModel(IMongoModelBuilder modelBuilder) { diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs index 853c522b11..9e71b4a72e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs @@ -39,6 +39,6 @@ namespace Volo.CmsKit.MongoDB IMongoCollection MediaDescriptors { get; } - IMongoCollection Menus { get; } + IMongoCollection MenuItems { get; } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Menus/IMenuItemPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Menus/IMenuItemPublicAppService.cs index 6875a4049c..0acd43de27 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Menus/IMenuItemPublicAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Menus/IMenuItemPublicAppService.cs @@ -7,6 +7,6 @@ namespace Volo.CmsKit.Public.Menus { public interface IMenuItemPublicAppService : IApplicationService { - Task> GetMenuItemsAsync(); + Task> GetListAsync(); } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Menus/MenuItemPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Menus/MenuItemPublicAppService.cs index aa9ec36673..1d2e4a0fc3 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Menus/MenuItemPublicAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Menus/MenuItemPublicAppService.cs @@ -21,7 +21,7 @@ namespace Volo.CmsKit.Public.Menus DistributedCache = distributedCache; } - public async Task> GetMenuItemsAsync() + public async Task> GetListAsync() { var cachedMenu = await DistributedCache.GetOrAddAsync( MenuApplicationConsts.MainMenuCacheKey, diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Menus/MenuItemPublicController.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Menus/MenuItemPublicController.cs index b1b5482bd7..c64b8e3ffa 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Menus/MenuItemPublicController.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Menus/MenuItemPublicController.cs @@ -22,9 +22,9 @@ namespace Volo.CmsKit.Public.Menus } [HttpGet] - public Task> GetMenuItemsAsync() + public Task> GetListAsync() { - return MenuPublicAppService.GetMenuItemsAsync(); + return MenuPublicAppService.GetListAsync(); } } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Menus/CmsKitPublicMenuContributor.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Menus/CmsKitPublicMenuContributor.cs index e29c717380..c31d52740d 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Menus/CmsKitPublicMenuContributor.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Menus/CmsKitPublicMenuContributor.cs @@ -26,7 +26,7 @@ namespace Volo.CmsKit.Public.Web.Menus { var menuAppService = context.ServiceProvider.GetRequiredService(); - var menuItems = await menuAppService.GetMenuItemsAsync(); + var menuItems = await menuAppService.GetListAsync(); if (!menuItems.IsNullOrEmpty()) {