From 9f420db9a2be5f7fba62d06521e35375f6ddf04e Mon Sep 17 00:00:00 2001
From: Salih <salihozkara00@gmail.com>
Date: Fri, 14 Jul 2023 10:55:43 +0300
Subject: [PATCH] Refactor

---
 .../CmsKit/Shared/Components/PopularTags/Default.cshtml    | 4 ++--
 .../Components/PopularTags/PopularTagsViewComponent.cs     | 7 +++----
 .../Pages/CmsKit/Shared/Components/Tags/Default.cshtml     | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/PopularTags/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/PopularTags/Default.cshtml
index 0946744aaa..eb67129d8c 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/PopularTags/Default.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/PopularTags/Default.cshtml
@@ -10,7 +10,7 @@
     <div class="cms-tags-area my-3">
         @foreach (var tag in Model.Tags)
         {
-            if (Model.UrlFactory == null)
+            if (Model.UrlFormat.IsNullOrWhiteSpace())
             {
                 <span class="br-8 me-2 mb-2 p-2 d-inline-block cmskit-tag fw--5" style="background: #eeedf7; color: #766bc8">
                     @tag.Name
@@ -18,7 +18,7 @@
             }
             else
             {
-                <a href="@Model.UrlFactory(tag)">
+                <a href="@Model.UrlFormat.Replace("{TagId}", tag.Id.ToString()).Replace("{TagName}",tag.Name)">
                     <span class="br-8 me-2 mb-2 p-2 d-inline-block cmskit-tag fw--5" style="background: #eeedf7; color: #766bc8">
                         @tag.Name
                     </span>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/PopularTags/PopularTagsViewComponent.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/PopularTags/PopularTagsViewComponent.cs
index 465805642b..1a766ae452 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/PopularTags/PopularTagsViewComponent.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/PopularTags/PopularTagsViewComponent.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc;
-using Volo.Abp.Uow;
 using Volo.CmsKit.Tags;
 
 namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.PopularTags;
@@ -17,12 +16,12 @@ public class PopularTagsViewComponent : AbpViewComponent
         _tagAppService = tagAppService;
     }
     
-    public async Task<IViewComponentResult> InvokeAsync(string entityType, int maxCount, Func<PopularTagDto, string> urlFactory = null)
+    public async Task<IViewComponentResult> InvokeAsync(string entityType, int maxCount, string urlFormat)
     {
         var model = new PopularTagsViewModel
         {
             Tags = await _tagAppService.GetPopularTagsAsync(entityType, maxCount),
-            UrlFactory = urlFactory
+            UrlFormat = urlFormat
         };
         return View("~/Pages/CmsKit/Shared/Components/PopularTags/Default.cshtml", model);
     }
@@ -30,6 +29,6 @@ public class PopularTagsViewComponent : AbpViewComponent
     public class PopularTagsViewModel
     {
         public List<PopularTagDto> Tags { get; set; }
-        public Func<PopularTagDto, string> UrlFactory { get; set; }
+        public string UrlFormat { get; set; }
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Tags/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Tags/Default.cshtml
index c8b588debc..e9567b8b3e 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Tags/Default.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Tags/Default.cshtml
@@ -16,7 +16,7 @@
                 }
                 else
                 {
-                    var formattedUrl = Model.UrlFormat.Replace("{TagId}", tag.Id.ToString());
+                    var formattedUrl = Model.UrlFormat.Replace("{TagId}", tag.Id.ToString()).Replace("{TagName}", tag.Name);
                     <a href="@formattedUrl"><span class="badge rounded-pill bg-light text-dark px-3 py-2 cmskit-tag font-weight-normal">@tag.Name</span></a>
                 }
             }