Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Added the ability to manage menus in the admin panel.
support35bd2743428f
diff --git a/src/Business/Grand.Business.Core/Interfaces/System/Admin/IAdminSiteMapService.cs b/src/Business/Grand.Business.Core/Interfaces/System/Admin/IAdminSiteMapService.csindex 45aaaf6d2..7cce1e59d 100644--- a/src/Business/Grand.Business.Core/Interfaces/System/Admin/IAdminSiteMapService.cs+++ b/src/Business/Grand.Business.Core/Interfaces/System/Admin/IAdminSiteMapService.cs@@ -5,5 +5,9 @@ namespace Grand.Business.Core.Interfaces.System.Adminpublic interface IAdminSiteMapService{Task<IList<AdminSiteMap>> GetSiteMap();+ Task InsertSiteMap(AdminSiteMap entity);+ Task UpdateSiteMap(AdminSiteMap entity);+ Task DeleteSiteMap(AdminSiteMap entity);+}}diff --git a/src/Business/Grand.Business.Core/Utilities/System/StandardAdminSiteMap.cs b/src/Business/Grand.Business.Core/Utilities/System/StandardAdminSiteMap.csindex 9c5677e75..ccacaa9dd 100644--- a/src/Business/Grand.Business.Core/Utilities/System/StandardAdminSiteMap.cs+++ b/src/Business/Grand.Business.Core/Utilities/System/StandardAdminSiteMap.cs@@ -697,12 +697,21 @@ namespace Grand.Business.Core.Utilities.SystemDisplayOrder = 6,IconClass = "fa fa-dot-circle-o"},+ new () {+ SystemName = "Admin menu",+ ResourceName = "Admin.Configuration.Menu",+ PermissionNames = new List<string> { PermissionSystemName.Maintenance },+ ControllerName = "Menu",+ ActionName = "Index",+ DisplayOrder = 7,+ IconClass = "fa fa-dot-circle-o"+ },new () {SystemName = "Payment",ResourceName = "Admin.Configuration.Payment",PermissionNames = new List<string> { PermissionSystemName.PaymentMethods },IconClass = "fa fa-arrow-circle-o-right",- DisplayOrder = 7,+ DisplayOrder = 8,ChildNodes = new List<AdminSiteMap> {new () {SystemName = "Payment methods",@@ -738,7 +747,7 @@ namespace Grand.Business.Core.Utilities.SystemResourceName = "Admin.Configuration.Shipping",PermissionNames = new List<string> { PermissionSystemName.ShippingSettings },IconClass = "fa fa-arrow-circle-o-right",- DisplayOrder = 8,+ DisplayOrder = 9,ChildNodes = new List<AdminSiteMap> {new () {SystemName = "Shipping providers",@@ -812,7 +821,7 @@ namespace Grand.Business.Core.Utilities.SystemResourceName = "Admin.Configuration.Tax",PermissionNames = new List<string> { PermissionSystemName.TaxSettings },IconClass = "fa fa-arrow-circle-o-right",- DisplayOrder = 9,+ DisplayOrder = 10,ChildNodes = new List<AdminSiteMap> {new () {SystemName = "Tax providers",@@ -845,7 +854,7 @@ namespace Grand.Business.Core.Utilities.SystemResourceName = "Admin.Configuration.Layouts",PermissionNames = new List<string> { PermissionSystemName.Maintenance },IconClass = "fa fa-arrow-circle-o-right",- DisplayOrder = 10,+ DisplayOrder = 11,ChildNodes = new List<AdminSiteMap> {new () {SystemName = "Category layouts",diff --git a/src/Business/Grand.Business.System/Services/Admin/AdminSiteMapService.cs b/src/Business/Grand.Business.System/Services/Admin/AdminSiteMapService.csindex 3747d89b1..caf85aeeb 100644--- a/src/Business/Grand.Business.System/Services/Admin/AdminSiteMapService.cs+++ b/src/Business/Grand.Business.System/Services/Admin/AdminSiteMapService.cs@@ -1,8 +1,10 @@using Grand.Business.Core.Interfaces.System.Admin;-using Grand.Business.Core.Utilities.System;using Grand.Infrastructure.Caching;using Grand.Domain.Admin;using Grand.Domain.Data;+using Grand.Infrastructure.Caching.Constants;+using Grand.Infrastructure.Extensions;+using MediatR;namespace Grand.Business.System.Services.Admin{@@ -10,28 +12,71 @@ namespace Grand.Business.System.Services.Admin{private readonly IRepository<AdminSiteMap> _adminSiteMapRepository;private readonly ICacheBase _cacheBase;+ private readonly IMediator _mediator;public AdminSiteMapService(IRepository<AdminSiteMap> adminSiteMapRepository,- ICacheBase cacheBase)+ ICacheBase cacheBase,+ IMediator mediator){_adminSiteMapRepository = adminSiteMapRepository;_cacheBase = cacheBase;+ _mediator = mediator;}public virtual async Task<IList<AdminSiteMap>> GetSiteMap(){- return await _cacheBase.GetAsync("ADMIN_SITEMAP", async () =>+ return await _cacheBase.GetAsync(CacheKey.ADMIN_SITEMAP_KEY, () =>{var query = from c in _adminSiteMapRepository.Tableorderby c.DisplayOrderselect c;- var list = query.ToList();- if (list.Any())- return list;- return await Task.FromResult(StandardAdminSiteMap.SiteMap.OrderBy(x=>x.DisplayOrder).ToList());+ return Task.FromResult(query.ToList());});}++ public virtual async Task InsertSiteMap(AdminSiteMap entity)+ {+ if (entity == null)+ throw new ArgumentNullException(nameof(entity));++ await _adminSiteMapRepository.InsertAsync(entity);++ //clear cache+ await _cacheBase.RemoveByPrefix(CacheKey.ADMIN_SITEMAP_PATTERN_KEY);++ //event notification+ await _mediator.EntityInserted(entity);++ }++ public virtual async Task UpdateSiteMap(AdminSiteMap entity)+ {+ if (entity == null)+ throw new ArgumentNullException(nameof(entity));++ await _adminSiteMapRepository.UpdateAsync(entity);++ //clear cache+ await _cacheBase.RemoveByPrefix(CacheKey.ADMIN_SITEMAP_PATTERN_KEY);++ //event notification+ await _mediator.EntityUpdated(entity);+ }++ public virtual async Task DeleteSiteMap(AdminSiteMap entity)+ {+ if (entity == null)+ throw new ArgumentNullException(nameof(entity));++ await _adminSiteMapRepository.DeleteAsync(entity);++ //clear cache+ await _cacheBase.RemoveByPrefix(CacheKey.ADMIN_SITEMAP_PATTERN_KEY);++ //event notification+ await _mediator.EntityDeleted(entity);+ }}}diff --git a/src/Core/Grand.Infrastructure/Caching/Constants/SiteMapCacheKey.cs b/src/Core/Grand.Infrastructure/Caching/Constants/SiteMapCacheKey.csnew file mode 100644index 000000000..9ba1892bf--- /dev/null+++ b/src/Core/Grand.Infrastructure/Caching/Constants/SiteMapCacheKey.cs@@ -0,0 +1,16 @@+namespace Grand.Infrastructure.Caching.Constants+{+ public static partial class CacheKey+ {+ /// <summary>+ /// Key for caching+ /// </summary>+ public static string ADMIN_SITEMAP_KEY => "Grand.admin-sitemap.all";++ /// <summary>+ /// Key pattern to clear cache+ /// </summary>+ public static string ADMIN_SITEMAP_PATTERN_KEY => "Grand.admin-sitemap.";++ }+}diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/Create.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/Create.cshtmlnew file mode 100644index 000000000..21f5d554b--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/Create.cshtml@@ -0,0 +1,30 @@+@model MenuModel+@{+ //page title+ ViewBag.Title = Loc["Admin.Configuration.Menu.AddNew"];+}+<form asp-area="@Constants.AreaAdmin" asp-controller="Menu" asp-action="Create" method="post" asp-route-parentId="@Context.Request.Query["parentId"]">+ <div class="row">+ <div class="col-md-12">+ <div class="x_panel light form-fit">+ <div class="x_title">+ <div class="caption">+ <i class="fa fa-sitemap"></i>+ @Loc["Admin.Configuration.Menu.AddNew"]+ <small><i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Configuration.Menu.BackToList"], "Index")</small>+ </div>+ <div class="actions">+ <div class="btn-group btn-group-devided">+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>+ <button class="btn btn-success" type="submit" name="save-continue"><i class="fa fa-check-circle"></i> @Loc["Admin.Common.SaveContinue"] </button>+ </div>+ </div>+ </div>+ <vc:admin-widget widget-zone="menu_details_buttons" additional-data="null" />+ <div class="x_content form">+ <partial name="Partials/CreateOrUpdate" model="Model" />+ </div>+ </div>+ </div>+ </div>+</form>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/Edit.cshtmlnew file mode 100644index 000000000..12a7e8f5d--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/Edit.cshtml@@ -0,0 +1,47 @@+@using Microsoft.AspNetCore.Mvc.TagHelpers+@using Grand.Web.Admin.Components+@using Grand.Web.Admin.Interfaces+@using Grand.Web.Common.TagHelpers.Admin+@model MenuModel+@inject IMenuViewModelService MenuViewModelService+@{+ //page title+ ViewBag.Title = Loc["Admin.Configuration.Menu.Edit"];+ var parent = await MenuViewModelService.FindParentNodeById(Model.Id);+}++<form asp-area="@Constants.AreaAdmin" asp-controller="Menu" asp-action="Edit" method="post" id="menu-edit">++ <div class="row">+ <div class="col-md-12">+ <div class="x_panel light form-fit">+ <div class="x_title">+ <div class="caption">+ <i class="fa fa-sitemap"></i>+ @Loc["Admin.Configuration.Menu.Edit"] - @Model.SystemName+ @if (parent != null && parent.Id != Model.Id)+ {+ <small><i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc[parent.ResourceName], "Edit", new { Id = parent.Id, area = @Constants.AreaAdmin })</small>+ }+ else+ {+ <small><i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Configuration.Menu.BackToList"], "Index")</small>+ }+ </div>+ <div class="actions">+ <div class="btn-group btn-group-devided">+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>+ <button class="btn btn-success" type="submit" name="save-continue"><i class="fa fa-check-circle"></i> @Loc["Admin.Common.SaveContinue"] </button>+ <span id="menu-delete" class="btn red"><i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]</span>+ </div>+ </div>+ </div>+ <vc:admin-widget widget-zone="menu_details_buttons" additional-data="Model" />+ <div class="x_content form">+ <partial name="Partials/CreateOrUpdate" model="Model" />+ </div>+ </div>+ </div>+ </div>+</form>+<admin-delete-confirmation button-id="menu-delete"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/List.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/List.cshtmlnew file mode 100644index 000000000..936db6792--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/List.cshtml@@ -0,0 +1,76 @@+@{+ //page title+ ViewBag.Title = Loc["Admin.Configuration.Menu"];+}++<div class="row">+ <div class="col-md-12">+ <div class="x_panel light form-fit">+ <div class="x_title">+ <div class="caption">+ <i class="fa fa-sitemap"></i>+ @Loc["Admin.Configuration.Menu"]+ </div>+ <div class="actions btn-group btn-group-devided">+ <a href="@Url.Action("Create", new { area = Constants.AreaAdmin })" class="btn green"><i class="fa fa-plus"></i><span class="d-none d-sm-inline"> @Loc["Admin.Common.AddNew"] </span></a>+ </div>+ </div>+ <div class="x_content form">+ <div class="form-horizontal">+ <div class="form-body">+ <div class="x_content">+ <div id="menu-grid"></div>+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+</div>++<script>+ $(document).ready(function () {+ $("#menu-grid").kendoGrid({+ dataSource: {+ transport: {+ read: {+ url: "@Html.Raw(Url.Action("ListItem", "Menu", new { area = Constants.AreaAdmin }))",+ type: "POST",+ dataType: "json",+ data: addAntiForgeryToken+ }+ },+ schema: {+ data: "Data",+ total: "Total",+ errors: "Errors"+ },+ error: function(e) {+ display_kendoui_grid_error(e);+ // Cancel the changes+ this.cancelChanges();+ },+ serverPaging: false,+ serverFiltering: true,+ },+ editable: {+ confirmation: false,+ mode: "inline"+ },+ scrollable: false,+ columns: [{+ field: "SystemName",+ title: "@Loc["Admin.Configuration.Menu.Fields.SystemName"]",+ width: 400,+ template: '<a class="k-link" href="Edit/#=Id#">#=kendo.htmlEncode(SystemName)#</a>',+ },+ {+ field: "DisplayOrder",+ headerAttributes: { style: "text-align:center" },+ attributes: { style: "text-align:center" },+ title: "@Loc["Admin.Configuration.Menu.Fields.DisplayOrder"]",+ width: 125+ }]+ });+ });+</script>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/Partials/CreateOrUpdate.TabChild.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/Partials/CreateOrUpdate.TabChild.cshtmlnew file mode 100644index 000000000..69f987e53--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/Partials/CreateOrUpdate.TabChild.cshtml@@ -0,0 +1,68 @@+@model MenuModel++@if (!string.IsNullOrEmpty(Model.Id))+{+ <div class="panel panel-default">+ <vc:admin-widget widget-zone="menu_details_documents_top" additional-data="Model" />+ <div class="panel-body">+ <div id="menu-grid"></div>+ </div>+ <div class="panel-footer">+ <button type="button" class="k-button" onclick="location.href='@Url.Action("Create", "Menu", new { parentId = Model.Id, area = Constants.AreaAdmin })'"><i class="fa fa-plus"></i> @Loc["Admin.Common.AddNew"]</button>+ </div>+ <vc:admin-widget widget-zone="menu_details_documents_bottom" additional-data="Model" />+ </div>+ <script>+ $(document).ready(function () {+ $("#menu-grid").kendoGrid({+ dataSource: {+ transport: {+ read: {+ url: "@Html.Raw(Url.Action("ChildItem", "Menu", new { ParentId = Model.Id, area = Constants.AreaAdmin }))",+ type: "POST",+ dataType: "json",+ data: addAntiForgeryToken+ }+ },+ schema: {+ data: "Data",+ total: "Total",+ errors: "Errors"+ },+ error: function(e) {+ display_kendoui_grid_error(e);+ // Cancel the changes+ this.cancelChanges();+ },+ serverPaging: false,+ serverFiltering: true,+ },+ editable: {+ confirmation: false,+ mode: "inline"+ },+ scrollable: false,+ columns: [{+ field: "SystemName",+ title: "@Loc["Admin.Configuration.Menu.Fields.SystemName"]",+ width: 400,+ template: '<a class="k-link" href="../Edit/#=Id#">#=kendo.htmlEncode(SystemName)#</a>',+ },+ {+ field: "DisplayOrder",+ headerAttributes: { style: "text-align:center" },+ attributes: { style: "text-align:center" },+ title: "@Loc["Admin.Configuration.Menu.Fields.DisplayOrder"]",+ width: 125+ }]+ });+ });+ </script>++}+else+{+ <div class="note note-info">+ @Loc["Admin.Catalog.SaveBeforeEdit"]+ </div>+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/Partials/CreateOrUpdate.TabInfo.cshtmlnew file mode 100644index 000000000..dbf22e7f6--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/Partials/CreateOrUpdate.TabInfo.cshtml@@ -0,0 +1,77 @@+@model MenuModel++<div class="form-horizontal">+ <vc:admin-widget widget-zone="menu_details_info_top" additional-data="Model"/>+ <div class="form-body">+ <div class="form-group">+ <admin-label asp-for="SystemName"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="SystemName" />+ <span asp-validation-for="SystemName"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="ResourceName"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="ResourceName"/>+ <span asp-validation-for="ResourceName"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="ControllerName"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="ControllerName"/>+ <span asp-validation-for="ControllerName"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="ActionName"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="ActionName"/>+ <span asp-validation-for="ActionName"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="Url"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="Url"/>+ <span asp-validation-for="Url"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="IconClass"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="IconClass"/>+ <span asp-validation-for="IconClass"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="DisplayOrder"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="DisplayOrder"/>+ <span asp-validation-for="DisplayOrder"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="OpenUrlInNewTab"/>+ <div class="col-md-9 col-sm-9">+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">+ <admin-input asp-for="OpenUrlInNewTab"/>+ <div class="control__indicator"></div>+ </label>+ <span asp-validation-for="OpenUrlInNewTab"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="AllPermissions"/>+ <div class="col-md-9 col-sm-9">+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">+ <admin-input asp-for="AllPermissions"/>+ <div class="control__indicator"></div>+ </label>+ <span asp-validation-for="AllPermissions"></span>+ </div>+ </div>+ </div>+</div>+<vc:admin-widget widget-zone="menu_details_info_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/Partials/CreateOrUpdate.TabPermission.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/Partials/CreateOrUpdate.TabPermission.cshtmlnew file mode 100644index 000000000..ee3af61c4--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/Partials/CreateOrUpdate.TabPermission.cshtml@@ -0,0 +1,28 @@+@using Grand.Business.Core.Interfaces.Common.Security+@using Grand.Web.Admin.Components+@model MenuModel+@inject IPermissionService PermissionService+@{+ var permissions = await PermissionService.GetAllPermissions();+}+<vc:admin-widget widget-zone="menu_details_permissions_top" additional-data="Model" />+@if (permissions is {Count: > 0 })+{+ <div class="mt-checkbox-list">+ @foreach (var permission in permissions)+ {+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">+ <input type="checkbox" name="PermissionNames" value="@permission.SystemName"+ @if (Model.PermissionNames != null && Model.PermissionNames.Contains(permission.SystemName)) { <text> checked="checked" </text> } />@permission.Name+ <div class="control__indicator"></div>+ </label>+ }+ </div>+}+else+{+ <div class="note note-info">+ @Html.Raw(Loc["Admin.Configuration.Menu.NoPermissions"])+ </div>+}+<vc:admin-widget widget-zone="menu_details_permissions_bottom" additional-data="Model" />\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/Partials/CreateOrUpdate.cshtmlnew file mode 100644index 000000000..eab6a7671--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Menu/Partials/CreateOrUpdate.cshtml@@ -0,0 +1,31 @@+@model MenuModel++<div asp-validation-summary="All"></div>+<input asp-for="Id" type="hidden"/>++<admin-tabstrip name="tabmenu-edit" BindGrid="true">+ <items>+ <tabstrip-item text="@Loc["Admin.Configuration.Menu.Info"]" tab-index="0">+ <content>+ <div>+ <partial name="Partials/CreateOrUpdate.TabInfo" model="Model"/>+ </div>+ </content>+ </tabstrip-item>+ <tabstrip-item text="@Loc["Admin.Configuration.Menu.Permission"]" tab-index="1">+ <content>+ <div>+ <partial name="Partials/CreateOrUpdate.TabPermission" model="Model"/>+ </div>+ </content>+ </tabstrip-item>+ <tabstrip-item text="@Loc["Admin.Configuration.Menu.Child"]" tab-index="2">+ <content>+ <div>+ <partial name="Partials/CreateOrUpdate.TabChild" model="Model"/>+ </div>+ </content>+ </tabstrip-item>+ <vc:admin-widget widget-zone="menu_details_tabs" additional-data="Model"/>+ </items>+</admin-tabstrip>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/_ViewImports.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/_ViewImports.cshtmlindex 7787e703b..5ac2d8b37 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/_ViewImports.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/_ViewImports.cshtml@@ -40,6 +40,7 @@@using Grand.Web.Admin.Models.Layouts@using Grand.Web.Admin.Models.Localization@using Grand.Web.Admin.Models.Logging+@using Grand.Web.Admin.Models.Menu@using Grand.Web.Admin.Models.Messages@using Grand.Web.Admin.Models.News@using Grand.Web.Admin.Models.Ordersdiff --git a/src/Web/Grand.Web.Admin/Controllers/MenuController.cs b/src/Web/Grand.Web.Admin/Controllers/MenuController.csnew file mode 100644index 000000000..874137049--- /dev/null+++ b/src/Web/Grand.Web.Admin/Controllers/MenuController.cs@@ -0,0 +1,144 @@+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Business.Core.Utilities.Common.Security;+using Grand.Web.Admin.Extensions.Mapping;+using Grand.Web.Admin.Interfaces;+using Grand.Web.Admin.Models.Menu;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;+using Microsoft.AspNetCore.Mvc;++namespace Grand.Web.Admin.Controllers;++[PermissionAuthorize(PermissionSystemName.Maintenance)]+public class MenuController : BaseAdminController+{+ #region Fields++ private readonly IMenuViewModelService _menuViewModelService;+ private readonly ITranslationService _translationService;++ #endregion++ #region Ctor++ public MenuController(+ IMenuViewModelService menuViewModelService,+ ITranslationService translationService)+ {+ _menuViewModelService = menuViewModelService;+ _translationService = translationService;+ }++ #endregion++ #region Methods++ public IActionResult Index() => RedirectToAction("List");++ [HttpGet]+ public IActionResult List()+ {+ return View();+ }++ [HttpPost]+ public async Task<IActionResult> ListItem()+ {+ var model = await _menuViewModelService.MenuItems();+ var gridModel = new DataSourceResult {+ Data = model,+ Total = model.Count+ };+ return Json(gridModel);+ }++ [HttpPost]+ public async Task<IActionResult> ChildItem(string parentId)+ {+ var model = await _menuViewModelService.GetMenuById(parentId);+ var gridModel = new DataSourceResult {+ Data = model.ChildNodes,+ Total = model.ChildNodes.Count+ };+ return Json(gridModel);+ }+ #region Create / Edit / Delete++ public IActionResult Create()+ {+ var model = new MenuModel();+ return View(model);+ }++ [HttpPost, ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]+ public async Task<IActionResult> Create(MenuModel model, bool continueEditing, string parentId)+ {+ if (ModelState.IsValid)+ {+ var menu = await _menuViewModelService.InsertMenuModel(model, parentId);+ Success(_translationService.GetResource("Admin.Configuration.Menu.Added"));+ return continueEditing ? RedirectToAction("Edit", new { id = menu.Id }) : RedirectToAction("Index");+ }+ //If we got this far, something failed, redisplay form+ return View(model);+ }++ public async Task<IActionResult> Edit(string id)+ {+ var menu = await _menuViewModelService.GetMenuById(id);+ if (menu == null)+ //No menu found with the specified id+ return RedirectToAction("Index");++ var model = menu.ToModel();++ return View(model);+ }++ [HttpPost, ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]+ public async Task<IActionResult> Edit(MenuModel model, bool continueEditing)+ {+ var menu = await _menuViewModelService.GetMenuById(model.Id);+ if (menu == null)+ //No menu found with the specified id+ return RedirectToAction("Index");++ if (!ModelState.IsValid) return View(model);++ await _menuViewModelService.UpdateMenuModel(model);+ Success(_translationService.GetResource("Admin.Configuration.Menu.Updated"));++ if (!continueEditing) return RedirectToAction("List");++ //selected tab+ await SaveSelectedTabIndex();+ return RedirectToAction("Edit", new { id = menu.Id });++ }++ [PermissionAuthorizeAction(PermissionActionName.Delete)]+ [HttpPost]+ public async Task<IActionResult> Delete(string id)+ {+ var menu = await _menuViewModelService.GetMenuById(id);+ if (menu == null)+ //No menu found with the specified id+ return RedirectToAction("Index");++ if (ModelState.IsValid)+ {+ await _menuViewModelService.DeleteMenu(id);++ Success(_translationService.GetResource("Admin.Configuration.Menu.Deleted"));+ return RedirectToAction("List");+ }++ Error(ModelState);+ return RedirectToAction("Edit", new { id });+ }++ #endregion++ #endregion+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/MenuMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/MenuMappingExtensions.csnew file mode 100644index 000000000..d490e1f83--- /dev/null+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/MenuMappingExtensions.cs@@ -0,0 +1,24 @@+using Grand.Domain.Admin;+using Grand.Infrastructure.Mapper;+using Grand.Web.Admin.Models.Menu;++namespace Grand.Web.Admin.Extensions.Mapping+{+ public static class MenuMappingExtensions+ {+ public static MenuModel ToModel(this AdminSiteMap entity)+ {+ return entity.MapTo<AdminSiteMap, MenuModel>();+ }++ public static AdminSiteMap ToEntity(this MenuModel model)+ {+ return model.MapTo<MenuModel, AdminSiteMap>();+ }++ public static AdminSiteMap ToEntity(this MenuModel model, AdminSiteMap destination)+ {+ return model.MapTo(destination);+ }+ }+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Interfaces/IMenuViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IMenuViewModelService.csnew file mode 100644index 000000000..03be11d41--- /dev/null+++ b/src/Web/Grand.Web.Admin/Interfaces/IMenuViewModelService.cs@@ -0,0 +1,15 @@+using Grand.Domain.Admin;+using Grand.Web.Admin.Models.Menu;++namespace Grand.Web.Admin.Interfaces;++public interface IMenuViewModelService+{+ Task<IList<MenuListModel>> MenuItems();+ Task<AdminSiteMap> GetMenuById(string id);+ Task<AdminSiteMap> FindParentNodeById(string id);+ Task<AdminSiteMap> InsertMenuModel(MenuModel model, string parentId);+ Task<AdminSiteMap> UpdateMenuModel(MenuModel model);+ Task DeleteMenu(string id);++}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Mapper/MenuProfile.cs b/src/Web/Grand.Web.Admin/Mapper/MenuProfile.csnew file mode 100644index 000000000..28820a1bf--- /dev/null+++ b/src/Web/Grand.Web.Admin/Mapper/MenuProfile.cs@@ -0,0 +1,20 @@+using AutoMapper;+using Grand.Domain.Admin;+using Grand.Infrastructure.Mapper;+using Grand.Web.Admin.Models.Menu;++namespace Grand.Web.Admin.Mapper+{+ public class MenuProfile : Profile, IAutoMapperProfile+ {+ public MenuProfile()+ {+ CreateMap<AdminSiteMap, MenuModel>()+ .ForMember(dest => dest.UserFields, mo => mo.Ignore());+ CreateMap<MenuModel, AdminSiteMap>()+ .ForMember(dest => dest.ChildNodes, mo => mo.Ignore());+ }++ public int Order => 0;+ }+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Models/Menu/MenuListModel.cs b/src/Web/Grand.Web.Admin/Models/Menu/MenuListModel.csnew file mode 100644index 000000000..97025be36--- /dev/null+++ b/src/Web/Grand.Web.Admin/Models/Menu/MenuListModel.cs@@ -0,0 +1,9 @@+using Grand.Infrastructure.Models;++namespace Grand.Web.Admin.Models.Menu;++public class MenuListModel: BaseEntityModel+{+ public string SystemName { get; set; }+ public int DisplayOrder { get; set; }+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Models/Menu/MenuModel.cs b/src/Web/Grand.Web.Admin/Models/Menu/MenuModel.csnew file mode 100644index 000000000..ae176f6ab--- /dev/null+++ b/src/Web/Grand.Web.Admin/Models/Menu/MenuModel.cs@@ -0,0 +1,72 @@+using Grand.Infrastructure.ModelBinding;+using Grand.Infrastructure.Models;++namespace Grand.Web.Admin.Models.Menu;++public class MenuModel : BaseEntityModel+{+ public MenuModel()+ {+ PermissionNames = new List<string>();+ }++ /// <summary>+ /// Gets or sets the system name.+ /// </summary>+ [GrandResourceDisplayName("admin.configuration.menu.fields.systemname")]+ public string SystemName { get; set; }++ /// <summary>+ /// Gets or sets the resource name.+ /// </summary>+ [GrandResourceDisplayName("admin.configuration.menu.fields.resourcename")]+ public string ResourceName { get; set; }++ /// <summary>+ /// Gets or sets the name of the controller.+ /// </summary>+ [GrandResourceDisplayName("admin.configuration.menu.fields.controllername")]+ public string ControllerName { get; set; }++ /// <summary>+ /// Gets or sets the name of the action.+ /// </summary>+ [GrandResourceDisplayName("admin.configuration.menu.fields.actionname")]+ public string ActionName { get; set; }++ /// <summary>+ /// Gets or sets the URL.+ /// </summary>+ [GrandResourceDisplayName("admin.configuration.menu.fields.url")]+ public string Url { get; set; }++ /// <summary>+ /// Gets or sets the icon class+ /// </summary>+ [GrandResourceDisplayName("admin.configuration.menu.fields.iconclass")]+ public string IconClass { get; set; }++ /// <summary>+ /// Gets or sets the display order+ /// </summary>+ [GrandResourceDisplayName("admin.configuration.menu.fields.displayorder")]+ public int DisplayOrder { get; set; }++ /// <summary>+ /// Gets or sets a value indicating whether to open url in new tab (window) or not+ /// </summary>+ [GrandResourceDisplayName("admin.configuration.menu.fields.openurlinnewtab")]+ public bool OpenUrlInNewTab { get; set; }++ /// <summary>+ /// Gets or sets permissions+ /// </summary>+ public IList<string> PermissionNames { get; set; }++ /// <summary>+ /// Gets or sets all permissions+ /// </summary>+ [GrandResourceDisplayName("admin.configuration.menu.fields.allpermissions")]+ public bool AllPermissions { get; set; }++}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Services/MenuViewModelService.cs b/src/Web/Grand.Web.Admin/Services/MenuViewModelService.csnew file mode 100644index 000000000..a840a1604--- /dev/null+++ b/src/Web/Grand.Web.Admin/Services/MenuViewModelService.cs@@ -0,0 +1,158 @@+using Grand.Business.Core.Interfaces.System.Admin;+using Grand.Domain.Admin;+using Grand.Web.Admin.Extensions.Mapping;+using Grand.Web.Admin.Interfaces;+using Grand.Web.Admin.Models.Menu;++namespace Grand.Web.Admin.Services;++public class MenuViewModelService : IMenuViewModelService+{+ private readonly IAdminSiteMapService _adminSiteMapService;++ public MenuViewModelService(IAdminSiteMapService adminSiteMapService)+ {+ _adminSiteMapService = adminSiteMapService;+ }++ public virtual async Task<IList<MenuListModel>> MenuItems()+ {+ var menuItems = await _adminSiteMapService.GetSiteMap();+ return menuItems.Select(x => new MenuListModel {+ Id = x.Id,+ SystemName = x.SystemName,+ DisplayOrder = x.DisplayOrder+ }).ToList();+ }++ public virtual async Task<AdminSiteMap> GetMenuById(string id)+ {+ if (string.IsNullOrEmpty(id))+ throw new ArgumentNullException(nameof(id));++ var sitemap = await _adminSiteMapService.GetSiteMap();+ return sitemap.Select(rootNode => FindAdminSiteMapById(rootNode, id)).FirstOrDefault(result => result != null);+ }++ public virtual async Task<AdminSiteMap> FindParentNodeById(string id)+ {+ var node = await GetMenuById(id);+ if (node == null) return null;+ var sitemap = await _adminSiteMapService.GetSiteMap();+ return sitemap.Select(rootNode => FindParentNodeById(rootNode, id)).FirstOrDefault(result => result != null);+ }++ public virtual async Task<AdminSiteMap> InsertMenuModel(MenuModel model, string parentId)+ {+ if (model == null)+ throw new ArgumentNullException(nameof(model));++ if (!string.IsNullOrEmpty(parentId))+ {+ return await AddChildNodeSiteMap();+ }++ var entity = model.ToEntity();+ await _adminSiteMapService.InsertSiteMap(entity);+ return entity;++ async Task<AdminSiteMap> AddChildNodeSiteMap()+ {+ var sitemap = await _adminSiteMapService.GetSiteMap();+ var parentEntity = FindTopLevelNodeById(sitemap, parentId);+ var adminSiteMap = FindAdminSiteMapById(parentEntity, parentId);+ var siteMap = model.ToEntity();+ adminSiteMap.ChildNodes.Add(siteMap);+ await _adminSiteMapService.UpdateSiteMap(parentEntity);+ return siteMap;+ }+ }++ public virtual async Task<AdminSiteMap> UpdateMenuModel(MenuModel model)+ {+ if (model == null)+ throw new ArgumentNullException(nameof(model));++ var sitemap = await _adminSiteMapService.GetSiteMap();+ var parentEntity = FindTopLevelNodeById(sitemap, model.Id);+ var adminSiteMap = FindAdminSiteMapById(parentEntity, model.Id);++ adminSiteMap = model.ToEntity(adminSiteMap);+ await _adminSiteMapService.UpdateSiteMap(parentEntity);++ return adminSiteMap;+ }++ public virtual async Task DeleteMenu(string id)+ {+ if (string.IsNullOrEmpty(id))+ throw new ArgumentNullException(nameof(id));++ var sitemap = await _adminSiteMapService.GetSiteMap();+ var parentEntity = FindTopLevelNodeById(sitemap, id);+ if (parentEntity?.Id == id)+ await _adminSiteMapService.DeleteSiteMap(parentEntity);+ else+ {+ var adminSiteMap = FindParentNodeById(parentEntity, id);+ if (adminSiteMap != null)+ {+ adminSiteMap.ChildNodes.Remove(adminSiteMap.ChildNodes.FirstOrDefault(y => y.Id == id));+ await _adminSiteMapService.UpdateSiteMap(parentEntity);+ }+ }+ }++ private static AdminSiteMap FindTopLevelNodeById(IList<AdminSiteMap> adminSiteMaps, string targetId)+ {+ return adminSiteMaps.FirstOrDefault(adminSiteMap => GetAllIdsFromChildren(adminSiteMap).Contains(targetId));+ }+ private static List<string> GetAllIdsFromChildren(AdminSiteMap rootNode)+ {+ List<string> allIds = new List<string>();+ GetAllIdsFromChildrenRecursive(rootNode, allIds);+ return allIds;+ }+ private static void GetAllIdsFromChildrenRecursive(AdminSiteMap currentNode, List<string> allIds)+ {+ if (currentNode == null)+ {+ return;+ }++ allIds.Add(currentNode.Id);++ if (currentNode.ChildNodes != null)+ {+ foreach (var childNode in currentNode.ChildNodes)+ {+ GetAllIdsFromChildrenRecursive(childNode, allIds);+ }+ }+ }++ private static AdminSiteMap FindAdminSiteMapById(AdminSiteMap rootNode, string id)+ {+ if (rootNode == null) return null;+ return rootNode.Id == id+ ? rootNode+ : rootNode.ChildNodes?.Select(childNode => FindAdminSiteMapById(childNode, id))+ .FirstOrDefault(result => result != null);+ }++ private static AdminSiteMap FindParentNodeById(AdminSiteMap rootNode, string childId)+ {+ if (rootNode == null) return null;+ if (rootNode.Id == childId) return rootNode;++ foreach (var childNode in rootNode.ChildNodes)+ {+ if (childNode.Id == childId) return rootNode;++ var foundNode = FindParentNodeById(childNode, childId);+ if (foundNode != null) return foundNode;+ }++ return null;+ }+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Startup/StartupApplication.cs b/src/Web/Grand.Web.Admin/Startup/StartupApplication.csindex 18cfdb467..0dba2ab62 100644--- a/src/Web/Grand.Web.Admin/Startup/StartupApplication.cs+++ b/src/Web/Grand.Web.Admin/Startup/StartupApplication.cs@@ -57,6 +57,7 @@ namespace Grand.Web.Admin.Startupservices.AddScoped<IProductViewModelService, ProductViewModelService>();services.AddScoped<IPictureViewModelService, PictureViewModelService>();services.AddScoped<IElFinderViewModelService, ElFinderViewModelService>();+ services.AddScoped<IMenuViewModelService, MenuViewModelService>();}public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment){diff --git a/src/Web/Grand.Web.Admin/Validators/Common/MenuValidator.cs b/src/Web/Grand.Web.Admin/Validators/Common/MenuValidator.csnew file mode 100644index 000000000..f105b71a1--- /dev/null+++ b/src/Web/Grand.Web.Admin/Validators/Common/MenuValidator.cs@@ -0,0 +1,24 @@+using FluentValidation;+using Grand.Infrastructure.Validators;+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Web.Admin.Models.Menu;++namespace Grand.Web.Admin.Validators.Common+{+ public class MenuValidator : BaseGrandValidator<MenuModel>+ {+ public MenuValidator(+ IEnumerable<IValidatorConsumer<MenuModel>> validators,+ ITranslationService translationService)+ : base(validators)+ {+ RuleFor(x => x.SystemName)+ .NotEmpty()+ .WithMessage(translationService.GetResource("admin.configuration.menu.fields.SystemName.Required"));+ RuleFor(x => x.ResourceName)+ .NotEmpty()+ .WithMessage(translationService.GetResource("admin.configuration.menu.fields.ResourceName.Required"));++ }+ }+}\ No newline at end of filediff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xmlindex b2e48138a..7bedc6900 100644--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml@@ -4695,6 +4695,66 @@<Resource Name="Admin.Configuration.Measures.Weights.Fields.SystemKeyword.Required" Area="Admin"><Value>Please provide a system keyword.</Value></Resource>+ <Resource Name="admin.configuration.menu" Area="Admin">+ <Value>Admin menu</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.added" Area="Admin">+ <Value>The new menu has been added successfully</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.addnew" Area="Admin">+ <Value>Add new menu</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.backtolist" Area="Admin">+ <Value>Back to list</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.child" Area="Admin">+ <Value>Submenu</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.edit" Area="Admin">+ <Value>Edit menu</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.info" Area="Admin">+ <Value>Info</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.fields.actionname" Area="Admin">+ <Value>Action name</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.fields.allpermissions" Area="Admin">+ <Value>Require all selected permissions</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.fields.controllername" Area="Admin">+ <Value>Controller name</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.fields.displayorder" Area="Admin">+ <Value>Display order</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.fields.iconclass" Area="Admin">+ <Value>Icon class</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.fields.openurlinnewtab" Area="Admin">+ <Value>To open URL in a new tab</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.fields.resourcename" Area="Admin">+ <Value>String resource name</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.fields.resourcename.Required" Area="Admin">+ <Value>Please provide a string resource name</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.fields.systemname" Area="Admin">+ <Value>System name</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.fields.systemname.Required" Area="Admin">+ <Value>Please provide a system name</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.fields.url" Area="Admin">+ <Value>Url</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.permission" Area="Admin">+ <Value>Permissions</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.updated" Area="Admin">+ <Value>Updated menu</Value>+ </Resource><Resource Name="Admin.Configuration.Payment" Area="Admin"><Value>Payment</Value></Resource>diff --git a/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_220.xml b/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_220.xmlindex ce7a84584..b4f29a677 100644--- a/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_220.xml+++ b/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_220.xml@@ -33,4 +33,65 @@<Resource Name="admin.configuration.permissions.update" Area="Admin"><Value>Update permission</Value></Resource>+ <Resource Name="admin.configuration.menu.edit" Area="Admin">+ <Value>Edit menu</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.backtolist" Area="Admin">+ <Value>Back to list</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.addnew" Area="Admin">+ <Value>Add new menu</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.info" Area="Admin">+ <Value>Info</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.permission" Area="Admin">+ <Value>Permissions</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.child" Area="Admin">+ <Value>Submenu</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.fields.allpermissions" Area="Admin">+ <Value>Require all selected permissions</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.fields.openurlinnewtab" Area="Admin">+ <Value>To open URL in a new tab</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.fields.displayorder" Area="Admin">+ <Value>Display order</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.fields.iconclass" Area="Admin">+ <Value>Icon class</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.fields.url" Area="Admin">+ <Value>Url</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.fields.actionname" Area="Admin">+ <Value>Action name</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.fields.controllername" Area="Admin">+ <Value>Controller name</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.fields.resourcename" Area="Admin">+ <Value>String resource name</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.fields.resourcename.Required" Area="Admin">+ <Value>Please provide a string resource name</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.fields.systemname" Area="Admin">+ <Value>System name</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.fields.systemname.Required" Area="Admin">+ <Value>Please provide a system name</Value>+ </Resource>+ <Resource Name="admin.configuration.menu" Area="Admin">+ <Value>Admin menu</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.updated" Area="Admin">+ <Value>Updated menu</Value>+ </Resource>+ <Resource Name="admin.configuration.menu.added" Area="Admin">+ <Value>The new menu has been added successfully</Value>+ </Resource>+</Language>\ No newline at end of file