From d2b1ca292889653e9ddf1ae4cd12041dc80ef275 Mon Sep 17 00:00:00 2001
From: Mansur Besleney <besleneymansur@gmail.com>
Date: Thu, 23 Oct 2025 16:09:34 +0300
Subject: [PATCH] Remove blog post delete button from public view and made some
 other small enhancements

The delete button for blog posts has been removed from the public blog post view and its associated JavaScript handler deleted. Additionally, blog feature queries are now ordered by feature name in both EF Core and MongoDB repositories, and the blog post admin list default sort order has been updated.
---
 .../Pages/CmsKit/BlogPosts/index.js                  |  6 +++++-
 .../Volo/CmsKit/Blogs/EfCoreBlogFeatureRepository.cs |  2 ++
 .../MongoDB/Blogs/MongoBlogFeatureRepository.cs      |  2 ++
 .../Pages/Public/CmsKit/Blogs/BlogPost.cshtml        | 10 ----------
 .../Pages/Public/CmsKit/Blogs/blogPost.js            | 12 ------------
 5 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/index.js
index 9e8c157053..cc2ef9fe66 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/index.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/index.js
@@ -31,7 +31,7 @@ $(function () {
         scrollCollapse: true,
         scrollX: true,
         ordering: true,
-        order: [[2, "desc"]],
+        order: [[4, "desc"]],
         ajax: abp.libs.datatables.createAjax(blogsService.getList, getFilter),
         columnDefs: [
             {
@@ -155,6 +155,10 @@ $(function () {
         dataTable.ajax.reloadEx();
     });
     
+    $statusFilter.on('change', function () {
+        dataTable.ajax.reloadEx();
+    });
+    
     $('#AbpContentToolbar button[name=CreateBlogPost]').on('click', function (e) {
         e.preventDefault();
         window.location.href = "BlogPosts/Create"
diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/EfCoreBlogFeatureRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/EfCoreBlogFeatureRepository.cs
index 8b27b91b59..f7f4f677d3 100644
--- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/EfCoreBlogFeatureRepository.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Blogs/EfCoreBlogFeatureRepository.cs
@@ -25,6 +25,7 @@ public class EfCoreBlogFeatureRepository : EfCoreRepository<ICmsKitDbContext, Bl
     {
         return await (await GetQueryableAsync())
                         .Where(x => x.BlogId == blogId)
+                        .OrderBy(x => x.FeatureName)
                         .ToListAsync(GetCancellationToken(cancellationToken));
     }
 
@@ -32,6 +33,7 @@ public class EfCoreBlogFeatureRepository : EfCoreRepository<ICmsKitDbContext, Bl
     {
         return await (await GetQueryableAsync())
                     .Where(x => x.BlogId == blogId && featureNames.Contains(x.FeatureName))
+                    .OrderBy(x => x.FeatureName)
                     .ToListAsync(GetCancellationToken(cancellationToken));
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogFeatureRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogFeatureRepository.cs
index 606c3e28ff..3bd3e134b5 100644
--- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogFeatureRepository.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogFeatureRepository.cs
@@ -27,6 +27,7 @@ public class MongoBlogFeatureRepository : MongoDbRepository<ICmsKitMongoDbContex
     {
         return await (await GetQueryableAsync(cancellationToken))
                         .Where(x => x.BlogId == blogId)
+                        .OrderBy(x => x.FeatureName)
                         .ToListAsync(GetCancellationToken(cancellationToken));
     }
 
@@ -34,6 +35,7 @@ public class MongoBlogFeatureRepository : MongoDbRepository<ICmsKitMongoDbContex
     {
         return await (await GetQueryableAsync(cancellationToken))
                     .Where(x => x.BlogId == blogId && featureNames.Contains(x.FeatureName))
+                    .OrderBy(x => x.FeatureName)
                     .ToListAsync(GetCancellationToken(cancellationToken));
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml
index fabacd79eb..e3f8fa1677 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml
@@ -130,16 +130,6 @@
     </div>
 
     <div class="col-md-2 d-sm-none d-md-block">
-        @if (Model.ViewModel.Author.Id == CurrentUser.Id)
-        {
-            <button id="deleteBlogPost" class="btn btn-danger">
-                <i class="fa fa-remove">
-                </i>
-                    @L["Delete"]
-            </button>
-
-            <hr />
-        }
         @if (isScrollIndexEnabled)
         {
             <div id="scroll-index" class="docs-inner-anchors mt-2">
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/blogPost.js b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/blogPost.js
index 160cfd3b65..bc68ad4f14 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/blogPost.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/blogPost.js
@@ -1,16 +1,4 @@
 $(function () {
 
     let l = abp.localization.getResource("CmsKit");
-
-    $('#deleteBlogPost').on('click', '', function (e) {
-        abp.message.confirm(l("DeleteBlogPostMessage"), function (ok) {
-            if (ok) {
-                volo.cmsKit.public.blogs.blogPostPublic.delete(
-                    $('#BlogId').val()
-                ).then(function () {
-                    document.location.href = "/";
-                });
-            }
-        })
-    });
 });