Merge pull request #18782 from abpframework/cmskit-menuitem-page-rela…

…tion CMSKit - MenuItem & Page relation enhancements
abpframework · Jan 23, 2024 · e1585d5 · e1585d5
2 parents b7a9942 + 2184b53
commit e1585d5
Show file tree

Hide file tree

Showing 24 changed files with 1,791 additions and 1,646 deletions.
diff --git a/...lo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Menus/IMenuItemAdminAppService.cs b/...lo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Menus/IMenuItemAdminAppService.cs
@@ -10,7 +10,7 @@ public interface IMenuItemAdminAppService : IApplicationService
 {
     Task<ListResultDto<MenuItemDto>> GetListAsync();
 
-    Task<MenuItemDto> GetAsync(Guid id);
+    Task<MenuItemWithDetailsDto> GetAsync(Guid id);
 
     Task<MenuItemDto> CreateAsync(MenuItemCreateInput input);
 

diff --git a/...Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Menus/MenuItemWithDetailsDto.cs b/...Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Menus/MenuItemWithDetailsDto.cs
@@ -0,0 +1,10 @@
+using System;
+using Volo.CmsKit.Menus;
+
+namespace Volo.CmsKit.Admin.Menus;
+
+[Serializable]
+public class MenuItemWithDetailsDto : MenuItemDto
+{
+    public string? PageTitle { get; set; }
+}
diff --git a/...olo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationAutoMapperProfile.cs b/...olo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationAutoMapperProfile.cs
@@ -46,5 +46,8 @@ public CmsKitAdminApplicationAutoMapperProfile()
         CreateMap<MediaDescriptor, MediaDescriptorDto>().MapExtraProperties();
 
         CreateMap<MenuItem, MenuItemDto>().MapExtraProperties();
+        CreateMap<MenuItem, MenuItemWithDetailsDto>()
+            .Ignore(x => x.PageTitle)
+            .MapExtraProperties();
     }
 }
diff --git a/...-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Menus/MenuItemAdminAppService.cs b/...-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Menus/MenuItemAdminAppService.cs
@@ -43,10 +43,17 @@ public virtual async Task<ListResultDto<MenuItemDto>> GetListAsync()
         );
     }
 
-    public virtual async Task<MenuItemDto> GetAsync(Guid id)
+    public virtual async Task<MenuItemWithDetailsDto> GetAsync(Guid id)
     {
-        var menu = await MenuItemRepository.GetAsync(id);
-        return ObjectMapper.Map<MenuItem, MenuItemDto>(menu);
+        var menuItem = await MenuItemRepository.GetAsync(id);
+        var dto = ObjectMapper.Map<MenuItem, MenuItemWithDetailsDto>(menuItem);
+
+        if (menuItem.PageId.HasValue)
+        {
+            dto.PageTitle = await PageRepository.FindTitleAsync(menuItem.PageId.Value);
+        }
+
+        return dto;
     }
 
     [Authorize(CmsKitAdminPermissions.Menus.Create)]
@@ -87,7 +94,7 @@ public virtual async Task<MenuItemDto> UpdateAsync(Guid id, MenuItemUpdateInput
         }
         else
         {
-            menuItem.SetUrl(input.Url);
+            MenuManager.SetPageUrl(menuItem, input.Url);
         }
 
         menuItem.SetDisplayName(input.DisplayName);

diff --git a/...ttpApi.Client/ClientProxies/Volo/CmsKit/Admin/Menus/MenuItemAdminClientProxy.Generated.cs b/...ttpApi.Client/ClientProxies/Volo/CmsKit/Admin/Menus/MenuItemAdminClientProxy.Generated.cs
@@ -23,9 +23,9 @@ public virtual async Task<ListResultDto<MenuItemDto>> GetListAsync()
         return await RequestAsync<ListResultDto<MenuItemDto>>(nameof(GetListAsync));
     }
 
-    public virtual async Task<MenuItemDto> GetAsync(Guid id)
+    public virtual async Task<MenuItemWithDetailsDto> GetAsync(Guid id)
     {
-        return await RequestAsync<MenuItemDto>(nameof(GetAsync), new ClientProxyRequestTypeValue
+        return await RequestAsync<MenuItemWithDetailsDto>(nameof(GetAsync), new ClientProxyRequestTypeValue
         {
             { typeof(Guid), id }
         });