From 9243b5128c3411392103bdfafbc2e6f9a0463eb2 Mon Sep 17 00:00:00 2001 From: malik masis Date: Tue, 5 Jul 2022 16:28:17 +0300 Subject: [PATCH] Changed structure of CmsKitContentWidgetOptions --- .../CmsKit/Admin/Contents/ContentWidgetDto.cs | 6 +++--- .../Admin/Contents/ContentAdminAppService.cs | 13 ++----------- .../Pages/CmsKit/Contents/AddWidgetModal.cshtml | 8 +++++--- .../CmsKit/Contents/AddWidgetModal.cshtml.cs | 13 +++++++++++-- .../Pages/CmsKit/Contents/addWidgetModal.js | 6 +++--- .../{PropertyDto.cs => WidgetDetailDto.cs} | 4 ++-- .../CmsKit/Contents/CmsKitContentWidgetOptions.cs | 7 +++---- .../Volo/CmsKit/Contents/ContentWidgetConfig.cs | 15 ++++----------- 8 files changed, 33 insertions(+), 39 deletions(-) rename modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/{PropertyDto.cs => WidgetDetailDto.cs} (59%) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentWidgetDto.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentWidgetDto.cs index 0292108185..dd6a54722e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentWidgetDto.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentWidgetDto.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using Volo.CmsKit.Contents; namespace Volo.CmsKit.Admin.Contents; @@ -8,5 +7,6 @@ namespace Volo.CmsKit.Admin.Contents; public class ContentWidgetDto { public string Key { get; set; } - public List Properties { get; set; } = new(); -} + + public WidgetDetailDto Details { get; set; } +} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs index f8a76cabc8..72f4e444d2 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs @@ -21,16 +21,7 @@ public class ContentAdminAppService : CmsKitAdminAppServiceBase, IContentAdminAp //TODO remove if (!_options.WidgetConfigs.Any()) { - _options.AddWidget("Poll", "CmsPollByCode", new List() - { - new PropertyDto() { Key = "Code", Name = "Code" } - }); - - _options.AddWidget("Comment", "CmsCommenting", new List() - { - new PropertyDto() { Key = "EntityType", Name = "EntityType" }, - new PropertyDto() { Key = "EntityId", Name = "EntityId" } - }); + _options.AddWidget("CmsPollByCode", "Poll", "CmsPolls"); } return Task.FromResult(new ListResultDto() { @@ -39,7 +30,7 @@ public class ContentAdminAppService : CmsKitAdminAppServiceBase, IContentAdminAp new ContentWidgetDto { Key = n.Key, - Properties = n.Value.Properties + Details = new WidgetDetailDto() { InternalName = n.Value.InternalName, Name = n.Value.Name }, }).ToList() }); 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 4614c347c4..10597f19d7 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 @@ -10,8 +10,7 @@ Layout = null; } -@section scripts - { +@section scripts { } @@ -22,7 +21,10 @@ @if (Model.Widgets.Count() > 1) { - + foreach (var item in Model.ViewModel.Details) + { + + }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs index 6614c40d27..f7ed5f5b24 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml.cs @@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Mvc.Rendering; using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form; using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; using Volo.CmsKit.Admin.Contents; +using Volo.CmsKit.Contents; namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.Contents; @@ -25,10 +26,16 @@ public class AddWidgetModal : AbpPageModel public async Task OnGetAsync() { + var widgets = await ContentAdminAppService.GetWidgetsAsync(); + ViewModel = new ContentViewModel() + { + Details = widgets.Items.Select(p => p.Details).ToList() + }; + Widgets = new List() { new("", "") }; - Widgets.AddRange((await ContentAdminAppService.GetWidgetsAsync()) + Widgets.AddRange(widgets .Items - .Select(w => new SelectListItem(w.Key, w.Key)) + .Select(w => new SelectListItem(w.Details.Name, w.Key)) .ToList()); } @@ -36,5 +43,7 @@ public class AddWidgetModal : AbpPageModel { [SelectItems(nameof(Widgets))] public string Widget { get; set; } + + public List Details { get; set; } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js index 108167afa6..6191c54da7 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js @@ -6,15 +6,15 @@ $(function () { let widgetType; $("#ViewModel_Widget").change(function () { - widgetType = this.value; + widgetType = $("#ViewModel_Widget").find(":selected").text(); $("#PropertySideId").html(''); $("#WidgetCodeDiv").hide(); volo.cmsKit.admin.contents.contentAdmin.getWidgets().then(function (data) { - var widgetTypes = data.items.filter(v => v.key === widgetType); + var widgetTypes = data.items.filter(v => v.details.name === widgetType); var firstWidgetType = widgetTypes[0]; - if (firstWidgetType.key == "Poll") { + if (firstWidgetType.key == "CmsPollByCode") { $("#polls").removeAttr("hidden"); $("#WidgetCodeDiv").show(); } diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/PropertyDto.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/WidgetDetailDto.cs similarity index 59% rename from modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/PropertyDto.cs rename to modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/WidgetDetailDto.cs index 4e0a1a700c..5d67ed15cc 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/PropertyDto.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/WidgetDetailDto.cs @@ -3,8 +3,8 @@ namespace Volo.CmsKit.Contents; [Serializable] -public class PropertyDto +public class WidgetDetailDto { - public string Key { get; set; } public string Name { get; set; } + public string InternalName { get; set; } } 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 1a480a18a2..8af6f1f2d0 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,10 +11,9 @@ public class CmsKitContentWidgetOptions WidgetConfigs = new(); } - public void AddWidget(string widgetName, string widgetKey, List properties = null) + public void AddWidget(string widgetKey, string widgetName, string internalWidgetName = null) { - var conf = new ContentWidgetConfig(widgetKey); - conf.Properties.AddRange(properties); - WidgetConfigs.Add(widgetName, conf); + var config = new ContentWidgetConfig(widgetName, internalWidgetName); + WidgetConfigs.Add(widgetKey, config); } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentWidgetConfig.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentWidgetConfig.cs index 507024956a..cbeed83c86 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentWidgetConfig.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentWidgetConfig.cs @@ -1,21 +1,14 @@ -using System.Collections.Generic; - -namespace Volo.CmsKit.Contents; +namespace Volo.CmsKit.Contents; public class ContentWidgetConfig { public string Name { get; } - public List Properties { get; } + public string InternalName { get; } - public ContentWidgetConfig(string widgetName) + public ContentWidgetConfig(string widgetName, string internalName) { - Properties = new(); Name = widgetName; - } - - public void AddProperty(string key, string name) - { - Properties.Add(new PropertyDto() { Key = key, Name = name }); + InternalName = internalName; } } \ No newline at end of file