From c55fa453ae1d3d014627fa2a3dffa3016dcd9e8c Mon Sep 17 00:00:00 2001
From: malik masis <malik.masis@gmail.com>
Date: Mon, 25 Jul 2022 14:15:20 +0300
Subject: [PATCH 1/2] made `editorWidgetName` is optional

---
 .../CmsKitWebUnifiedModule.cs                       |  2 +-
 .../Pages/CmsKit/Contents/AddWidgetModal.cshtml     | 13 ++++++++-----
 .../CmsKit/Contents/CmsKitContentWidgetOptions.cs   |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs
index 5e953e82d6..4a07c92ca8 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs
@@ -156,7 +156,7 @@ public class CmsKitWebUnifiedModule : AbpModule
 
         Configure<CmsKitContentWidgetOptions>(options =>
         {
-            options.AddWidget("ExComment", "CommentDate", "DecisionCommentDate");
+            options.AddWidget("ExComment", "CommentDate");
         });
     }
 
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml
index 87831e4e1d..942b287fef 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml
@@ -26,11 +26,14 @@
 
                 foreach (var item in Model.ViewModel.Details)
                 {
-                    <div hidden id="editor-@item.Name">
-                        <form data-check-form-on-close="false">
-                            @await Component.InvokeAsync(@item.EditorComponentName)
-                        </form>
-                    </div>
+                    if (item.EditorComponentName is not null)
+                    {
+                        <div hidden id="editor-@item.Name">
+                            <form data-check-form-on-close="false">
+                                @await Component.InvokeAsync(@item.EditorComponentName)
+                            </form>
+                        </div>
+                    }
                 }
             }
             else
diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs
index b87f286b5c..1ff76acf79 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs
@@ -11,7 +11,7 @@ public class CmsKitContentWidgetOptions
         WidgetConfigs = new();
     }
 
-    public void AddWidget(string widgetKey, string widgetName, string editorWidgetName)
+    public void AddWidget(string widgetKey, string widgetName, string editorWidgetName = null)
     {
         var config = new ContentWidgetConfig(widgetName, editorWidgetName);
         WidgetConfigs.Add(widgetKey, config);

From 7e3e0a227229c7a4c97cf4f346e140f7fa35dfda Mon Sep 17 00:00:00 2001
From: malik masis <malik.masis@gmail.com>
Date: Mon, 25 Jul 2022 14:23:24 +0300
Subject: [PATCH 2/2] formating

---
 .../CmsKit/Contents/AddWidgetModal.cshtml     | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml
index 942b287fef..be33dc698e 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml
@@ -20,26 +20,25 @@
         <abp-modal-body>
             <div class="container">
                 @if (Model.Widgets.Count() > 1)
-            {
-
-                <abp-select asp-for="ViewModel.Widget" />
-
-                foreach (var item in Model.ViewModel.Details)
                 {
-                    if (item.EditorComponentName is not null)
+                    <abp-select asp-for="ViewModel.Widget" />
+
+                    foreach (var item in Model.ViewModel.Details)
                     {
-                        <div hidden id="editor-@item.Name">
-                            <form data-check-form-on-close="false">
-                                @await Component.InvokeAsync(@item.EditorComponentName)
-                            </form>
-                        </div>
+                        if (item.EditorComponentName is not null)
+                        {
+                            <div hidden id="editor-@item.Name">
+                                <form data-check-form-on-close="false">
+                                    @await Component.InvokeAsync(@item.EditorComponentName)
+                                </form>
+                            </div>
+                        }
                     }
                 }
-            }
-            else
-            {
-                <p>@L["PleaseConfigureWidgets"].Value</p>
-            }
+                else
+                {
+                    <p>@L["PleaseConfigureWidgets"].Value</p>
+                }
         </div>
     </abp-modal-body>
     <abp-modal-footer>