Merge pull request #600 from poppastring/update-comment-mgmt

Update the comments management page

close #597

Author: poppastring

source/DasBlog.Web.Core/Common/Constants.cs

@@ -22,6 +22,9 @@ public static class Constants
 		public const string PostCount = "post-count";
 		public const string ArchivePageTitle = "Archive";
 		public const string ArchiveAllPageTitle = "Complete Archive";
+		public const string CommentShowPageControl = "comment-show-page-control";
+		public const string CommentPageNumber = "comment-page-number";
+		public const string CommentPostCount = "comment-post-count";
 
 		//
 		public const string TinyMceEditor = "tinymce";

source/DasBlog.Web.Repositories/BlogManager.cs

@@ -29,6 +29,7 @@ public class BlogManager : IBlogManager
 		private readonly ILogger logger;
 		private static readonly Regex stripTags = new Regex("<[^>]*>", RegexOptions.Compiled | RegexOptions.CultureInvariant);
 		private readonly IDasBlogSettings dasBlogSettings;
+		private const int COMMENT_PAGE_SIZE = 5;
 
 		public BlogManager( ILogger<BlogManager> logger, IDasBlogSettings dasBlogSettings)
 		{
@@ -442,6 +443,20 @@ public CommentCollection GetAllComments()
 			return dataService.GetAllComments();
 		}
 
+		public List<Comment> GetCommentsFrontPage()
+		{
+			var comments = dataService.GetAllComments().OrderByDescending(d => d.CreatedUtc).ToList();
+
+			return comments.Take(COMMENT_PAGE_SIZE).ToList();
+		}
+
+		public List<Comment> GetCommentsForPage(int pageIndex)
+		{
+			var comments = dataService.GetAllComments().OrderByDescending(d => d.CreatedUtc).ToList();
+
+			return comments.Skip((pageIndex) * COMMENT_PAGE_SIZE).Take(COMMENT_PAGE_SIZE).ToList();
+		}
+
 		public CategoryCacheEntryCollection GetCategories()
 		{
 			return dataService.GetCategories();

source/DasBlog.Web.Repositories/Interfaces/IBlogManager.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using newtelligence.DasBlog.Runtime;
 
@@ -34,6 +35,10 @@ public interface IBlogManager
 
 		CommentCollection GetAllComments();
 
+		List<Comment> GetCommentsFrontPage();
+
+		List<Comment> GetCommentsForPage(int pageIndex);
+
 		EntryCollection SearchEntries(string searchString, string acceptLanguageHeader);
 
 		bool SendTestEmail();

source/DasBlog.Web.UI/Config/meta.Development.config

@@ -1,12 +1 @@
-<?xml version="1.0" standalone="yes"?>
-<MetaTags>
-  <MetaDescription>John Doe is a professional web developer. He is blogging about ASP.NET and web developing.</MetaDescription>
-  <MetaKeywords>ASP.NET Silverlight CSS HTML JavaScript</MetaKeywords>
-  <TwitterCard>summary</TwitterCard>
-  <TwitterSite>@twitterhandle</TwitterSite>
-  <TwitterCreator>@twitterhandle</TwitterCreator>
-  <TwitterImage>http://www.somesite.com/images/defaultsiteimage.png</TwitterImage>
-  <FaceBookAdmins>fbadmin</FaceBookAdmins>
-  <FaceBookAppID>AB124321234</FaceBookAppID>
-  <GoogleAnalyticsID>UA</GoogleAnalyticsID>
-</MetaTags>
+<?xml version="1.0" encoding="utf-8"?><MetaTags><MetaDescription>John Doe is a professional web developer. He is blogging about ASP.NET and web developing.</MetaDescription><MetaKeywords>ASP.NET Silverlight CSS HTML JavaScript</MetaKeywords><TwitterCard>summary</TwitterCard><TwitterSite>@twitterhandle</TwitterSite><TwitterCreator>@twitterhandle</TwitterCreator><TwitterImage>http://www.somesite.com/images/defaultsiteimage.png</TwitterImage><FaceBookAdmins>fbadmin</FaceBookAdmins><FaceBookAppID>AB124321234</FaceBookAppID><GoogleAnalyticsID>UA</GoogleAnalyticsID></MetaTags>

source/DasBlog.Web.UI/Config/site.Development.config

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using AutoMapper;
+using DasBlog.Core.Common;
 using DasBlog.Managers.Interfaces;
 using DasBlog.Services;
 using DasBlog.Services.ActivityLogs;
@@ -91,25 +92,57 @@ public IActionResult Settings(DasBlogSettingsViewModel settings)
 		[HttpGet("/admin/manage-comments/{postid}")]
 		public IActionResult ManageComments(string postid)
 		{
-			List<CommentAdminViewModel> comments = null;
+			var comments = new List<CommentAdminViewModel>();
 
 			if (postid != null)
 			{
 				comments = blogManager.GetComments(postid, true).Select(comment => mapper.Map<CommentAdminViewModel>(comment)).ToList();
+				ViewData[Constants.CommentShowPageControl] = false;
 			}
 			else
 			{
-				comments = blogManager.GetAllComments().Select(comment => mapper.Map<CommentAdminViewModel>(comment)).ToList();
+				comments = blogManager.GetCommentsFrontPage().Select(comment => mapper.Map<CommentAdminViewModel>(comment)).ToList();
+				ViewData[Constants.CommentShowPageControl] = true;
 			}
 
 			foreach (var cmt in comments)
 			{
 				cmt.Title = blogManager.GetBlogPostByGuid(new Guid(cmt.BlogPostId))?.Title;
 			}
 
+			ViewData[Constants.CommentPageNumber] = 0;
+			ViewData[Constants.CommentPostCount] = 5;
 			return View(comments.OrderByDescending(d => d.Date).ToList());
 		}
 
+		[HttpGet]
+		[Route("/admin/manage-comments/page")]
+		[HttpGet("/admin/manage-comments/page/{page}")]
+		public IActionResult ManageCommentsByPage(int page) 
+		{
+			var comments = new List<CommentAdminViewModel>();
+
+			if (page > 0)
+			{
+				comments = blogManager.GetCommentsForPage(page).Select(comment => mapper.Map<CommentAdminViewModel>(comment)).ToList();
+			}
+			else
+			{
+				comments = blogManager.GetCommentsFrontPage().Select(comment => mapper.Map<CommentAdminViewModel>(comment)).ToList();
+			}
+
+			foreach (var cmt in comments)
+			{
+				cmt.Title = blogManager.GetBlogPostByGuid(new Guid(cmt.BlogPostId))?.Title;
+			}
+
+			ViewData[Constants.CommentShowPageControl] = true;
+			ViewData[Constants.CommentPostCount] = 5;
+			ViewData[Constants.CommentPageNumber] = page;
+
+			return View("ManageComments", comments.OrderByDescending(d => d.Date).ToList());
+		}
+
 		public IActionResult TestEmail()
 		{
 			if (!blogManager.SendTestEmail())

source/DasBlog.Web.UI/Controllers/AdminController.cs

@@ -54,6 +54,7 @@
    </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties" />
+    <Folder Include="wwwroot\lib\font-awesome\" />
   </ItemGroup>
 
 </Project>

source/DasBlog.Web.UI/DasBlog.Web.csproj

@@ -21,9 +21,8 @@ public CommentApprovalLinkTagHelper(IDasBlogSettings dasBlogSettings)
 			this.dasBlogSettings = dasBlogSettings;
 		}
 
-		public override void Process(TagHelperContext context, TagHelperOutput output)
+		public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
 		{
-			var approvalurl = string.Format(COMMENTAPPROVE_URL, dasBlogSettings.GetPermaLinkUrl(Comment.BlogPostId), Comment.CommentId);
 			var commenttxt = string.Format(COMMENTTEXT_MSG, Comment.Name);
 			var message = "Comment Approved";
 			var admin = string.Empty;
@@ -35,20 +34,28 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
 
 			output.TagName = "a";
 			output.TagMode = TagMode.StartTagAndEndTag;
-			output.Attributes.SetAttribute("href", $"javascript:commentManagement(\"{approvalurl}\",\"{commenttxt}\",\"PATCH\",\"{admin}\")");
+			output.Attributes.SetAttribute("href", $"javascript:commentManagement(\"{Comment.BlogPostId}\",\"{Comment.CommentId}\",\"{commenttxt}\",\"PATCH\",\"{admin}\")");
 			output.Attributes.SetAttribute("class", "dbc-comment-approve-link");
 
-			if (Comment.SpamState != SpamStateViewModel.NotSpam)
+			var content = await output.GetChildContentAsync();
+
+			if(string.IsNullOrWhiteSpace(content.GetContent()))
+			{
+				if (Comment.SpamState != SpamStateViewModel.NotSpam)
+				{
+					message = "Approve this comment";
+				}
+				else
+				{
+					message = "Comment Approved";
+				}
+			}
+			else
 			{
-				message = "Approve this comment";
+				message = content.GetContent().Trim();
 			}
 
 			output.Content.SetHtmlContent(message);
 		}
-
-		public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
-		{
-			return Task.Run(() => Process(context, output));
-		}
 	}
 }

source/DasBlog.Web.UI/TagHelpers/Comments/CommentApprovalLinkTagHelper.cs

@@ -0,0 +1,38 @@
+using System.Threading.Tasks;
+using DasBlog.Web.Models.BlogViewModels;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace DasBlog.Web.TagHelpers.Comments
+{
+	public class CommentCssTagHelper : TagHelper
+	{
+		public CommentAdminViewModel Comment { get; set; }
+
+		public override void Process(TagHelperContext context, TagHelperOutput output)
+		{
+			string css;
+			switch (Comment.SpamState)
+			{
+				case SpamStateViewModel.Spam:
+					css = "table-danger";
+					break;
+				case SpamStateViewModel.NotSpam:
+					css = "table-success";
+					break;
+				default:
+					css = "table-warning";
+					break;
+			}
+
+			output.TagName = "tr";
+			output.TagMode = TagMode.StartTagAndEndTag;
+			output.Attributes.SetAttribute("class", css);
+		}
+
+		public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+		{
+			return Task.Run(() => Process(context, output));
+		}
+
+	}
+}

source/DasBlog.Web.UI/TagHelpers/Comments/CommentCssTagHelper.cs

@@ -13,16 +13,26 @@ public class CommentDateTagHelper : TagHelper
 
 		public string DateTimeFormat { get; set; }
 
+		public string Css { get; set; }
+
 		public override void Process(TagHelperContext context, TagHelperOutput output)
 		{
 			if(string.IsNullOrWhiteSpace(DateTimeFormat))
 			{
 				DateTimeFormat = "MMMM dd, yyyy H:mm";
 			}
 
+			if (string.IsNullOrEmpty(Css))
+			{
+				output.Attributes.SetAttribute("class", "dbc-comment-date");
+			}
+			else
+			{
+				output.Attributes.SetAttribute("class", Css);
+			}
+
 			output.TagName = "span";
 			output.TagMode = TagMode.StartTagAndEndTag;
-			output.Attributes.SetAttribute("class", "dbc-comment-date");
 			output.Content.SetHtmlContent(Comment.Date.ToString(DateTimeFormat));
 		}