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
ARCH-001 Phase 15: Page controller/service consolidation (Admin/Store) (#809)
Krzysztof Pajak43f1dd24b441
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BasePageControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BasePageControllerTests.csnew file mode 100644index 000000000..49c5f5adf--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BasePageControllerTests.cs@@ -0,0 +1,351 @@+using Grand.Business.Core.Interfaces.Cms;+using Grand.Business.Core.Interfaces.Common.Directory;+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Domain.Pages;+using Grand.Infrastructure.Mapper;+using Grand.Mapping;+using Grand.Web.AdminShared.Controllers;+using Grand.Web.AdminShared.Interfaces;+using Grand.Web.AdminShared.Mapper;+using Grand.Web.AdminShared.Models.Pages;+using Grand.Web.Common.DataSource;+using Microsoft.AspNetCore.Http;+using Microsoft.AspNetCore.Mvc;+using Microsoft.AspNetCore.Mvc.Routing;+using Microsoft.AspNetCore.Mvc.ViewFeatures;+using Microsoft.Extensions.Logging;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;++namespace Grand.Web.Admin.Tests.Controllers;++// Characterization tests for the merged Page access-check behavior (ARCH-001 Page consolidation).+[TestClass]+public class BasePageControllerTests+{+ private class TestPageController(+ IPageViewModelService pageViewModelService,+ IPageService pageService,+ ILanguageService languageService,+ ITranslationService translationService,+ IDateTimeService dateTimeService,+ IAdminDataScope<Page> scope)+ : BasePageController(pageViewModelService, pageService, languageService, translationService,+ dateTimeService, scope);++ private TestPageController _controller;+ private Mock<IPageViewModelService> _pageViewModelServiceMock;+ private Mock<IPageService> _pageServiceMock;+ private Mock<ITranslationService> _translationServiceMock;+ private Mock<IAdminDataScope<Page>> _scopeMock;++ [TestInitialize]+ public void Setup()+ {+ var mapperConfig = new MapperConfiguration(cfg => cfg.AddProfile<PageProfile>());+ AutoMapperConfig.Init(mapperConfig);++ _pageViewModelServiceMock = new Mock<IPageViewModelService>();+ _pageServiceMock = new Mock<IPageService>();+ _translationServiceMock = new Mock<ITranslationService>();+ _translationServiceMock.Setup(t => t.GetResource(It.IsAny<string>())).Returns("resource");++ _scopeMock = new Mock<IAdminDataScope<Page>>();+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);++ var languageServiceMock = new Mock<ILanguageService>();+ languageServiceMock.Setup(l => l.GetAllLanguages(true, It.IsAny<string>()))+ .ReturnsAsync(new List<Grand.Domain.Localization.Language>());++ _controller = new TestPageController(+ _pageViewModelServiceMock.Object,+ _pageServiceMock.Object,+ languageServiceMock.Object,+ _translationServiceMock.Object,+ new Mock<IDateTimeService>().Object,+ _scopeMock.Object);++ var httpContext = new DefaultHttpContext();+ var loggerFactoryMock = new Mock<ILoggerFactory>();+ loggerFactoryMock.Setup(l => l.CreateLogger(It.IsAny<string>())).Returns(new Mock<ILogger>().Object);+ var urlHelperFactoryMock = new Mock<IUrlHelperFactory>();+ urlHelperFactoryMock.Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>())).Returns(new Mock<IUrlHelper>().Object);+ var requestServicesMock = new Mock<IServiceProvider>();+ requestServicesMock.Setup(s => s.GetService(typeof(ILoggerFactory))).Returns(loggerFactoryMock.Object);+ requestServicesMock.Setup(s => s.GetService(typeof(IUrlHelperFactory))).Returns(urlHelperFactoryMock.Object);+ httpContext.RequestServices = requestServicesMock.Object;+ _controller.ControllerContext = new ControllerContext { HttpContext = httpContext };+ _controller.TempData = new TempDataDictionary(httpContext, new Mock<ITempDataProvider>().Object);+ _controller.Url = new Mock<IUrlHelper>().Object;+ }++ [TestMethod]+ public async Task ListPost_ForcesScopeDefaultStoreId()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");+ _pageServiceMock.Setup(p => p.GetAllPages("store-1", true)).ReturnsAsync(new List<Page>());++ var model = new PageListModel { SearchStoreId = "attacker-supplied" };+ await _controller.List(new DataSourceRequest { Page = 1, PageSize = 10 }, model);++ Assert.AreEqual("store-1", model.SearchStoreId);+ _pageServiceMock.Verify(p => p.GetAllPages("store-1", true), Times.Once);+ }++ [TestMethod]+ public async Task ListPost_GlobalScope_LeavesSubmittedSearchStoreIdUntouched()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);+ _pageServiceMock.Setup(p => p.GetAllPages("admin-submitted-store", true)).ReturnsAsync(new List<Page>());++ var model = new PageListModel { SearchStoreId = "admin-submitted-store" };+ await _controller.List(new DataSourceRequest { Page = 1, PageSize = 10 }, model);++ Assert.AreEqual("admin-submitted-store", model.SearchStoreId);+ _pageServiceMock.Verify(p => p.GetAllPages("admin-submitted-store", true), Times.Once);+ }++ [TestMethod]+ public async Task CreateGet_StoreScoped_DefaultsPublishedTrue()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");++ var result = await _controller.Create();++ var view = result as ViewResult;+ Assert.IsNotNull(view);+ Assert.IsTrue(((PageModel)view.Model).Published);+ }++ [TestMethod]+ public async Task CreateGet_GlobalScope_PublishedDefaultsFalse()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);++ var result = await _controller.Create();++ var view = result as ViewResult;+ Assert.IsNotNull(view);+ Assert.IsFalse(((PageModel)view.Model).Published);+ }++ [TestMethod]+ public async Task CreatePost_StoreScoped_ForcesModelStores()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");+ var inserted = new Page { Id = "new-1" };+ _pageViewModelServiceMock+ .Setup(v => v.InsertPageModel(It.IsAny<PageModel>()))+ .ReturnsAsync(inserted)+ .Callback<PageModel>(m => Assert.AreEqual("store-1", m.Stores.Single()));++ await _controller.Create(new PageModel { SystemName = "N" }, false);++ _pageViewModelServiceMock.Verify(v => v.InsertPageModel(It.IsAny<PageModel>()), Times.Once);+ }++ [TestMethod]+ public async Task CreatePost_GlobalScoped_LeavesModelStoresUntouched()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);+ var inserted = new Page { Id = "new-1" };+ var submitted = new PageModel { SystemName = "N", Stores = ["explicit-store"] };+ _pageViewModelServiceMock+ .Setup(v => v.InsertPageModel(It.IsAny<PageModel>()))+ .ReturnsAsync(inserted)+ .Callback<PageModel>(m => Assert.AreEqual("explicit-store", m.Stores.Single()));++ await _controller.Create(submitted, false);++ _pageViewModelServiceMock.Verify(v => v.InsertPageModel(It.IsAny<PageModel>()), Times.Once);+ }++ [TestMethod]+ public async Task EditGet_PageNotFound_RedirectsToList()+ {+ _pageServiceMock.Setup(p => p.GetPageById("missing")).ReturnsAsync((Page)null);++ var result = await _controller.Edit("missing");++ var redirect = result as RedirectToActionResult;+ Assert.IsNotNull(redirect);+ Assert.AreEqual("List", redirect.ActionName);+ _scopeMock.Verify(s => s.CanView(It.IsAny<Page>()), Times.Never);+ }++ [TestMethod]+ public async Task EditGet_ScopeDeniesView_RedirectsToList()+ {+ var page = new Page { Id = "p1" };+ _pageServiceMock.Setup(p => p.GetPageById("p1")).ReturnsAsync(page);+ _scopeMock.Setup(s => s.CanView(page)).ReturnsAsync(false);++ var result = await _controller.Edit("p1");++ var redirect = result as RedirectToActionResult;+ Assert.IsNotNull(redirect);+ Assert.AreEqual("List", redirect.ActionName);+ }++ [TestMethod]+ public async Task EditGet_ScopeAllowsView_ComputesShowCopyButton()+ {+ var page = new Page { Id = "p1", Title = "T", LimitedToStores = true, Stores = ["s1", "s2"] };+ _pageServiceMock.Setup(p => p.GetPageById("p1")).ReturnsAsync(page);+ _scopeMock.Setup(s => s.CanView(page)).ReturnsAsync(true);++ var result = await _controller.Edit("p1");++ var view = result as ViewResult;+ Assert.IsNotNull(view);+ Assert.IsTrue(((PageModel)view.Model).ShowCopyButton);+ }++ [TestMethod]+ public async Task EditGet_GloballyUnrestrictedPage_ShowCopyButtonTrue()+ {+ var page = new Page { Id = "p1", Title = "T", LimitedToStores = false };+ _pageServiceMock.Setup(p => p.GetPageById("p1")).ReturnsAsync(page);+ _scopeMock.Setup(s => s.CanView(page)).ReturnsAsync(true);++ var result = await _controller.Edit("p1");++ var view = result as ViewResult;+ Assert.IsTrue(((PageModel)view.Model).ShowCopyButton);+ }++ [TestMethod]+ public async Task EditGet_ExclusiveSingleStorePage_ShowCopyButtonFalse()+ {+ var page = new Page { Id = "p1", Title = "T", LimitedToStores = true, Stores = ["s1"] };+ _pageServiceMock.Setup(p => p.GetPageById("p1")).ReturnsAsync(page);+ _scopeMock.Setup(s => s.CanView(page)).ReturnsAsync(true);++ var result = await _controller.Edit("p1");++ var view = result as ViewResult;+ Assert.IsFalse(((PageModel)view.Model).ShowCopyButton);+ }++ [TestMethod]+ public async Task EditPost_ScopeDeniesAccess_RedirectsToEdit()+ {+ var page = new Page { Id = "p1" };+ _pageServiceMock.Setup(p => p.GetPageById("p1")).ReturnsAsync(page);+ _scopeMock.Setup(s => s.HasAccess(page)).ReturnsAsync(false);++ var result = await _controller.Edit(new PageModel { Id = "p1" }, false);++ var redirect = result as RedirectToActionResult;+ Assert.IsNotNull(redirect);+ Assert.AreEqual("Edit", redirect.ActionName);+ _pageViewModelServiceMock.Verify(v => v.UpdatePageModel(It.IsAny<Page>(), It.IsAny<PageModel>()), Times.Never);+ }++ [TestMethod]+ public async Task EditPost_StoreScoped_ForcesCustomerGroupsToExistingPageValue()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");+ var page = new Page { Id = "p1", CustomerGroups = ["existing-group"] };+ _pageServiceMock.Setup(p => p.GetPageById("p1")).ReturnsAsync(page);+ _scopeMock.Setup(s => s.HasAccess(page)).ReturnsAsync(true);+ _pageViewModelServiceMock+ .Setup(v => v.UpdatePageModel(page, It.IsAny<PageModel>()))+ .ReturnsAsync(page)+ .Callback<Page, PageModel>((p, m) => {+ Assert.AreEqual("store-1", m.Stores.Single());+ Assert.AreEqual("existing-group", m.CustomerGroups.Single());+ });++ await _controller.Edit(new PageModel { Id = "p1", CustomerGroups = ["attacker-submitted-group"] }, false);++ _pageViewModelServiceMock.Verify(v => v.UpdatePageModel(page, It.IsAny<PageModel>()), Times.Once);+ }++ [TestMethod]+ public async Task EditPost_GlobalScope_LeavesCustomerGroupsAndStoresUntouched()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);+ var page = new Page { Id = "p1", CustomerGroups = ["existing-group"] };+ _pageServiceMock.Setup(p => p.GetPageById("p1")).ReturnsAsync(page);+ _scopeMock.Setup(s => s.HasAccess(page)).ReturnsAsync(true);+ _pageViewModelServiceMock+ .Setup(v => v.UpdatePageModel(page, It.IsAny<PageModel>()))+ .ReturnsAsync(page)+ .Callback<Page, PageModel>((p, m) => {+ Assert.AreEqual("admin-submitted-group", m.CustomerGroups.Single());+ });++ await _controller.Edit(new PageModel { Id = "p1", CustomerGroups = ["admin-submitted-group"] }, false);++ _pageViewModelServiceMock.Verify(v => v.UpdatePageModel(page, It.IsAny<PageModel>()), Times.Once);+ }++ [TestMethod]+ public async Task Delete_ScopeDeniesAccess_RedirectsToListWithoutDeleting()+ {+ var page = new Page { Id = "p1" };+ _pageServiceMock.Setup(p => p.GetPageById("p1")).ReturnsAsync(page);+ _scopeMock.Setup(s => s.HasAccess(page)).ReturnsAsync(false);++ var result = await _controller.Delete("p1");++ var redirect = result as RedirectToActionResult;+ Assert.IsNotNull(redirect);+ Assert.AreEqual("List", redirect.ActionName);+ _pageViewModelServiceMock.Verify(v => v.DeletePage(It.IsAny<Page>()), Times.Never);+ }++ [TestMethod]+ public async Task Delete_ScopeGrantsAccess_Deletes()+ {+ var page = new Page { Id = "p1" };+ _pageServiceMock.Setup(p => p.GetPageById("p1")).ReturnsAsync(page);+ _scopeMock.Setup(s => s.HasAccess(page)).ReturnsAsync(true);++ var result = await _controller.Delete("p1");++ var redirect = result as RedirectToActionResult;+ Assert.IsNotNull(redirect);+ Assert.AreEqual("List", redirect.ActionName);+ _pageViewModelServiceMock.Verify(v => v.DeletePage(page), Times.Once);+ }++ [TestMethod]+ public async Task ListGet_ReturnsViewWithPreparedListModel()+ {+ var availableStores = new List<Microsoft.AspNetCore.Mvc.Rendering.SelectListItem>+ {+ new() { Text = "All", Value = "" },+ new() { Text = "Store 1", Value = "store-1" }+ };+ var preparedModel = new PageListModel { AvailableStores = availableStores };+ _pageViewModelServiceMock.Setup(v => v.PreparePageListModel()).ReturnsAsync(preparedModel);++ var result = await _controller.List();++ var view = result as ViewResult;+ Assert.IsNotNull(view);+ var model = view.Model as PageListModel;+ Assert.IsNotNull(model);+ Assert.AreSame(availableStores, model.AvailableStores);+ }++ // --- EditWarningCheck truth table (base no-op default; Task 3 adds Store's real override) --------++ [TestMethod]+ public async Task EditGet_BaseEditWarningCheck_IsNoOp()+ {+ var page = new Page { Id = "p1", LimitedToStores = false };+ _pageServiceMock.Setup(p => p.GetPageById("p1")).ReturnsAsync(page);+ _scopeMock.Setup(s => s.CanView(page)).ReturnsAsync(true);++ var result = await _controller.Edit("p1");++ Assert.IsInstanceOfType(result, typeof(ViewResult));+ // BaseController.Warning(...) stores persisted messages under "grand.notifications.Warning"+ // (see BaseController.Notification), not a literal "WarningMessages" key. The base+ // EditWarningCheck hook is a no-op, so neither key should ever be populated by this test.+ Assert.IsFalse(_controller.TempData.ContainsKey("grand.notifications.Warning"));+ }+}diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/PageControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/PageControllerTests.csnew file mode 100644index 000000000..b31b06d51--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/PageControllerTests.cs@@ -0,0 +1,32 @@+using Grand.Web.Admin.Controllers;+using Grand.Web.AdminShared.Controllers;+using Microsoft.AspNetCore.Mvc;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using System.Reflection;++namespace Grand.Web.Admin.Tests.Controllers;++[TestClass]+public class PageControllerTests+{+ [TestMethod]+ public void PageController_IsThinSubclassOfBasePageController()+ {+ Assert.IsTrue(typeof(BasePageController).IsAssignableFrom(typeof(PageController)));+ Assert.AreNotEqual(typeof(BasePageController), typeof(PageController));+ }++ [TestMethod]+ public void PageController_HasRequiredHostAttributes()+ {+ var type = typeof(PageController);++ var areaAttr = type.GetCustomAttribute<AreaAttribute>(inherit: false);+ Assert.IsNotNull(areaAttr);+ Assert.AreEqual("Admin", areaAttr.RouteValue);++ Assert.IsNotNull(type.GetCustomAttribute<Grand.Web.Common.Filters.AuthorizeAdminAttribute>(inherit: false));+ Assert.IsNotNull(type.GetCustomAttribute<Grand.Web.Common.Filters.AuthorizeMenuAttribute>(inherit: false));+ Assert.IsNotNull(type.GetCustomAttribute<AutoValidateAntiforgeryTokenAttribute>(inherit: false));+ }+}diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedPageDataScopeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedPageDataScopeTests.csnew file mode 100644index 000000000..9c5fa0637--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedPageDataScopeTests.cs@@ -0,0 +1,66 @@+using Grand.Domain.Pages;+using Grand.Web.AdminShared.Interfaces;+using Grand.Web.AdminShared.Services;+using Microsoft.AspNetCore.Http;+using Microsoft.AspNetCore.Routing;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;++namespace Grand.Web.Admin.Tests.Controllers;++[TestClass]+public class RoutedPageDataScopeTests+{+ private static RoutedPageDataScope Build(string area, out Mock<IAdminDataScope<Page>> globalMock, out Mock<IAdminDataScope<Page>> storeMock)+ {+ var httpContext = new DefaultHttpContext();+ if (area != null)+ httpContext.Request.RouteValues = new RouteValueDictionary { ["area"] = area };++ var httpContextAccessorMock = new Mock<IHttpContextAccessor>();+ httpContextAccessorMock.Setup(a => a.HttpContext).Returns(httpContext);++ var global = new GlobalAdminDataScope<Page>();+ var store = new StoreAdminDataScope<Page>(BuildContextAccessor());+ globalMock = null;+ storeMock = null;+ return new RoutedPageDataScope(httpContextAccessorMock.Object, global, store);+ }++ private static Grand.Infrastructure.IContextAccessor BuildContextAccessor()+ {+ var workContext = new Mock<Grand.Infrastructure.IWorkContext>();+ workContext.Setup(w => w.CurrentCustomer).Returns(new Grand.Domain.Customers.Customer { StaffStoreId = "store-1" });+ var contextAccessorMock = new Mock<Grand.Infrastructure.IContextAccessor>();+ contextAccessorMock.Setup(c => c.WorkContext).Returns(workContext.Object);+ return contextAccessorMock.Object;+ }++ [TestMethod]+ public void DefaultStoreId_AdminArea_ResolvesToGlobalScope()+ {+ var routed = Build("Admin", out _, out _);+ Assert.IsNull(routed.DefaultStoreId);+ }++ [TestMethod]+ public void DefaultStoreId_StoreArea_ResolvesToStoreScope()+ {+ var routed = Build("Store", out _, out _);+ Assert.AreEqual("store-1", routed.DefaultStoreId);+ }++ [TestMethod]+ public void DefaultStoreId_VendorArea_ThrowsFailClosed()+ {+ var routed = Build("Vendor", out _, out _);+ Assert.ThrowsExactly<InvalidOperationException>(() => _ = routed.DefaultStoreId);+ }++ [TestMethod]+ public void DefaultStoreId_MissingArea_ThrowsFailClosed()+ {+ var routed = Build(null, out _, out _);+ Assert.ThrowsExactly<InvalidOperationException>(() => _ = routed.DefaultStoreId);+ }+}diff --git a/src/Tests/Grand.Web.Store.Tests/Controllers/PageControllerTests.cs b/src/Tests/Grand.Web.Store.Tests/Controllers/PageControllerTests.csnew file mode 100644index 000000000..cfcc99d59--- /dev/null+++ b/src/Tests/Grand.Web.Store.Tests/Controllers/PageControllerTests.cs@@ -0,0 +1,250 @@+using Grand.Business.Core.Interfaces.Cms;+using Grand.Business.Core.Interfaces.Common.Directory;+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Domain.Pages;+using Grand.Infrastructure.Mapper;+using Grand.Mapping;+using Grand.Web.AdminShared.Controllers;+using Grand.Web.AdminShared.Interfaces;+using Grand.Web.AdminShared.Mapper;+using Grand.Web.AdminShared.Models.Pages;+using Grand.Web.Common.DataSource;+using Grand.Web.Store.Controllers;+using Microsoft.AspNetCore.Http;+using Microsoft.AspNetCore.Mvc;+using Microsoft.AspNetCore.Mvc.Routing;+using Microsoft.AspNetCore.Mvc.ViewFeatures;+using Microsoft.Extensions.Logging;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;+using System.Reflection;++namespace Grand.Web.Store.Tests.Controllers;++[TestClass]+public class PageControllerTests+{+ private const string WarningKey = "grand.notifications.Warning";++ private PageController _controller;+ private Mock<IPageService> _pageServiceMock;+ private Mock<IAdminDataScope<Page>> _scopeMock;+ private Mock<ILanguageService> _languageServiceMock;++ [TestInitialize]+ public void Setup()+ {+ var mapperConfig = new MapperConfiguration(cfg => cfg.AddProfile<PageProfile>());+ AutoMapperConfig.Init(mapperConfig);++ _pageServiceMock = new Mock<IPageService>();+ _scopeMock = new Mock<IAdminDataScope<Page>>();+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");++ _languageServiceMock = new Mock<ILanguageService>();+ _languageServiceMock.Setup(l => l.GetAllLanguages(true, It.IsAny<string>()))+ .ReturnsAsync(new List<Grand.Domain.Localization.Language>());++ _controller = new PageController(+ new Mock<IPageViewModelService>().Object,+ _pageServiceMock.Object,+ _languageServiceMock.Object,+ new Mock<ITranslationService>().Object,+ new Mock<IDateTimeService>().Object,+ _scopeMock.Object);++ var httpContext = new DefaultHttpContext();+ var loggerFactoryMock = new Mock<ILoggerFactory>();+ loggerFactoryMock.Setup(l => l.CreateLogger(It.IsAny<string>())).Returns(new Mock<ILogger>().Object);+ var urlHelperFactoryMock = new Mock<IUrlHelperFactory>();+ urlHelperFactoryMock.Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>())).Returns(new Mock<IUrlHelper>().Object);+ var requestServicesMock = new Mock<IServiceProvider>();+ requestServicesMock.Setup(s => s.GetService(typeof(ILoggerFactory))).Returns(loggerFactoryMock.Object);+ requestServicesMock.Setup(s => s.GetService(typeof(IUrlHelperFactory))).Returns(urlHelperFactoryMock.Object);+ httpContext.RequestServices = requestServicesMock.Object;+ _controller.ControllerContext = new ControllerContext { HttpContext = httpContext };+ _controller.TempData = new TempDataDictionary(httpContext, new Mock<ITempDataProvider>().Object);+ }++ [TestMethod]+ public void PageController_HasRequiredHostAttributes()+ {+ var type = typeof(PageController);++ var areaAttr = type.GetCustomAttribute<AreaAttribute>(inherit: false);+ Assert.IsNotNull(areaAttr);+ Assert.AreEqual("Store", areaAttr.RouteValue);++ Assert.IsNotNull(type.GetCustomAttribute<Grand.Web.Common.Filters.AuthorizeStoreAttribute>(inherit: false));+ Assert.IsNotNull(type.GetCustomAttribute<Grand.Web.Common.Filters.AuthorizeMenuAttribute>(inherit: false));+ Assert.IsNotNull(type.GetCustomAttribute<AutoValidateAntiforgeryTokenAttribute>(inherit: false));+ }++ // --- EditWarningCheck truth table -----------------------------------------------------------++ [TestMethod]+ public async Task EditGet_NotLimitedToStores_WarningFires()+ {+ var page = new Page { Id = "p1", LimitedToStores = false };+ _pageServiceMock.Setup(p => p.GetPageById("p1")).ReturnsAsync(page);+ _scopeMock.Setup(s => s.CanView(page)).ReturnsAsync(true);++ await _controller.Edit("p1");++ Assert.IsTrue(_controller.TempData.ContainsKey(WarningKey));+ }++ [TestMethod]+ public async Task EditGet_LimitedContainsStore_CountGreaterThanOne_WarningFires()+ {+ var page = new Page { Id = "p1", LimitedToStores = true, Stores = ["store-1", "store-2"] };+ _pageServiceMock.Setup(p => p.GetPageById("p1")).ReturnsAsync(page);+ _scopeMock.Setup(s => s.CanView(page)).ReturnsAsync(true);++ await _controller.Edit("p1");++ Assert.IsTrue(_controller.TempData.ContainsKey(WarningKey));+ }++ [TestMethod]+ public async Task EditGet_LimitedContainsStore_CountOne_NoWarning()+ {+ var page = new Page { Id = "p1", LimitedToStores = true, Stores = ["store-1"] };+ _pageServiceMock.Setup(p => p.GetPageById("p1")).ReturnsAsync(page);+ _scopeMock.Setup(s => s.CanView(page)).ReturnsAsync(true);++ await _controller.Edit("p1");++ Assert.IsFalse(_controller.TempData.ContainsKey(WarningKey));+ }++ [TestMethod]+ public async Task EditGet_LimitedDoesNotContainStore_NoWarning()+ {+ var page = new Page { Id = "p1", LimitedToStores = true, Stores = ["other-store"] };+ _pageServiceMock.Setup(p => p.GetPageById("p1")).ReturnsAsync(page);+ _scopeMock.Setup(s => s.CanView(page)).ReturnsAsync(true);++ await _controller.Edit("p1");++ Assert.IsFalse(_controller.TempData.ContainsKey(WarningKey));+ }++ // --- StorePagesList / GlobalPagesList --------------------------------------------------------++ [TestMethod]+ public async Task StorePagesList_ReturnsOnlyExclusivelyOwnedPages()+ {+ var owned = new Page { Id = "owned", LimitedToStores = true, Stores = ["store-1"] };+ var shared = new Page { Id = "shared", LimitedToStores = true, Stores = ["store-1", "store-2"] };+ var global = new Page { Id = "global", LimitedToStores = false };+ _pageServiceMock.Setup(p => p.GetAllPages("store-1", true)).ReturnsAsync(new List<Page> { owned, shared, global });++ var result = await _controller.StorePagesList(new DataSourceRequest { Page = 1, PageSize = 10 }, new PageListModel());++ var json = result as JsonResult;+ var gridModel = (DataSourceResult)json.Value;+ Assert.AreEqual(1, gridModel.Total);+ }++ [TestMethod]+ public async Task GlobalPagesList_ReturnsSharedAndUnrestrictedPages()+ {+ var owned = new Page { Id = "owned", LimitedToStores = true, Stores = ["store-1"] };+ var shared = new Page { Id = "shared", LimitedToStores = true, Stores = ["store-1", "store-2"] };+ var global = new Page { Id = "global", LimitedToStores = false };+ _pageServiceMock.Setup(p => p.GetAllPages("store-1", true)).ReturnsAsync(new List<Page> { owned, shared, global });++ var result = await _controller.GlobalPagesList(new DataSourceRequest { Page = 1, PageSize = 10 }, new PageListModel());++ var json = result as JsonResult;+ var gridModel = (DataSourceResult)json.Value;+ Assert.AreEqual(2, gridModel.Total);+ }++ // --- Copy -------------------------------------------------------------------------------------++ [TestMethod]+ public async Task Copy_PageNotVisibleToThisStore_RedirectsToList()+ {+ var page = new Page { Id = "p1", LimitedToStores = true, Stores = ["other-store"] };+ _pageServiceMock.Setup(p => p.GetPageById("p1")).ReturnsAsync(page);++ var result = await _controller.Copy("p1");++ var redirect = result as RedirectToActionResult;+ Assert.IsNotNull(redirect);+ Assert.AreEqual("List", redirect.ActionName);+ }++ [TestMethod]+ public async Task Copy_AlreadyExclusiveToThisStore_RedirectsToEdit()+ {+ var page = new Page { Id = "p1", LimitedToStores = true, Stores = ["store-1"] };+ _pageServiceMock.Setup(p => p.GetPageById("p1")).ReturnsAsync(page);++ var result = await _controller.Copy("p1");++ var redirect = result as RedirectToActionResult;+ Assert.IsNotNull(redirect);+ Assert.AreEqual("Edit", redirect.ActionName);+ Assert.AreEqual("p1", redirect.RouteValues["id"]);+ }++ [TestMethod]+ public async Task Copy_DuplicateSystemNameInTargetStore_RedirectsToEditWithoutInserting()+ {+ var page = new Page { Id = "p1", SystemName = "about-us", LimitedToStores = false };+ var existing = new Page { Id = "p2", SystemName = "about-us" };+ _pageServiceMock.Setup(p => p.GetPageById("p1")).ReturnsAsync(page);+ _pageServiceMock.Setup(p => p.GetAllPages("store-1", true)).ReturnsAsync(new List<Page> { page, existing });++ var pageViewModelServiceMock = new Mock<IPageViewModelService>();+ var controller = new PageController(+ pageViewModelServiceMock.Object, _pageServiceMock.Object,+ _languageServiceMock.Object, new Mock<ITranslationService>().Object,+ new Mock<IDateTimeService>().Object, _scopeMock.Object);+ controller.ControllerContext = _controller.ControllerContext;+ controller.TempData = _controller.TempData;++ var result = await controller.Copy("p1");++ var redirect = result as RedirectToActionResult;+ Assert.IsNotNull(redirect);+ Assert.AreEqual("Edit", redirect.ActionName);+ pageViewModelServiceMock.Verify(v => v.InsertPageModel(It.IsAny<PageModel>()), Times.Never);+ }++ [TestMethod]+ public async Task Copy_SharedPage_InsertsCopyScopedToCurrentStore()+ {+ var page = new Page { Id = "p1", SystemName = "about-us", LimitedToStores = true, Stores = ["store-1", "store-2"] };+ _pageServiceMock.Setup(p => p.GetPageById("p1")).ReturnsAsync(page);+ _pageServiceMock.Setup(p => p.GetAllPages("store-1", true)).ReturnsAsync(new List<Page> { page });++ var pageViewModelServiceMock = new Mock<IPageViewModelService>();+ var newPage = new Page { Id = "new-1" };+ pageViewModelServiceMock+ .Setup(v => v.InsertPageModel(It.IsAny<PageModel>()))+ .ReturnsAsync(newPage)+ .Callback<PageModel>(m => {+ Assert.AreEqual("", m.Id);+ Assert.AreEqual("store-1", m.Stores.Single());+ });++ var controller = new PageController(+ pageViewModelServiceMock.Object, _pageServiceMock.Object,+ _languageServiceMock.Object, new Mock<ITranslationService>().Object,+ new Mock<IDateTimeService>().Object, _scopeMock.Object);+ controller.ControllerContext = _controller.ControllerContext;+ controller.TempData = _controller.TempData;++ var result = await controller.Copy("p1");++ var redirect = result as RedirectToActionResult;+ Assert.IsNotNull(redirect);+ Assert.AreEqual("Edit", redirect.ActionName);+ Assert.AreEqual("new-1", redirect.RouteValues["id"]);+ pageViewModelServiceMock.Verify(v => v.InsertPageModel(It.IsAny<PageModel>()), Times.Once);+ }+}diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Create.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Create.cshtmldeleted file mode 100644index 27037dd89..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Create.cshtml+++ /dev/null@@ -1,37 +0,0 @@-@model PageModel-@{- //page title- ViewBag.Title = Loc["Admin.Content.Pages.AddNew"];-}-<form asp-area="@Constants.AreaAdmin" asp-controller="Page" asp-action="Create" method="post">-- <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-fw fa-file-o"></i>- @Loc["Admin.Content.Pages.AddNew"]- <small>- <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Content.Pages.BackToList"], "List")- </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>- <vc:admin-widget widget-zone="page_details_buttons" additional-data="null"/>- </div>- </div>- </div>- <div class="x_content form">- <partial name="Partials/CreateOrUpdate" model="Model"/>- </div>- </div>- </div>- </div>-</form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Edit.cshtmldeleted file mode 100644index 74d9e3804..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Edit.cshtml+++ /dev/null@@ -1,45 +0,0 @@-@model PageModel-@{- //page title- ViewBag.Title = Loc["Admin.Content.Pages.EditPageDetails"];-}-<form asp-area="@Constants.AreaAdmin" asp-controller="Page" asp-action="Edit" method="post">-- <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-fw fa-file-o"></i>- @Loc["Admin.Content.Pages.EditPageDetails"] - @Model.SystemName- <small>- <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Content.Pages.BackToList"], "List")- </small>- </div>- <div class="actions">- <div class="btn-group btn-group-devided">- <button type="button" onclick="window.open('@Url.RouteUrl("Page", new { Model.SeName })','_blank');" class="btn purple">- <i class="fa fa-eye"></i>- @Loc["Admin.Common.Preview"]- </button>- <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="page-delete" class="btn red">- <i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]- </span>- <vc:admin-widget widget-zone="page_details_buttons" additional-data="Model"/>- </div>- </div>- </div>- <div class="x_content form">- <partial name="Partials/CreateOrUpdate" model="Model"/>- </div>- </div>- </div>- </div>-</form>-<admin-delete-confirmation button-id="page-delete"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/List.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/List.cshtmlindex 060c3bedb..67ab0effc 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/List.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/List.cshtml@@ -17,7 +17,7 @@<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>- <vc:admin-widget widget-zone="page_list_buttons" additional-data="null"/>+ <partial name="Partials/WidgetZone.ListButtons"/></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/CreateOrUpdate.TabInfo.cshtmldeleted file mode 100644index 3287a30c8..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/CreateOrUpdate.TabInfo.cshtml+++ /dev/null@@ -1,209 +0,0 @@-@using Microsoft.AspNetCore.Mvc.Razor-@model PageModel--<script>-$(document).ready(function() {- $("#@Html.IdFor(model => model.IsPasswordProtected)").click(togglePassword);- togglePassword();-});--function togglePassword() {- if ($('#@Html.IdFor(model => model.IsPasswordProtected)').is(':checked')) {- $('#pnlPasswordEnabled').show();- } else {- $('#pnlPasswordEnabled').hide();- }-}-</script>-<vc:admin-widget widget-zone="page_details_info_top" additional-data="Model"/>--@{- Func<int, HelperResult>- template = @<div class="form-body">- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].Title"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].Title"/>- <span asp-validation-for="@Model.Locales[item].Title"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].Body"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].Body" asp-template="Editor"/>- <span asp-validation-for="@Model.Locales[item].Body"></span>- </div>- </div>- <input asp-for="@Model.Locales[item].LanguageId" type="hidden"/>- </div>;-}--<div class="form-horizontal">- <localized-editor localized-template="@template" name="page-info-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">- <div class="form-body">- <div class="form-group">- <admin-label asp-for="Title"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Title"/>- <span asp-validation-for="Title"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="Body"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Body" asp-template="Editor"/>- <span asp-validation-for="Body"></span>- </div>- </div>- </div>- </localized-editor>-- <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>- @if (!string.IsNullOrEmpty(Model.Id))- {- <div class="form-group">- <admin-label asp-for="Url"/>- <div class="col-md-9 col-sm-9">- <label class="control-label">- <a href="@Model.Url">@Model.Url</a>- </label>- </div>- </div>- }- <div class="form-group">- <admin-label asp-for="IsPasswordProtected"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="IsPasswordProtected"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="IsPasswordProtected"></span>- </div>- </div>- <div class="form-group" id="pnlPasswordEnabled">- <admin-label asp-for="Password"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Password" autocomplete="off"/>- <span asp-validation-for="Password"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="IncludeInSitemap"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="IncludeInSitemap"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="IncludeInSitemap"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="IncludeInMenu"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="IncludeInMenu"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="IncludeInMenu"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="IncludeInFooterRow1"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="IncludeInFooterRow1"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="IncludeInFooterRow1"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="IncludeInFooterRow2"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="IncludeInFooterRow2"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="IncludeInFooterRow2"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="IncludeInFooterRow3"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="IncludeInFooterRow3"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="IncludeInFooterRow3"></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="CustomerGroups"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="CustomerGroups"/>- <span asp-validation-for="CustomerGroups"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="Stores"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Stores"/>- <span asp-validation-for="Stores"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="AccessibleWhenStoreClosed"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="AccessibleWhenStoreClosed"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="AccessibleWhenStoreClosed"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="PageLayoutId"/>- <div class="col-md-9 col-sm-9">- <admin-select asp-for="PageLayoutId" asp-items="Model.AvailablePageLayouts"/>- <span asp-validation-for="PageLayoutId"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="Published"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="Published"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="Published"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="StartDateUtc"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="StartDateUtc"/>- </div>- </div>- <div class="form-group">- <admin-label asp-for="EndDateUtc"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="EndDateUtc"/>- </div>- </div>- </div>-</div>-<vc:admin-widget widget-zone="page_details_info_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/CreateOrUpdate.TabSeo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/CreateOrUpdate.TabSeo.cshtmldeleted file mode 100644index 7322f8629..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/CreateOrUpdate.TabSeo.cshtml+++ /dev/null@@ -1,76 +0,0 @@-@using Microsoft.AspNetCore.Mvc.Razor-@model PageModel--<vc:admin-widget widget-zone="page_details_seo_top" additional-data="Model"/>--@{- Func<int, HelperResult>- template = @<div class="form-body">- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].MetaKeywords"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].MetaKeywords"/>- <span asp-validation-for="@Model.Locales[item].MetaKeywords"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].MetaDescription"/>- <div class="col-md-9 col-sm-9">- <admin-textarea asp-for="@Model.Locales[item].MetaDescription"></admin-textarea>- <span asp-validation-for="@Model.Locales[item].MetaDescription"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].MetaTitle"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].MetaTitle"/>- <span asp-validation-for="@Model.Locales[item].MetaTitle"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].SeName"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].SeName"/>- <span asp-validation-for="@Model.Locales[item].SeName"></span>- </div>- </div>- <input asp-for="@Model.Locales[item].LanguageId" type="hidden"/>- </div>;-}--<div class="form-horizontal">- <localized-editor localized-template="@template" name="page-seo-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">- <div class="form-body">- <div class="form-group">- <admin-label asp-for="MetaKeywords"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="MetaKeywords"/>- <span asp-validation-for="MetaKeywords"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="MetaDescription"/>- <div class="col-md-9 col-sm-9">- <admin-textarea asp-for="MetaDescription"></admin-textarea>- <span asp-validation-for="MetaDescription"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="MetaTitle"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="MetaTitle"/>- <span asp-validation-for="MetaTitle"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="SeName"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="SeName"/>- <span asp-validation-for="SeName"></span>- </div>- </div>- </div>- </localized-editor>--</div>-<vc:admin-widget widget-zone="page_details_seo_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/CreateOrUpdate.cshtmldeleted file mode 100644index ba8e8f3fe..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/CreateOrUpdate.cshtml+++ /dev/null@@ -1,30 +0,0 @@-@model PageModel--<div asp-validation-summary="All"></div>-<input asp-for="Id" type="hidden"/>-<admin-tabstrip name="page-edit">- <items>- <tabstrip-item text="@Loc["Admin.Content.Pages.Info"]" tab-index="0">- <content>- <div>- <partial name="Partials/CreateOrUpdate.TabInfo" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Admin.Common.SEO"]" tab-index="1">- <content>- <div>- <partial name="Partials/CreateOrUpdate.TabSeo" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="2">- <content>- <div>- <partial name="Partials/UserFields" model="Model"/>- </div>- </content>- </tabstrip-item>- <vc:admin-widget widget-zone="page_details_tabs" additional-data="Model"/>- </items>-</admin-tabstrip>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.DetailsButtons.cshtmlnew file mode 100644index 000000000..65279dbca--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.DetailsButtons.cshtml@@ -0,0 +1,2 @@+@model PageModel+<vc:admin-widget widget-zone="page_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.DetailsButtonsCreate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.DetailsButtonsCreate.cshtmlnew file mode 100644index 000000000..64fe5a0b3--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.DetailsButtonsCreate.cshtml@@ -0,0 +1,2 @@+@model dynamic+<vc:admin-widget widget-zone="page_details_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.Info.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.Info.Bottom.cshtmlnew file mode 100644index 000000000..2c7531239--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.Info.Bottom.cshtml@@ -0,0 +1,2 @@+@model PageModel+<vc:admin-widget widget-zone="page_details_info_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.Info.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.Info.Top.cshtmlnew file mode 100644index 000000000..3d901f3c4--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.Info.Top.cshtml@@ -0,0 +1,2 @@+@model PageModel+<vc:admin-widget widget-zone="page_details_info_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.ListButtons.cshtmlnew file mode 100644index 000000000..5b58098bf--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.ListButtons.cshtml@@ -0,0 +1 @@+<vc:admin-widget widget-zone="page_list_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.Seo.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.Seo.Bottom.cshtmlnew file mode 100644index 000000000..030d8c4de--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.Seo.Bottom.cshtml@@ -0,0 +1,2 @@+@model PageModel+<vc:admin-widget widget-zone="page_details_seo_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.Seo.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.Seo.Top.cshtmlnew file mode 100644index 000000000..4ad1c4ff7--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.Seo.Top.cshtml@@ -0,0 +1,2 @@+@model PageModel+<vc:admin-widget widget-zone="page_details_seo_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.Tabs.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.Tabs.cshtmlnew file mode 100644index 000000000..f6744a234--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Page/Partials/WidgetZone.Tabs.cshtml@@ -0,0 +1,2 @@+@model PageModel+<vc:admin-widget widget-zone="page_details_tabs" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Controllers/PageController.cs b/src/Web/Grand.Web.Admin/Controllers/PageController.csindex e5e91301e..2ce491b72 100644--- a/src/Web/Grand.Web.Admin/Controllers/PageController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/PageController.cs@@ -1,201 +1,30 @@-using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Cms;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;-using Grand.Domain.Permissions;-using Grand.Infrastructure;-using Grand.Web.AdminShared.Extensions.Mapping;+using Grand.Domain.Pages;+using Grand.Web.Admin.Extensions;+using Grand.Web.AdminShared.Controllers;using Grand.Web.AdminShared.Interfaces;-using Grand.Web.AdminShared.Models.Pages;-using Grand.Web.Common.DataSource;using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Authorization;+using Grand.Web.Common.Localization;using Microsoft.AspNetCore.Mvc;namespace Grand.Web.Admin.Controllers;-[PermissionAuthorize(PermissionSystemName.Pages)]-public class PageController : BaseAdminController-{- #region Constructors-- public PageController(- IPageViewModelService pageViewModelService,- IPageService pageService,- ILanguageService languageService,- ITranslationService translationService,- IContextAccessor contextAccessor,- IDateTimeService dateTimeService)- {- _pageViewModelService = pageViewModelService;- _pageService = pageService;- _languageService = languageService;- _translationService = translationService;- _contextAccessor = contextAccessor;- _dateTimeService = dateTimeService;- }-- #endregion-- #region Fields-- private readonly IPageViewModelService _pageViewModelService;- private readonly IPageService _pageService;- private readonly ILanguageService _languageService;- private readonly ITranslationService _translationService;- private readonly IContextAccessor _contextAccessor;- private readonly IDateTimeService _dateTimeService;-- #endregion Fields-- #region List-- public IActionResult Index()- {- return RedirectToAction("List");- }-- public async Task<IActionResult> List()- {- var model = await _pageViewModelService.PreparePageListModel();- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.List)]- [HttpPost]- public async Task<IActionResult> List(DataSourceRequest command, PageListModel model)- {- var pageModels = (await _pageService.GetAllPages(model.SearchStoreId, true))- .Select(x => x.ToModel(_dateTimeService))- .ToList();-- if (!string.IsNullOrEmpty(model.Name))- pageModels = pageModels.Where- (x => x.SystemName.ToLowerInvariant().Contains(model.Name.ToLowerInvariant()) ||- (x.Title != null && x.Title.ToLowerInvariant().Contains(model.Name.ToLowerInvariant()))).ToList();- //"Error during serialization or deserialization using the JSON JavaScriptSerializer. The length of the string exceeds the value set on the maxJsonLength property. "- foreach (var page in pageModels) page.Body = "";- var total = pageModels.Count;- var pagedData = pageModels.Skip((command.Page - 1) * command.PageSize).Take(command.PageSize).ToList();- var gridModel = new DataSourceResult {- Data = pagedData,- Total = total- };-- return Json(gridModel);- }-- #endregion-- #region Create / Edit / Delete-- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create()- {- var model = new PageModel();- //layouts- await _pageViewModelService.PrepareLayoutsModel(model);- //locales- await AddLocales(_languageService, model.Locales);- //default values- model.DisplayOrder = 1;-- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- public async Task<IActionResult> Create(PageModel model, bool continueEditing)- {- if (ModelState.IsValid)- {- var page = await _pageViewModelService.InsertPageModel(model);- Success(_translationService.GetResource("Admin.Content.Pages.Added"));- return continueEditing ? RedirectToAction("Edit", new { id = page.Id }) : RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- //layouts- await _pageViewModelService.PrepareLayoutsModel(model);- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> Edit(string id)- {- var page = await _pageService.GetPageById(id);- if (page == null)- //No page found with the specified id- return RedirectToAction("List");-- var model = page.ToModel(_dateTimeService);- model.Url = Url.RouteUrl("Page", new { SeName = page.GetSeName(_contextAccessor.WorkContext.WorkingLanguage.Id) }, "http");- //layouts- await _pageViewModelService.PrepareLayoutsModel(model);- //locales- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Title = page.GetTranslation(x => x.Title, languageId, false);- locale.Body = page.GetTranslation(x => x.Body, languageId, false);- locale.MetaKeywords = page.GetTranslation(x => x.MetaKeywords, languageId, false);- locale.MetaDescription = page.GetTranslation(x => x.MetaDescription, languageId, false);- locale.MetaTitle = page.GetTranslation(x => x.MetaTitle, languageId, false);- locale.SeName = page.GetSeName(languageId, false);- });- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- public async Task<IActionResult> Edit(PageModel model, bool continueEditing)- {- var page = await _pageService.GetPageById(model.Id);- if (page == null)- //No page found with the specified id- return RedirectToAction("List");-- if (ModelState.IsValid)- {- page = await _pageViewModelService.UpdatePageModel(page, model);- Success(_translationService.GetResource("Admin.Content.Pages.Updated"));- if (continueEditing)- {- //selected tab- await SaveSelectedTabIndex();- return RedirectToAction("Edit", new { id = page.Id });- }-- return RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- model.Url = Url.RouteUrl("Page", new { SeName = page.GetSeName(_contextAccessor.WorkContext.WorkingLanguage.Id) }, "http");- //layouts- await _pageViewModelService.PrepareLayoutsModel(model);- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Delete)]- [HttpPost]- public async Task<IActionResult> Delete(string id)- {- var page = await _pageService.GetPageById(id);- if (page == null)- //No page found with the specified id- return RedirectToAction("List");-- if (ModelState.IsValid)- {- await _pageViewModelService.DeletePage(page);- Success(_translationService.GetResource("Admin.Content.Pages.Deleted"));- return RedirectToAction("List");- }-- Error(ModelState);- return RedirectToAction("Edit", new { id });- }-- #endregion-}\ No newline at end of file+// Reduced to a thin subclass of BasePageController (ARCH-001 Page consolidation). All shared+// behavior lives in the base; this class only supplies Admin's DI wiring plus the attributes that+// used to arrive transitively via BaseAdminController - BasePageController can't inherit any single+// host's base controller. Same pattern as BlogController (see that file).+[AuthorizeAdmin]+[AutoValidateAntiforgeryToken]+[Area(Constants.AreaAdmin)]+[AuthorizeMenu]+public class PageController(+ IPageViewModelService pageViewModelService,+ IPageService pageService,+ ILanguageService languageService,+ ITranslationService translationService,+ IDateTimeService dateTimeService,+ IAdminDataScope<Page> scope)+ : BasePageController(pageViewModelService, pageService, languageService, translationService,+ dateTimeService, scope);diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BasePageController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BasePageController.csnew file mode 100644index 000000000..77477cda7--- /dev/null+++ b/src/Web/Grand.Web.AdminShared/Controllers/BasePageController.cs@@ -0,0 +1,188 @@+using Grand.Business.Core.Extensions;+using Grand.Business.Core.Interfaces.Cms;+using Grand.Business.Core.Interfaces.Common.Directory;+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Domain.Pages;+using Grand.Domain.Permissions;+using Grand.Web.AdminShared.Extensions.Mapping;+using Grand.Web.AdminShared.Interfaces;+using Grand.Web.AdminShared.Models.Pages;+using Grand.Web.Common.Controllers;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;+using Microsoft.AspNetCore.Mvc;++namespace Grand.Web.AdminShared.Controllers;++[PermissionAuthorize(PermissionSystemName.Pages)]+[AutoValidateAntiforgeryToken]+public abstract class BasePageController(+ IPageViewModelService pageViewModelService,+ IPageService pageService,+ ILanguageService languageService,+ ITranslationService translationService,+ IDateTimeService dateTimeService,+ IAdminDataScope<Page> scope)+ : BaseController+{+ /// <summary>Hook for host-specific UI-copy warnings on Edit(GET) that aren't access-scope+ /// decisions. Overridden by the Store subclass (Task 3); no-op everywhere else. Third occurrence+ /// of this exact pattern in ARCH-001 (Category, Blog, now Page) - treat as proven, not novel.</summary>+ protected virtual void EditWarningCheck(Page page) { }++ // Exposed for host subclasses: primary-constructor parameters are not visible to derived classes+ // by name in C#.+ protected ITranslationService TranslationService => translationService;+ protected IAdminDataScope<Page> Scope => scope;++ #region List++ public IActionResult Index() => RedirectToAction("List");++ public async Task<IActionResult> List()+ {+ var model = await pageViewModelService.PreparePageListModel();+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.List)]+ [HttpPost]+ public async Task<IActionResult> List(DataSourceRequest command, PageListModel model)+ {+ if (scope.DefaultStoreId is not null) model.SearchStoreId = scope.DefaultStoreId;++ var pageModels = (await pageService.GetAllPages(model.SearchStoreId, true))+ .Select(x => x.ToModel(dateTimeService))+ .ToList();++ if (!string.IsNullOrEmpty(model.Name))+ pageModels = pageModels.Where(x =>+ x.SystemName.ToLowerInvariant().Contains(model.Name.ToLowerInvariant()) ||+ (x.Title != null && x.Title.ToLowerInvariant().Contains(model.Name.ToLowerInvariant()))).ToList();++ // "Error during serialization or deserialization using the JSON JavaScriptSerializer. The+ // length of the string exceeds the value set on the maxJsonLength property."+ foreach (var page in pageModels) page.Body = "";+ var total = pageModels.Count;+ var pagedData = pageModels.Skip((command.Page - 1) * command.PageSize).Take(command.PageSize).ToList();+ var gridModel = new DataSourceResult {+ Data = pagedData,+ Total = total+ };+ return Json(gridModel);+ }++ #endregion++ #region Create / Edit / Delete++ [PermissionAuthorizeAction(PermissionActionName.Create)]+ public async Task<IActionResult> Create()+ {+ var model = new PageModel { DisplayOrder = 1 };+ if (scope.DefaultStoreId is not null) model.Published = true;+ await pageViewModelService.PrepareLayoutsModel(model);+ await AddLocales(languageService, model.Locales);+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]+ public async Task<IActionResult> Create(PageModel model, bool continueEditing)+ {+ if (ModelState.IsValid)+ {+ if (scope.DefaultStoreId is not null) model.Stores = [scope.DefaultStoreId];+ var page = await pageViewModelService.InsertPageModel(model);+ Success(translationService.GetResource("Admin.Content.Pages.Added"));+ return continueEditing ? RedirectToAction("Edit", new { id = page.Id }) : RedirectToAction("List");+ }++ await pageViewModelService.PrepareLayoutsModel(model);+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ public async Task<IActionResult> Edit(string id)+ {+ var page = await pageService.GetPageById(id);+ if (page == null) return RedirectToAction("List");++ EditWarningCheck(page);+ if (!await scope.CanView(page)) return RedirectToAction("List");++ var model = page.ToModel(dateTimeService);+ // Ruled during spec-writing: use Request.Scheme for both hosts (Admin's original hardcoded+ // "http" - a strict improvement, disclosed in the PR body, not a silent behavior change).+ model.Url = Url.RouteUrl("Page", new { SeName = page.SeName }, Request.Scheme);+ // True when the page is global or shared with more than one store - a store manager may copy+ // it into their own store instead of editing it directly. Always computed; Admin's view never+ // renders the Copy button region regardless of this value.+ model.ShowCopyButton = !page.LimitedToStores || page.Stores.Count > 1;+ await pageViewModelService.PrepareLayoutsModel(model);+ await AddLocales(languageService, model.Locales, (locale, languageId) =>+ {+ locale.Title = page.GetTranslation(x => x.Title, languageId, false);+ locale.Body = page.GetTranslation(x => x.Body, languageId, false);+ locale.MetaKeywords = page.GetTranslation(x => x.MetaKeywords, languageId, false);+ locale.MetaDescription = page.GetTranslation(x => x.MetaDescription, languageId, false);+ locale.MetaTitle = page.GetTranslation(x => x.MetaTitle, languageId, false);+ locale.SeName = page.GetSeName(languageId, false);+ });+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]+ public async Task<IActionResult> Edit(PageModel model, bool continueEditing)+ {+ var page = await pageService.GetPageById(model.Id);+ if (page == null) return RedirectToAction("List");+ if (!await scope.HasAccess(page)) return RedirectToAction("Edit", new { id = page.Id });++ if (ModelState.IsValid)+ {+ if (scope.DefaultStoreId is not null)+ {+ model.Stores = [scope.DefaultStoreId];+ // Store cannot change a page's customer-group ACL at all - its Edit form has no such+ // field, and its original controller always discarded whatever was posted here in+ // favor of the existing page's own value. Preserved exactly, not a bug.+ model.CustomerGroups = page.CustomerGroups.ToArray();+ }++ page = await pageViewModelService.UpdatePageModel(page, model);+ Success(translationService.GetResource("Admin.Content.Pages.Updated"));+ if (continueEditing)+ {+ await SaveSelectedTabIndex();+ return RedirectToAction("Edit", new { id = page.Id });+ }+ return RedirectToAction("List");+ }++ model.Url = Url.RouteUrl("Page", new { SeName = page.SeName }, Request.Scheme);+ await pageViewModelService.PrepareLayoutsModel(model);+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Delete)]+ [HttpPost]+ public async Task<IActionResult> Delete(string id)+ {+ var page = await pageService.GetPageById(id);+ if (page == null) return RedirectToAction("List");+ // Page-specific: denial redirects to List, NOT Edit (unlike Blog/Category's own Delete) -+ // verified directly from Store's original source, not assumed from sibling entities.+ if (!await scope.HasAccess(page)) return RedirectToAction("List");++ await pageViewModelService.DeletePage(page);+ Success(translationService.GetResource("Admin.Content.Pages.Deleted"));+ return RedirectToAction("List");+ }++ #endregion+}diff --git a/src/Web/Grand.Web.AdminShared/Services/RoutedPageDataScope.cs b/src/Web/Grand.Web.AdminShared/Services/RoutedPageDataScope.csnew file mode 100644index 000000000..7a4a99455--- /dev/null+++ b/src/Web/Grand.Web.AdminShared/Services/RoutedPageDataScope.cs@@ -0,0 +1,46 @@+#nullable enable++using Grand.Domain.Pages;+using Grand.Web.AdminShared.Interfaces;+using Microsoft.AspNetCore.Http;++namespace Grand.Web.AdminShared.Services;++/// <summary>+/// Resolves the correct per-host <see cref="IAdminDataScope{Page}" /> implementation at+/// request time, based on the current request's "area" route value — same fix and same reason+/// as <see cref="RoutedCategoryDataScope"/> (see that file's doc comment): Grand.Web (the+/// combined host) loads Admin and Store together in one DI container, so a plain+/// AddScoped<IAdminDataScope<Page>, X>() per host would silently let whichever+/// host's StartupApplication ran last win for every area in that process.+///+/// No Vendor branch: Vendor has no Page screen at all, so any "Vendor" (or other+/// unrecognized/missing) area value fails closed.+/// </summary>+public class RoutedPageDataScope(+ IHttpContextAccessor httpContextAccessor,+ GlobalAdminDataScope<Page> globalScope,+ StoreAdminDataScope<Page> storeScope) : IAdminDataScope<Page>+{+ private IAdminDataScope<Page> Resolved+ {+ get+ {+ var area = httpContextAccessor.HttpContext?.Request.RouteValues["area"] as string;+ return area switch {+ "Admin" => globalScope,+ "Store" => storeScope,+ _ => throw new InvalidOperationException(+ $"RoutedPageDataScope: unrecognized or missing area '{area}'.")+ };+ }+ }++ public Task<bool> HasAccess(Page entity) => Resolved.HasAccess(entity);+ public Task<bool> CanView(Page entity) => Resolved.CanView(entity);+ public string? DefaultStoreId => Resolved.DefaultStoreId;+ public string ResourceKeyPrefix => Resolved.ResourceKeyPrefix;+ public bool ShowStoreSelector => Resolved.ShowStoreSelector;+ public string? DefaultVendorId => Resolved.DefaultVendorId;+ public bool CanFeatureOnHomepage => Resolved.CanFeatureOnHomepage;+}diff --git a/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs b/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.csindex bd4adda49..3025bff67 100644--- a/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs+++ b/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs@@ -7,6 +7,7 @@ using Grand.Domain.Customers;using Grand.Domain.Discounts;using Grand.Domain.Messages;using Grand.Domain.Orders;+using Grand.Domain.Pages;using Grand.Domain.Payments;using Grand.Domain.Shipping;using Grand.Domain.Vendors;@@ -194,6 +195,12 @@ public class StartupApplication : IStartupApplicationservices.AddScoped<StoreAdminDataScope<SpecificationAttribute>>();services.AddScoped<IAdminDataScope<SpecificationAttribute>, RoutedSpecificationAttributeDataScope>();+ // IAdminDataScope<Page>: registered once here for the same reason as Category above — see+ // RoutedPageDataScope's doc comment. No Vendor scope: Page has no Vendor screen.+ services.AddScoped<GlobalAdminDataScope<Page>>();+ services.AddScoped<StoreAdminDataScope<Page>>();+ services.AddScoped<IAdminDataScope<Page>, RoutedPageDataScope>();+// IAdminDataScope<BlogPost>/<BlogCategory>: registered once here for the same reason as// Category above — see RoutedBlogPostDataScope's doc comment. No Vendor scope: Blog has no// Vendor screen. Two entities share one controller (BaseBlogController), so two routed@@ -201,7 +208,6 @@ public class StartupApplication : IStartupApplicationservices.AddScoped<GlobalAdminDataScope<BlogPost>>();services.AddScoped<StoreAdminDataScope<BlogPost>>();services.AddScoped<IAdminDataScope<BlogPost>, RoutedBlogPostDataScope>();-services.AddScoped<GlobalAdminDataScope<BlogCategory>>();services.AddScoped<StoreAdminDataScope<BlogCategory>>();services.AddScoped<IAdminDataScope<BlogCategory>, RoutedBlogCategoryDataScope>();diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Create.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Page/Create.cshtmlsimilarity index 84%rename from src/Web/Grand.Web.Store/Areas/Store/Views/Page/Create.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Page/Create.cshtmlindex 26b02c71f..fe4708c77 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Create.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Page/Create.cshtml@@ -1,10 +1,11 @@+@using Grand.Web.AdminShared.Models.Pages@model PageModel@{//page titleViewBag.Title = Loc["Admin.Content.Pages.AddNew"];- Layout = Constants.LayoutStore;+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form asp-area="@Constants.AreaStore" asp-controller="Page" asp-action="Create" method="post">+<form asp-area="@area" asp-controller="Page" asp-action="Create" method="post"><div class="row"><div class="col-md-12">@@ -25,6 +26,7 @@<button class="btn btn-success" type="submit" name="save-continue"><i class="fa fa-check-circle"></i> @Loc["Admin.Common.SaveContinue"]</button>+ <partial name="Partials/WidgetZone.DetailsButtonsCreate"/></div></div></div>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Edit.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Page/Edit.cshtmlsimilarity index 83%rename from src/Web/Grand.Web.Store/Areas/Store/Views/Page/Edit.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Page/Edit.cshtmlindex e4b83f088..cd30c8041 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Edit.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Page/Edit.cshtml@@ -1,10 +1,11 @@+@using Grand.Web.AdminShared.Models.Pages@model PageModel@{//page titleViewBag.Title = Loc["Admin.Content.Pages.EditPageDetails"];- Layout = Constants.LayoutStore;+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form asp-area="@Constants.AreaStore" asp-controller="Page" asp-action="Edit" method="post">+<form asp-area="@area" asp-controller="Page" asp-action="Edit" method="post"><div class="row"><div class="col-md-12">@@ -32,15 +33,16 @@<button class="btn btn-success" type="submit" name="save-continue"><i class="fa fa-check-circle"></i> @Loc["Admin.Common.SaveContinue"]</button>- @if (Model.ShowCopyButton)+ <span id="page-delete" class="btn red">+ <i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]+ </span>+ @if (area == "Store" && Model.ShowCopyButton){<button type="submit" form="page-copy-form" class="btn blue"><i class="fa fa-copy"></i> @Loc["Admin.Common.Copy"]</button>}- <span id="page-delete" class="btn red">- <i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]- </span>+ <partial name="Partials/WidgetZone.DetailsButtons" model="Model"/></div></div></div>@@ -52,9 +54,9 @@</div></form><admin-delete-confirmation button-id="page-delete"/>-@if (Model.ShowCopyButton)+@if (area == "Store" && Model.ShowCopyButton){- <form id="page-copy-form" asp-area="@Constants.AreaStore" asp-controller="Page" asp-action="Copy" method="post">+ <form id="page-copy-form" asp-area="@area" asp-controller="Page" asp-action="Copy" method="post"><input type="hidden" name="id" value="@Model.Id"/></form>}diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Page/Partials/CreateOrUpdate.TabInfo.cshtmlsimilarity index 89%rename from src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/CreateOrUpdate.TabInfo.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Page/Partials/CreateOrUpdate.TabInfo.cshtmlindex a090bfe7d..9109275f6 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/CreateOrUpdate.TabInfo.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Page/Partials/CreateOrUpdate.TabInfo.cshtml@@ -1,5 +1,9 @@@using Microsoft.AspNetCore.Mvc.Razor+@using Grand.Web.AdminShared.Models.Pages@model PageModel+@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();+}<script>$(document).ready(function() {@@ -15,6 +19,7 @@ function togglePassword() {}}</script>+<partial name="Partials/WidgetZone.Info.Top" model="Model"/>@{Func<int, HelperResult>@@ -150,6 +155,23 @@ function togglePassword() {<span asp-validation-for="DisplayOrder"></span></div></div>+ @if (area == "Admin")+ {+ <div class="form-group">+ <admin-label asp-for="CustomerGroups"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="CustomerGroups"/>+ <span asp-validation-for="CustomerGroups"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="Stores"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="Stores"/>+ <span asp-validation-for="Stores"></span>+ </div>+ </div>+ }<div class="form-group"><admin-label asp-for="AccessibleWhenStoreClosed"/><div class="col-md-9 col-sm-9">@@ -191,3 +213,4 @@ function togglePassword() {</div></div></div>+<partial name="Partials/WidgetZone.Info.Bottom" model="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/CreateOrUpdate.TabSeo.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Page/Partials/CreateOrUpdate.TabSeo.cshtmlsimilarity index 95%rename from src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/CreateOrUpdate.TabSeo.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Page/Partials/CreateOrUpdate.TabSeo.cshtmlindex 0c7e64b27..2b5d84e6d 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/CreateOrUpdate.TabSeo.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Page/Partials/CreateOrUpdate.TabSeo.cshtml@@ -1,6 +1,9 @@@using Microsoft.AspNetCore.Mvc.Razor+@using Grand.Web.AdminShared.Models.Pages@model PageModel+<partial name="Partials/WidgetZone.Seo.Top" model="Model"/>+@{Func<int, HelperResult>template = @<div class="form-body">@@ -69,4 +72,6 @@</div></div></localized-editor>+</div>+<partial name="Partials/WidgetZone.Seo.Bottom" model="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Page/Partials/CreateOrUpdate.cshtmlsimilarity index 57%rename from src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/CreateOrUpdate.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Page/Partials/CreateOrUpdate.cshtmlindex 8ceb8a57e..9b042404f 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/CreateOrUpdate.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Page/Partials/CreateOrUpdate.cshtml@@ -1,5 +1,8 @@+@using Grand.Web.AdminShared.Models.Pages@model PageModel-+@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();+}<div asp-validation-summary="All"></div><input asp-for="Id" type="hidden"/><admin-tabstrip name="page-edit">@@ -18,5 +21,16 @@</div></content></tabstrip-item>+ @if (area == "Admin")+ {+ <tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="2">+ <content>+ <div>+ <partial name="Partials/UserFields" model="Model"/>+ </div>+ </content>+ </tabstrip-item>+ }+ <partial name="Partials/WidgetZone.Tabs" model="Model"/></items></admin-tabstrip>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Page/List.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Page/List.cshtmlindex 1e9f4124c..9e982f140 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Page/List.cshtml+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Page/List.cshtml@@ -18,6 +18,7 @@<a href="@Url.Action("Create", new { area = Constants.AreaStore })" class="btn green"><i class="fa fa-plus"></i><span class="d-none d-sm-inline"> @Loc["Admin.Common.AddNew"] </span></a>+ <partial name="Partials/WidgetZone.ListButtons"/></div></div><div class="x_content">diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.DetailsButtons.cshtmlnew file mode 100644index 000000000..495a78a36--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.DetailsButtons.cshtml@@ -0,0 +1,2 @@+@model PageModel+<vc:store-widget widget-zone="store_page_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.DetailsButtonsCreate.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.DetailsButtonsCreate.cshtmlnew file mode 100644index 000000000..3e6aca628--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.DetailsButtonsCreate.cshtml@@ -0,0 +1,2 @@+@model dynamic+<vc:store-widget widget-zone="store_page_details_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.Info.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.Info.Bottom.cshtmlnew file mode 100644index 000000000..1931c6352--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.Info.Bottom.cshtml@@ -0,0 +1,2 @@+@model PageModel+<vc:store-widget widget-zone="store_page_details_info_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.Info.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.Info.Top.cshtmlnew file mode 100644index 000000000..bd542a9b2--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.Info.Top.cshtml@@ -0,0 +1,2 @@+@model PageModel+<vc:store-widget widget-zone="store_page_details_info_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.ListButtons.cshtmlnew file mode 100644index 000000000..ebae99d4a--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.ListButtons.cshtml@@ -0,0 +1 @@+<vc:store-widget widget-zone="store_page_list_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.Seo.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.Seo.Bottom.cshtmlnew file mode 100644index 000000000..5d97d718d--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.Seo.Bottom.cshtml@@ -0,0 +1,2 @@+@model PageModel+<vc:store-widget widget-zone="store_page_details_seo_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.Seo.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.Seo.Top.cshtmlnew file mode 100644index 000000000..8aa2822fe--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.Seo.Top.cshtml@@ -0,0 +1,2 @@+@model PageModel+<vc:store-widget widget-zone="store_page_details_seo_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.Tabs.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.Tabs.cshtmlnew file mode 100644index 000000000..a3bc77a3b--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Page/Partials/WidgetZone.Tabs.cshtml@@ -0,0 +1,2 @@+@model PageModel+<vc:store-widget widget-zone="store_page_details_tabs" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Controllers/PageController.cs b/src/Web/Grand.Web.Store/Controllers/PageController.csindex 2bd66d41f..e34390cb8 100644--- a/src/Web/Grand.Web.Store/Controllers/PageController.cs+++ b/src/Web/Grand.Web.Store/Controllers/PageController.cs@@ -2,76 +2,61 @@ using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Cms;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Domain.Pages;using Grand.Domain.Permissions;-using Grand.Infrastructure;-using Grand.Web.AdminShared.Extensions;+using Grand.Web.AdminShared.Controllers;using Grand.Web.AdminShared.Extensions.Mapping;using Grand.Web.AdminShared.Interfaces;using Grand.Web.AdminShared.Models.Pages;using Grand.Web.Common.DataSource;using Grand.Web.Common.Filters;using Grand.Web.Common.Security.Authorization;+using Grand.Web.Store.Extensions;using Microsoft.AspNetCore.Mvc;namespace Grand.Web.Store.Controllers;-[PermissionAuthorize(PermissionSystemName.Pages)]-public class PageController : BaseStoreController+// Reduced to a thin subclass of BasePageController (ARCH-001 Page consolidation). All shared+// behavior lives in the base; this class supplies Store's DI wiring, the EditWarningCheck hook, and+// three genuinely Store-only actions (Copy, StorePagesList, GlobalPagesList) that have no Admin+// equivalent and are not shared - Admin is already global, "copy into my store" and the two-tab+// list split are Store-specific UI/workflow, not security-scope differences. Same pattern as+// BlogController's kept Preview action.+[AutoValidateAntiforgeryToken]+[Area(Constants.AreaStore)]+[AuthorizeStore]+[AuthorizeMenu]+public class PageController(+ IPageViewModelService pageViewModelService,+ IPageService pageService,+ ILanguageService languageService,+ ITranslationService translationService,+ IDateTimeService dateTimeService,+ IAdminDataScope<Page> scope)+ : BasePageController(pageViewModelService, pageService, languageService, translationService,+ dateTimeService, scope){- #region Constructors-- public PageController(- IPageViewModelService pageViewModelService,- IPageService pageService,- ILanguageService languageService,- ITranslationService translationService,- IContextAccessor contextAccessor,- IDateTimeService dateTimeService)- {- _pageViewModelService = pageViewModelService;- _pageService = pageService;- _languageService = languageService;- _translationService = translationService;- _contextAccessor = contextAccessor;- _dateTimeService = dateTimeService;- }-- #endregion-- #region Fields-- private readonly IPageViewModelService _pageViewModelService;- private readonly IPageService _pageService;- private readonly ILanguageService _languageService;- private readonly ITranslationService _translationService;- private readonly IContextAccessor _contextAccessor;- private readonly IDateTimeService _dateTimeService;-- #endregion-- #region List-- public IActionResult Index()+ // Re-derived from the original Store PageController.Edit(GET) - the condition is unusual (warns+ // when NOT limited to stores at all, or when limited AND the staff member's store is one of+ // several) and easy to get backwards. Third occurrence of this exact idiom in ARCH-001+ // (Category, Blog, now Page) - treat as proven.+ protected override void EditWarningCheck(Page page){- return RedirectToAction("List");- }-- public IActionResult List()- {- return View();+ if (!page.LimitedToStores ||+ (page.Stores.Contains(Scope.DefaultStoreId) &&+ page.Stores.Count > 1))+ Warning(TranslationService.GetResource("Admin.Content.Pages.Permissions"));}[PermissionAuthorizeAction(PermissionActionName.List)][HttpPost]public async Task<IActionResult> StorePagesList(DataSourceRequest command, PageListModel model){- var storeId = _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;- var pages = await _pageService.GetAllPages(storeId, true);+ var pages = await pageService.GetAllPages(Scope.DefaultStoreId, true);- // Store-specific: exclusively assigned to this one storevar pageModels = pages.Where(x => x.LimitedToStores && x.Stores.Count == 1)- .Select(x => x.ToModel(_dateTimeService))+ .Select(x => x.ToModel(dateTimeService)).ToList();if (!string.IsNullOrEmpty(model.Name))@@ -90,13 +75,11 @@ public class PageController : BaseStoreController[HttpPost]public async Task<IActionResult> GlobalPagesList(DataSourceRequest command, PageListModel model){- var storeId = _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;- var pages = await _pageService.GetAllPages(storeId, true);+ var pages = await pageService.GetAllPages(Scope.DefaultStoreId, true);- // Global: no store restriction, or shared across multiple storesvar pageModels = pages.Where(x => !x.LimitedToStores || x.Stores.Count > 1)- .Select(x => x.ToModel(_dateTimeService))+ .Select(x => x.ToModel(dateTimeService)).ToList();if (!string.IsNullOrEmpty(model.Name))@@ -111,158 +94,36 @@ public class PageController : BaseStoreControllerreturn Json(new DataSourceResult { Data = pagedData, Total = total });}- #endregion-- #region Create / Edit / Delete-- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create()- {- var model = new PageModel {- DisplayOrder = 1,- Published = true- };- await _pageViewModelService.PrepareLayoutsModel(model);- await AddLocales(_languageService, model.Locales);- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- public async Task<IActionResult> Create(PageModel model, bool continueEditing)- {- if (ModelState.IsValid)- {- model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId];- var page = await _pageViewModelService.InsertPageModel(model);- Success(_translationService.GetResource("Admin.Content.Pages.Added"));- return continueEditing ? RedirectToAction("Edit", new { id = page.Id }) : RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- await _pageViewModelService.PrepareLayoutsModel(model);- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> Edit(string id)- {- var page = await _pageService.GetPageById(id);- if (page == null)- return RedirectToAction("List");-- if (!page.LimitedToStores || (page.Stores.Contains(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId) &&- page.Stores.Count > 1))- {- Warning(_translationService.GetResource("Admin.Content.Pages.Permissions"));- }- else- {- if (!page.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))- return RedirectToAction("List");- }-- var model = page.ToModel(_dateTimeService);- model.ShowCopyButton = !page.LimitedToStores || page.Stores.Count > 1;- model.Url = Url.RouteUrl("Page", new { SeName = page.GetSeName(_contextAccessor.WorkContext.WorkingLanguage.Id) }, Request.Scheme);- await _pageViewModelService.PrepareLayoutsModel(model);- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Title = page.GetTranslation(x => x.Title, languageId, false);- locale.Body = page.GetTranslation(x => x.Body, languageId, false);- locale.MetaKeywords = page.GetTranslation(x => x.MetaKeywords, languageId, false);- locale.MetaDescription = page.GetTranslation(x => x.MetaDescription, languageId, false);- locale.MetaTitle = page.GetTranslation(x => x.MetaTitle, languageId, false);- locale.SeName = page.GetSeName(languageId, false);- });- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- public async Task<IActionResult> Edit(PageModel model, bool continueEditing)- {- var page = await _pageService.GetPageById(model.Id);- if (page == null)- return RedirectToAction("List");-- if (!page.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))- return RedirectToAction("Edit", new { id = page.Id });-- if (ModelState.IsValid)- {- model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId];- model.CustomerGroups = page.CustomerGroups.ToArray();- page = await _pageViewModelService.UpdatePageModel(page, model);- Success(_translationService.GetResource("Admin.Content.Pages.Updated"));-- if (continueEditing)- {- await SaveSelectedTabIndex();- return RedirectToAction("Edit", new { id = page.Id });- }-- return RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- model.Url = Url.RouteUrl("Page", new { SeName = page.GetSeName(_contextAccessor.WorkContext.WorkingLanguage.Id) }, "http");- await _pageViewModelService.PrepareLayoutsModel(model);- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Delete)]- [HttpPost]- public async Task<IActionResult> Delete(string id)- {- var page = await _pageService.GetPageById(id);- if (page == null)- return RedirectToAction("List");-- if (!page.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))- return RedirectToAction("List");-- await _pageViewModelService.DeletePage(page);- Success(_translationService.GetResource("Admin.Content.Pages.Deleted"));- return RedirectToAction("List");- }-[PermissionAuthorizeAction(PermissionActionName.Edit)][HttpPost]public async Task<IActionResult> Copy(string id){- var storeId = _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;- var page = await _pageService.GetPageById(id);- if (page == null)- return RedirectToAction("List");+ var storeId = Scope.DefaultStoreId;+ var page = await pageService.GetPageById(id);+ if (page == null) return RedirectToAction("List");- // A page is copyable only while it is still readable here and not yet owned by this store,- // so AccessToEntityByStore - which demands sole ownership - cannot be the guard.+ // A page is copyable only while it is still readable here and not yet owned by this store, so+ // HasAccess - which demands sole ownership - cannot be the guard.if (page.LimitedToStores && !page.Stores.Contains(storeId))return RedirectToAction("List");- // Only allow copy for multistore or store-unrestricted pages+ // Only allow copy for multistore or store-unrestricted pages.if (page.LimitedToStores && page.Stores.Count <= 1)return RedirectToAction("Edit", new { id });- // Check if a page with the same SystemName already exists for the current store- var storePages = await _pageService.GetAllPages(storeId, true);+ var storePages = await pageService.GetAllPages(storeId, true);if (storePages.Any(p => p.Id != page.Id &&- p.SystemName.Equals(page.SystemName, StringComparison.OrdinalIgnoreCase)))+ p.SystemName.Equals(page.SystemName, StringComparison.OrdinalIgnoreCase))){- Error(_translationService.GetResource("Admin.Content.Pages.Copy.DuplicateSystemName"));+ Error(translationService.GetResource("Admin.Content.Pages.Copy.DuplicateSystemName"));return RedirectToAction("Edit", new { id });}- // Build copy model from original page- var model = page.ToModel(_dateTimeService);+ var model = page.ToModel(dateTimeService);model.Id = "";model.Stores = [storeId];- // Preserve localized content- await AddLocales(_languageService, model.Locales, (locale, languageId) =>+ await AddLocales(languageService, model.Locales, (locale, languageId) =>{locale.Title = page.GetTranslation(x => x.Title, languageId, false);locale.Body = page.GetTranslation(x => x.Body, languageId, false);@@ -272,10 +133,8 @@ public class PageController : BaseStoreControllerlocale.SeName = page.GetSeName(languageId, false);});- var newPage = await _pageViewModelService.InsertPageModel(model);- Success(_translationService.GetResource("Admin.Content.Pages.Added"));+ var newPage = await pageViewModelService.InsertPageModel(model);+ Success(translationService.GetResource("Admin.Content.Pages.Added"));return RedirectToAction("Edit", new { id = newPage.Id });}-- #endregion}