From 62529edbf8081e5786141ff0520526d777c80a2b Mon Sep 17 00:00:00 2001
From: malik masis <malik.masis@gmail.com>
Date: Tue, 21 Jun 2022 18:34:15 +0300
Subject: [PATCH] Moved ConvertToDynamicObject to framework

---
 .../Generic/AbpDictionaryExtensions.cs        | 19 +++++++++++++++++
 .../Volo.CmsKit.Common.Web/Contents/Helper.cs | 21 -------------------
 .../Pages/Public/CmsKit/Blogs/BlogPost.cshtml |  2 --
 .../Pages/Public/CmsKit/Pages/Index.cshtml    |  5 +----
 4 files changed, 20 insertions(+), 27 deletions(-)
 delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/Helper.cs

diff --git a/framework/src/Volo.Abp.Core/System/Collections/Generic/AbpDictionaryExtensions.cs b/framework/src/Volo.Abp.Core/System/Collections/Generic/AbpDictionaryExtensions.cs
index 1e6dd0288c..6ac5601f7d 100644
--- a/framework/src/Volo.Abp.Core/System/Collections/Generic/AbpDictionaryExtensions.cs
+++ b/framework/src/Volo.Abp.Core/System/Collections/Generic/AbpDictionaryExtensions.cs
@@ -1,4 +1,5 @@
 using System.Collections.Concurrent;
+using System.Dynamic;
 
 namespace System.Collections.Generic;
 
@@ -128,4 +129,22 @@ public static class AbpDictionaryExtensions
     {
         return dictionary.GetOrAdd(key, k => factory());
     }
+
+    /// <summary>
+    /// Converts a <string,object> dictionary to dynamic object so added and removed at run
+    /// </summary>
+    /// <param name="dictionary">The collection object</param>
+    /// <returns>If value is correct, return ExpandoObject that represents an object</returns>
+    public static dynamic ConvertToDynamicObject(this Dictionary<string, object> dictionary)
+    {
+        var expandoObject = new ExpandoObject();
+        var expendObjectCollection = (ICollection<KeyValuePair<string, object>>)expandoObject;
+
+        foreach (var keyValuePair in dictionary)
+        {
+            expendObjectCollection.Add(keyValuePair);
+        }
+
+        return expandoObject;
+    }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/Helper.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/Helper.cs
deleted file mode 100644
index d61c5f418a..0000000000
--- a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/Helper.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Collections.Generic;
-using System.Dynamic;
-
-namespace Volo.CmsKit.Web.Contents;
-
-public static class DictionaryDynamicExtensions
-{
-    public static dynamic ConvertToDynamicObject(this Dictionary<string, object> dict) //TODO: Move to AbpDictionaryExtensions
-    {
-        var expandoObject = new ExpandoObject();
-        var eoColl = (ICollection<KeyValuePair<string, object>>)expandoObject;
-
-        foreach (var kvp in dict)
-        {
-            eoColl.Add(kvp);
-        }
-
-        return expandoObject;
-    }
-}
-
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 d9211ed04c..2cff5c9072 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
@@ -1,6 +1,5 @@
 @page
 
-@using System.Dynamic
 @using Volo.Abp.Data
 @using Volo.CmsKit.Public.Blogs
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Blogs.BlogPostComment
@@ -13,7 +12,6 @@
 @using Volo.CmsKit.Public.Web.Renderers
 @using Volo.Abp.AspNetCore.Mvc.UI.Packages.HighlightJs
 @using Volo.CmsKit.Contents
-@using Volo.CmsKit.Web.Contents;
 
 @inherits CmsKitPublicPageBase
 
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml
index 17045c4575..5a92ae2b04 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml
@@ -1,5 +1,4 @@
-
-@page
+@page
 @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
 @using Volo.CmsKit.Contents
 @using System.Dynamic
@@ -7,8 +6,6 @@
 @using Volo.Abp.Data
 @using Volo.Abp.AspNetCore.Mvc.UI.Packages.HighlightJs;
 @using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
-@using Volo.CmsKit.Web.Contents;
-
 
 @inject IMarkdownToHtmlRenderer MarkdownRenderer