From 1c6ad741fc9e93197f9242fae6ccb80e47aa6df6 Mon Sep 17 00:00:00 2001 From: enisn Date: Wed, 30 Mar 2022 10:45:42 +0300 Subject: [PATCH 1/2] Fix wrong conflict merging from dev --- .../CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs index 2d6439be0d..01566a823c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs @@ -111,7 +111,7 @@ public class MongoBlogPostRepository : MongoDbRepository> GetAuthorsHasBlogPostsAsync(int skipCount, int maxResultCount, string sorting, string filter, CancellationToken cancellationToken = default) { - var queryable = (await CreateAuthorsQueryableAsync()) + var queryable = (await CreateAuthorsQueryableAsync(cancellationToken)) .Skip(skipCount) .Take(maxResultCount) .OrderBy(sorting.IsNullOrEmpty() ? nameof(CmsUser.UserName) : sorting) @@ -123,17 +123,17 @@ public class MongoBlogPostRepository : MongoDbRepository GetAuthorsHasBlogPostsCountAsync(string filter, CancellationToken cancellationToken = default) { return await AsyncExecuter.CountAsync( - (await CreateAuthorsQueryableAsync()) + (await CreateAuthorsQueryableAsync(cancellationToken)) .WhereIf(!filter.IsNullOrEmpty(), x => x.UserName.Contains(filter.ToLower()))); } public async Task GetAuthorHasBlogPostAsync(Guid id, CancellationToken cancellationToken = default) { - return await AsyncExecuter.FirstOrDefaultAsync(await CreateAuthorsQueryableAsync(), x => x.Id == id) + return await AsyncExecuter.FirstOrDefaultAsync(await CreateAuthorsQueryableAsync(cancellationToken), x => x.Id == id) ?? throw new EntityNotFoundException(typeof(CmsUser), id); } - private async Task> CreateAuthorsQueryableAsync() + private async Task> CreateAuthorsQueryableAsync(CancellationToken cancellationToken = default) { cancellationToken = GetCancellationToken(cancellationToken); @@ -150,7 +150,5 @@ public class MongoBlogPostRepository : MongoDbRepository new { blogPost, user }) .Select(s => s.user) .Distinct(); - - return await AsyncExecuter.ToListAsync(queryable, cancellationToken); } } From ba824a98d60f469128d9ae3e9935aa9e10d96993 Mon Sep 17 00:00:00 2001 From: Musa Demir Date: Wed, 30 Mar 2022 12:28:35 +0300 Subject: [PATCH 2/2] fix scroll index feature --- .../Volo/CmsKit/Localization/Resources/en.json | 3 ++- .../Volo/CmsKit/Localization/Resources/tr.json | 3 ++- .../Volo/CmsKit/Blogs/DefaultBlogFeatureProvider.cs | 1 + .../Pages/Public/CmsKit/Blogs/BlogPost.cshtml | 2 +- .../Pages/Public/CmsKit/Blogs/BlogPost.cshtml.cs | 7 +++++++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json index 573df741b9..db35b90d86 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json @@ -169,6 +169,7 @@ "GoToTop": "Go to top", "InThisDocument": "In this document", "RemoveCoverImageConfirmationMessage": "Are you sure to remove the cover image?", - "RemoveCoverImage": "Remove the cover image" + "RemoveCoverImage": "Remove the cover image", + "CmsKit.BlogPost.ScrollIndex": "Quick navigation bar in blog posts" } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json index b97d8989a2..97bb1cb1c2 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json @@ -168,6 +168,7 @@ "GoToTop": "Yukarı Git", "InThisDocument": "Bu belgede", "RemoveCoverImageConfirmationMessage": "Kapak resmini kaldırmak istediğinize emin misiniz?", - "RemoveCoverImage": "Kapak resmini kaldır" + "RemoveCoverImage": "Kapak resmini kaldır", + "CmsKit.BlogPost.ScrollIndex": "Blog yazılarında hızlı gezinme çubuğu" } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/DefaultBlogFeatureProvider.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/DefaultBlogFeatureProvider.cs index 7d08f0d3fd..1eec1100f2 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/DefaultBlogFeatureProvider.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/DefaultBlogFeatureProvider.cs @@ -16,6 +16,7 @@ public class DefaultBlogFeatureProvider : IDefaultBlogFeatureProvider, ITransien new BlogFeature(blogId, ReactionsFeature.Name), new BlogFeature(blogId, RatingsFeature.Name), new BlogFeature(blogId, TagsFeature.Name), + new BlogFeature(blogId, BlogPostScrollIndexFeature.Name) }); } } 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 709d96182f..62670a742d 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 @@ -19,7 +19,7 @@ @{ string dummyImageSource = "https://dummyimage.com/1280x720/a3a3a3/fff.png?text=" + Model.BlogPost.Title; - var isScrollIndexEnabled = GlobalFeatureManager.Instance.IsEnabled(); + var isScrollIndexEnabled = GlobalFeatureManager.Instance.IsEnabled() && Model.BlogPostScrollIndexFeature?.IsEnabled == true; } @section styles{ diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml.cs index a00359da0f..dcefb976a4 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml.cs @@ -30,6 +30,8 @@ public class BlogPostModel : CmsKitPublicPageModelBase public BlogFeatureDto RatingsFeature { get; private set; } public BlogFeatureDto TagsFeature { get; private set; } + + public BlogFeatureDto BlogPostScrollIndexFeature { get; private set; } protected IBlogPostPublicAppService BlogPostPublicAppService { get; } @@ -66,5 +68,10 @@ public class BlogPostModel : CmsKitPublicPageModelBase { TagsFeature = await BlogFeatureAppService.GetOrDefaultAsync(BlogPost.BlogId, GlobalFeatures.TagsFeature.Name); } + + if (GlobalFeatureManager.Instance.IsEnabled()) + { + BlogPostScrollIndexFeature = await BlogFeatureAppService.GetOrDefaultAsync(BlogPost.BlogId, GlobalFeatures.BlogPostScrollIndexFeature.Name); + } } }