refactor part 2

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Comments/ICommentAdminAppService.cs

@@ -20,6 +20,4 @@ public interface ICommentAdminAppService : IApplicationService
     Task<SettingsDto> GetSettingsAsync();
 
 	Task<int> GetWaitingCountAsync();
-
-    Task<PagedResultDto<CommentWithAuthorDto>> GetWaitingWithRepliesAsync(CommentGetListInput input);
 }

modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Comments/CommentAdminAppService.cs

@@ -83,8 +83,7 @@ public class CommentAdminAppService : CmsKitAdminAppServiceBase, ICommentAdminAp
         await CommentRepository.DeleteWithRepliesAsync(comment);
     }
 
-
-
+    [Authorize(CmsKitAdminPermissions.Comments.Update)]
     public async Task UpdateApprovalStatusAsync(Guid id, CommentApprovalDto input)
     {
 		var comment = await CommentRepository.GetAsync(id);
@@ -93,6 +92,7 @@ public class CommentAdminAppService : CmsKitAdminAppServiceBase, ICommentAdminAp
 		await CommentRepository.UpdateAsync(comment);
 	}
 
+    [Authorize(CmsKitAdminPermissions.Comments.Update)]
     public async Task SetSettingsAsync(SettingsDto input)
     {
         await _settingManager.SetGlobalAsync(AppSettings.CommentRequireApprovement, input.CommentRequireApprovement.ToString());
@@ -112,40 +112,4 @@ public class CommentAdminAppService : CmsKitAdminAppServiceBase, ICommentAdminAp
 	{
 		return (int) await CommentRepository.GetCountAsync(commentApproveState: CommentApproveState.Waiting);
 	}
-
-    public async Task<PagedResultDto<CommentWithAuthorDto>> GetWaitingWithRepliesAsync(CommentGetListInput input)
-    {
-        var totalCount = await CommentRepository.GetCountAsync(
-         input.Text,
-         input.EntityType,
-         input.RepliedCommentId,
-         input.Author,
-         input.CreationStartDate,
-         input.CreationEndDate,
-         CommentApproveState.Waiting
-         );
-
-        var comments = await CommentRepository.GetListAsync(
-            input.Text,
-            input.EntityType,
-            input.RepliedCommentId,
-            input.Author,
-            input.CreationStartDate,
-            input.CreationEndDate,
-            input.Sorting,
-            input.MaxResultCount,
-            input.SkipCount,
-            CommentApproveState.Waiting
-        );
-
-        var dtos = comments.Select(queryResultItem =>
-        {
-            var dto = ObjectMapper.Map<Comment, CommentWithAuthorDto>(queryResultItem.Comment);
-            dto.Author = ObjectMapper.Map<CmsUser, CmsUserDto>(queryResultItem.Author);
-
-            return dto;
-        }).ToList();
-
-        return new PagedResultDto<CommentWithAuthorDto>(totalCount, dtos);
-    }
 }

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Comments/CommentAdminController.cs

@@ -49,18 +49,17 @@ public class CommentAdminController : CmsKitAdminController, ICommentAdminAppSer
         return CommentAdminAppService.DeleteAsync(id);
     }
 
-	[HttpPost]
-	[Route("{id}")]
+	[HttpPut]
+	[Route("{id}/approval-status")]
     [Authorize(CmsKitAdminPermissions.Comments.Update)]
     public Task UpdateApprovalStatusAsync(Guid id, CommentApprovalDto input)
     {
 		return CommentAdminAppService.UpdateApprovalStatusAsync(id, input);
-
 	}
 
     [HttpPost]
     [Route("settings")]
-    [Authorize(CmsKitAdminPermissions.Comments.Default)]
+    [Authorize(CmsKitAdminPermissions.Comments.Update)]
     public Task SetSettingsAsync(SettingsDto input)
     {
        return CommentAdminAppService.SetSettingsAsync(input);
@@ -81,12 +80,4 @@ public class CommentAdminController : CmsKitAdminController, ICommentAdminAppSer
 	{
 		return CommentAdminAppService.GetWaitingCountAsync();
 	}
-
-    [HttpGet]
-    [Route("waiting")]
-    [Authorize(CmsKitAdminPermissions.Comments.Default)]
-    public Task<PagedResultDto<CommentWithAuthorDto>> GetWaitingWithRepliesAsync(CommentGetListInput input)
-    {
-        return CommentAdminAppService.GetWaitingWithRepliesAsync(input);
-    }
 }

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Shared/Components/Comments/CommentSettingPageContributor.cs

@@ -20,12 +20,12 @@ public class CommentSettingPageContributor : ISettingPageContributor
             )
         );
 
-
         return Task.CompletedTask;
     }
 
     public Task<bool> CheckPermissionsAsync(SettingPageCreationContext context)
     {
+        // Add permission
         return Task.FromResult(true);
     }
 }