Skip to content

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.

refactor(arch001): reduce Admin/Store CollectionController to thin BaseCollectionController subclasses

KrzysztofPajak93b78771b0d2
diff --git a/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs b/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs
index cd385b8ce..484b9288f 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs
@@ -1,390 +1,35 @@
-using Grand.Business.Core.Dto;
-using Grand.Business.Core.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Business.Core.Interfaces.Common.Stores;
-using Grand.Business.Core.Interfaces.ExportImport;
using Grand.Domain.Catalog;
-using Grand.Domain.Permissions;
-using Grand.Web.AdminShared.Extensions.Mapping;
+using Grand.Web.Admin.Extensions;
+using Grand.Web.AdminShared.Controllers;
using Grand.Web.AdminShared.Interfaces;
-using Grand.Web.AdminShared.Models.Catalog;
-using Grand.Web.AdminShared.Models.Common;
-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;
-using Microsoft.AspNetCore.Mvc.Rendering;
namespace Grand.Web.Admin.Controllers;
-[PermissionAuthorize(PermissionSystemName.Collections)]
-public class CollectionController : BaseAdminController
-{
- #region Constructors
-
- public CollectionController(
- ICollectionViewModelService collectionViewModelService,
- ICollectionService collectionService,
- IStoreService storeService,
- ILanguageService languageService,
- ITranslationService translationService,
- IPictureViewModelService pictureViewModelService)
- {
- _collectionViewModelService = collectionViewModelService;
- _collectionService = collectionService;
- _storeService = storeService;
- _languageService = languageService;
- _translationService = translationService;
- _pictureViewModelService = pictureViewModelService;
- }
-
- #endregion
-
- #region Fields
-
- private readonly ICollectionViewModelService _collectionViewModelService;
- private readonly ICollectionService _collectionService;
- private readonly IStoreService _storeService;
- private readonly ILanguageService _languageService;
- private readonly ITranslationService _translationService;
- private readonly IPictureViewModelService _pictureViewModelService;
-
- #endregion
-
- #region List
-
- public IActionResult Index()
- {
- return RedirectToAction("List");
- }
-
- public async Task<IActionResult> List()
- {
- var model = new CollectionListModel();
- model.AvailableStores.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" });
- foreach (var s in (await _storeService.GetAllStores()))
- model.AvailableStores.Add(new SelectListItem { Text = s.Shortcut, Value = s.Id });
-
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.List)]
- [HttpPost]
- public async Task<IActionResult> List(DataSourceRequest command, CollectionListModel model)
- {
- var collections = await _collectionService.GetAllCollections(model.SearchCollectionName,
- model.SearchStoreId, command.Page - 1, command.PageSize, true);
- var gridModel = new DataSourceResult {
- Data = collections.Select(x => x.ToModel()),
- Total = collections.TotalCount
- };
-
- return Json(gridModel);
- }
-
- #endregion
-
- #region Create / Edit / Delete
-
- [PermissionAuthorizeAction(PermissionActionName.Create)]
- public async Task<IActionResult> Create([FromServices] CatalogSettings catalogSettings)
- {
- var model = new CollectionModel();
- //locales
- await AddLocales(_languageService, model.Locales);
- //layouts
- await _collectionViewModelService.PrepareLayoutsModel(model);
- //discounts
- await _collectionViewModelService.PrepareDiscountModel(model, null, true);
- //default values
- model.PageSize = catalogSettings.DefaultPageSize;
- model.PageSizeOptions = catalogSettings.DefaultPageSizeOptions;
- model.Published = true;
- model.AllowCustomersToSelectPageSize = true;
- //sort options
- _collectionViewModelService.PrepareSortOptionsModel(model);
-
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
- public async Task<IActionResult> Create(CollectionModel model, bool continueEditing)
- {
- if (ModelState.IsValid)
- {
- var collection = await _collectionViewModelService.InsertCollectionModel(model);
- Success(_translationService.GetResource("Admin.Catalog.Collections.Added"));
- return continueEditing ? RedirectToAction("Edit", new { id = collection.Id }) : RedirectToAction("List");
- }
-
- //If we got this far, something failed, redisplay form
- //layouts
- await _collectionViewModelService.PrepareLayoutsModel(model);
- //discounts
- await _collectionViewModelService.PrepareDiscountModel(model, null, true);
- //sort options
- _collectionViewModelService.PrepareSortOptionsModel(model);
-
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Preview)]
- public async Task<IActionResult> Edit(string id)
- {
- var collection = await _collectionService.GetCollectionById(id);
- if (collection == null)
- //No collection found with the specified id
- return RedirectToAction("List");
-
- var model = collection.ToModel();
- //locales
- await AddLocales(_languageService, model.Locales, (locale, languageId) =>
- {
- locale.Name = collection.GetTranslation(x => x.Name, languageId, false);
- locale.Description = collection.GetTranslation(x => x.Description, languageId, false);
- locale.BottomDescription = collection.GetTranslation(x => x.BottomDescription, languageId, false);
- locale.MetaKeywords = collection.GetTranslation(x => x.MetaKeywords, languageId, false);
- locale.MetaDescription = collection.GetTranslation(x => x.MetaDescription, languageId, false);
- locale.MetaTitle = collection.GetTranslation(x => x.MetaTitle, languageId, false);
- locale.SeName = collection.GetSeName(languageId, false);
- });
- //layouts
- await _collectionViewModelService.PrepareLayoutsModel(model);
- //discounts
- await _collectionViewModelService.PrepareDiscountModel(model, collection, false);
- //sort options
- _collectionViewModelService.PrepareSortOptionsModel(model);
-
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
- public async Task<IActionResult> Edit(CollectionModel model, bool continueEditing)
- {
- var collection = await _collectionService.GetCollectionById(model.Id);
- if (collection == null)
- //No collection found with the specified id
- return RedirectToAction("List");
-
- if (ModelState.IsValid)
- {
- collection = await _collectionViewModelService.UpdateCollectionModel(collection, model);
- Success(_translationService.GetResource("Admin.Catalog.Collections.Updated"));
-
- if (continueEditing)
- {
- //selected tab
- await SaveSelectedTabIndex();
- return RedirectToAction("Edit", new { id = collection.Id });
- }
- return RedirectToAction("List");
- }
-
- //If we got this far, something failed, redisplay form
- //layouts
- await _collectionViewModelService.PrepareLayoutsModel(model);
- //discounts
- await _collectionViewModelService.PrepareDiscountModel(model, collection, true);
- //sort options
- _collectionViewModelService.PrepareSortOptionsModel(model);
-
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Delete)]
- [HttpPost]
- public async Task<IActionResult> Delete(string id)
- {
- var collection = await _collectionService.GetCollectionById(id);
- if (collection == null)
- //No collection found with the specified id
- return RedirectToAction("List");
-
- if (ModelState.IsValid)
- {
- await _collectionViewModelService.DeleteCollection(collection);
-
- Success(_translationService.GetResource("Admin.Catalog.Collections.Deleted"));
- return RedirectToAction("List");
- }
-
- Error(ModelState);
- return RedirectToAction("Edit", new { id = collection.Id });
- }
-
- #endregion
-
- #region Picture
-
- [PermissionAuthorizeAction(PermissionActionName.Preview)]
- public async Task<IActionResult> PicturePopup(string collectionId)
- {
- var collection = await _collectionService.GetCollectionById(collectionId);
- if (collection == null)
- return Content("Collection not exist");
-
- if (string.IsNullOrEmpty(collection.PictureId))
- return Content("Picture not exist");
-
- return View("Partials/PicturePopup",
- await _pictureViewModelService.PreparePictureModel(collection.PictureId, collection.Id));
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- public async Task<IActionResult> PicturePopup(PictureModel model)
- {
- if (ModelState.IsValid)
- {
- var collection = await _collectionService.GetCollectionById(model.ObjectId) ?? throw new ArgumentException("No collection found with the specified id");
-
- if (string.IsNullOrEmpty(collection.PictureId))
- throw new ArgumentException("No picture found with the specified id");
-
- if (collection.PictureId != model.Id)
- throw new ArgumentException("Picture ident doesn't fit with collection");
-
- await _pictureViewModelService.UpdatePicture(model);
-
- return Content("");
- }
-
- Error(ModelState);
-
- return View("Partials/PicturePopup", model);
- }
-
- #endregion
-
- #region Export / Import
-
- [PermissionAuthorizeAction(PermissionActionName.Export)]
- public async Task<IActionResult> ExportXlsx([FromServices] IExportManager<Collection> exportManager)
- {
- try
- {
- var bytes = await exportManager.Export(await _collectionService.GetAllCollections(collectionName: "", storeId: "", showHidden: true));
- return File(bytes, "text/xls", "collections.xlsx");
- }
- catch (Exception exc)
- {
- Error(exc);
- return RedirectToAction("List");
- }
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Import)]
- [HttpPost]
- public async Task<IActionResult> ImportFromXlsx(IFormFile importexcelfile,
- [FromServices] IImportManager<CollectionDto> importManager)
- {
- try
- {
- if (importexcelfile is { Length: > 0 })
- {
- await importManager.Import(importexcelfile.OpenReadStream());
- }
- else
- {
- Error(_translationService.GetResource("Admin.Common.UploadFile"));
- return RedirectToAction("List");
- }
-
- Success(_translationService.GetResource("Admin.Catalog.Collection.Imported"));
- return RedirectToAction("List");
- }
- catch (Exception exc)
- {
- Error(exc);
- return RedirectToAction("List");
- }
- }
-
- #endregion
-
- #region Products
-
- [PermissionAuthorizeAction(PermissionActionName.Preview)]
- [HttpPost]
- public async Task<IActionResult> ProductList(DataSourceRequest command, string collectionId)
- {
- var collection = await _collectionService.GetCollectionById(collectionId);
-
- var (collectionProductModels, totalCount) = await _collectionViewModelService.PrepareCollectionProductModel(collectionId, string.Empty, command.Page, command.PageSize);
-
- var gridModel = new DataSourceResult {
- Data = collectionProductModels.ToList(),
- Total = totalCount
- };
- return Json(gridModel);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- public async Task<IActionResult> ProductUpdate(CollectionModel.CollectionProductModel model)
- {
- if (ModelState.IsValid)
- {
- await _collectionViewModelService.ProductUpdate(model);
- return new JsonResult("");
- }
-
- return ErrorForKendoGridJson(ModelState);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- public async Task<IActionResult> ProductDelete(CollectionModel.CollectionProductModel model)
- {
- if (ModelState.IsValid)
- {
- await _collectionViewModelService.ProductDelete(model.Id, model.ProductId);
- return new JsonResult("");
- }
-
- return ErrorForKendoGridJson(ModelState);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- public async Task<IActionResult> ProductAddPopup(string collectionId)
- {
- var model = await _collectionViewModelService.PrepareAddCollectionProductModel(string.Empty);
- model.CollectionId = collectionId;
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- public async Task<IActionResult> ProductAddPopupList(DataSourceRequest command,
- CollectionModel.AddCollectionProductModel model)
- {
- var products = await _collectionViewModelService.PrepareProductModel(model, command.Page, command.PageSize);
- var gridModel = new DataSourceResult {
- Data = products.products.ToList(),
- Total = products.totalCount
- };
-
- return Json(gridModel);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- public async Task<IActionResult> ProductAddPopup(CollectionModel.AddCollectionProductModel model)
- {
- if (ModelState.IsValid)
- {
- if (model.SelectedProductIds != null) await _collectionViewModelService.InsertCollectionProductModel(model);
- return Content("");
- }
-
- Error(ModelState);
- return View(model);
- }
-
- #endregion
-}
\ No newline at end of file
+// Reduced to a thin subclass of BaseCollectionController (ARCH-001 Collection consolidation). All
+// regions of behavior live in the shared base; this class only supplies Admin's DI wiring plus the
+// attributes that used to arrive transitively via BaseAdminController - BaseCollectionController
+// can't inherit any single host's base controller (it's shared across Admin/Store, each with a
+// different [Area]/[Authorize*] pair), so each subclass restates its own host's attribute set
+// explicitly. Same pattern as CategoryController (see that file).
+[AuthorizeAdmin]
+[AutoValidateAntiforgeryToken]
+[Area(Constants.AreaAdmin)]
+[AuthorizeMenu]
+public class CollectionController(
+ ICollectionViewModelService collectionViewModelService,
+ ICollectionService collectionService,
+ IStoreService storeService,
+ ILanguageService languageService,
+ ITranslationService translationService,
+ IPictureViewModelService pictureViewModelService,
+ IProductService productService,
+ IAdminDataScope<Collection> scope)
+ : BaseCollectionController(collectionViewModelService, collectionService, storeService,
+ languageService, translationService, pictureViewModelService, productService, scope);
diff --git a/src/Web/Grand.Web.Store/Controllers/CollectionController.cs b/src/Web/Grand.Web.Store/Controllers/CollectionController.cs
index 0d5103a37..347fb0f3f 100644
--- a/src/Web/Grand.Web.Store/Controllers/CollectionController.cs
+++ b/src/Web/Grand.Web.Store/Controllers/CollectionController.cs
@@ -1,405 +1,48 @@
-using Grand.Business.Core.Extensions;
using Grand.Business.Core.Interfaces.Catalog.Collections;
using Grand.Business.Core.Interfaces.Catalog.Products;
-using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
using Grand.Domain.Catalog;
-using Grand.Domain.Permissions;
-using Grand.Infrastructure;
-using Grand.Web.AdminShared.Extensions;
-using Grand.Web.AdminShared.Extensions.Mapping;
+using Grand.Web.AdminShared.Controllers;
using Grand.Web.AdminShared.Interfaces;
-using Grand.Web.AdminShared.Models.Catalog;
-using Grand.Web.AdminShared.Models.Common;
-using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
-using Grand.Web.Common.Security.Authorization;
+using Grand.Web.Common.Localization;
+using Grand.Web.Store.Extensions;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Store.Controllers;
-[PermissionAuthorize(PermissionSystemName.Collections)]
-public class CollectionController : BaseStoreController
+// Reduced to a thin subclass of BaseCollectionController (ARCH-001 Collection consolidation). All
+// regions of behavior live in the shared base; this class only supplies Store's DI wiring, the
+// EditWarningCheck hook, and the attributes that used to arrive transitively via
+// BaseStoreController. Same pattern as CategoryController (see that file).
+[AutoValidateAntiforgeryToken]
+[Area(Constants.AreaStore)]
+[AuthorizeStore]
+[AuthorizeMenu]
+public class CollectionController(
+ ICollectionViewModelService collectionViewModelService,
+ ICollectionService collectionService,
+ IStoreService storeService,
+ ILanguageService languageService,
+ ITranslationService translationService,
+ IPictureViewModelService pictureViewModelService,
+ IProductService productService,
+ IAdminDataScope<Collection> scope)
+ : BaseCollectionController(collectionViewModelService, collectionService, storeService,
+ languageService, translationService, pictureViewModelService, productService, scope)
{
- #region Constructors
-
- public CollectionController(
- ICollectionViewModelService collectionViewModelService,
- ICollectionService collectionService,
- IContextAccessor contextAccessor,
- ILanguageService languageService,
- ITranslationService translationService,
- IGroupService groupService,
- IPictureViewModelService pictureViewModelService,
- IProductService productService)
- {
- _collectionViewModelService = collectionViewModelService;
- _collectionService = collectionService;
- _contextAccessor = contextAccessor;
- _languageService = languageService;
- _translationService = translationService;
- _groupService = groupService;
- _pictureViewModelService = pictureViewModelService;
- _productService = productService;
- }
-
- #endregion
-
- #region Fields
-
- private readonly ICollectionViewModelService _collectionViewModelService;
- private readonly ICollectionService _collectionService;
- private readonly IContextAccessor _contextAccessor;
- private readonly ILanguageService _languageService;
- private readonly ITranslationService _translationService;
- private readonly IGroupService _groupService;
- private readonly IPictureViewModelService _pictureViewModelService;
- private readonly IProductService _productService;
-
- #endregion
-
- #region List
-
- public IActionResult Index()
- {
- return RedirectToAction("List");
- }
-
- public IActionResult List()
- {
- var model = new CollectionListModel();
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.List)]
- [HttpPost]
- public async Task<IActionResult> List(DataSourceRequest command, CollectionListModel model)
- {
- model.SearchStoreId = _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;
- var collections = await _collectionService.GetAllCollections(model.SearchCollectionName,
- model.SearchStoreId, command.Page - 1, command.PageSize, true);
- var gridModel = new DataSourceResult {
- Data = collections.Select(x => x.ToModel()),
- Total = collections.TotalCount
- };
-
- return Json(gridModel);
- }
-
- #endregion
-
- #region Create / Edit / Delete
-
- [PermissionAuthorizeAction(PermissionActionName.Create)]
- public async Task<IActionResult> Create([FromServices] CatalogSettings catalogSettings)
- {
- var model = new CollectionModel();
- //locales
- await AddLocales(_languageService, model.Locales);
- //layouts
- await _collectionViewModelService.PrepareLayoutsModel(model);
- //discounts
- await _collectionViewModelService.PrepareDiscountModel(model, null, true);
- //default values
- model.PageSize = catalogSettings.DefaultPageSize;
- model.PageSizeOptions = catalogSettings.DefaultPageSizeOptions;
- model.Published = true;
- model.AllowCustomersToSelectPageSize = true;
- //sort options
- _collectionViewModelService.PrepareSortOptionsModel(model);
-
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
- public async Task<IActionResult> Create(CollectionModel model, bool continueEditing)
- {
- if (ModelState.IsValid)
- {
- model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId];
- var collection = await _collectionViewModelService.InsertCollectionModel(model);
- Success(_translationService.GetResource("Admin.Catalog.Collections.Added"));
- return continueEditing ? RedirectToAction("Edit", new { id = collection.Id }) : RedirectToAction("List");
- }
-
- //If we got this far, something failed, redisplay form
- //layouts
- await _collectionViewModelService.PrepareLayoutsModel(model);
- //discounts
- await _collectionViewModelService.PrepareDiscountModel(model, null, true);
- //sort options
- _collectionViewModelService.PrepareSortOptionsModel(model);
-
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Preview)]
- public async Task<IActionResult> Edit(string id)
- {
- var collection = await _collectionService.GetCollectionById(id);
- if (collection == null)
- //No collection found with the specified id
- return RedirectToAction("List");
-
- if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer))
- {
- if (!collection.LimitedToStores || (collection.LimitedToStores &&
- collection.Stores.Contains(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId) &&
- collection.Stores.Count > 1))
- {
- Warning(_translationService.GetResource("Admin.Catalog.Collections.Permissions"));
- }
- else
- {
- if (!collection.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
- return RedirectToAction("List");
- }
- }
-
- var model = collection.ToModel();
- //locales
- await AddLocales(_languageService, model.Locales, (locale, languageId) =>
- {
- locale.Name = collection.GetTranslation(x => x.Name, languageId, false);
- locale.Description = collection.GetTranslation(x => x.Description, languageId, false);
- locale.BottomDescription = collection.GetTranslation(x => x.BottomDescription, languageId, false);
- locale.MetaKeywords = collection.GetTranslation(x => x.MetaKeywords, languageId, false);
- locale.MetaDescription = collection.GetTranslation(x => x.MetaDescription, languageId, false);
- locale.MetaTitle = collection.GetTranslation(x => x.MetaTitle, languageId, false);
- locale.SeName = collection.GetSeName(languageId, false);
- });
- //layouts
- await _collectionViewModelService.PrepareLayoutsModel(model);
- //discounts
- await _collectionViewModelService.PrepareDiscountModel(model, collection, false);
- //sort options
- _collectionViewModelService.PrepareSortOptionsModel(model);
-
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
- public async Task<IActionResult> Edit(CollectionModel model, bool continueEditing)
- {
- var collection = await _collectionService.GetCollectionById(model.Id);
- if (collection == null)
- //No collection found with the specified id
- return RedirectToAction("List");
-
- if (!collection.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
- return RedirectToAction("Edit", new { id = collection.Id });
-
- if (ModelState.IsValid)
- {
- model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId];
- collection = await _collectionViewModelService.UpdateCollectionModel(collection, model);
- Success(_translationService.GetResource("Admin.Catalog.Collections.Updated"));
-
- if (continueEditing)
- {
- //selected tab
- await SaveSelectedTabIndex();
- return RedirectToAction("Edit", new { id = collection.Id });
- }
- return RedirectToAction("List");
- }
- //If we got this far, something failed, redisplay form
- //layouts
- await _collectionViewModelService.PrepareLayoutsModel(model);
- //discounts
- await _collectionViewModelService.PrepareDiscountModel(model, collection, true);
- //sort options
- _collectionViewModelService.PrepareSortOptionsModel(model);
-
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Delete)]
- [HttpPost]
- public async Task<IActionResult> Delete(string id)
- {
- var collection = await _collectionService.GetCollectionById(id);
- if (collection == null)
- //No collection found with the specified id
- return RedirectToAction("List");
-
- if (!collection.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
- return RedirectToAction("Edit", new { id = collection.Id });
-
- if (ModelState.IsValid)
- {
- await _collectionViewModelService.DeleteCollection(collection);
-
- Success(_translationService.GetResource("Admin.Catalog.Collections.Deleted"));
- return RedirectToAction("List");
- }
-
- Error(ModelState);
- return RedirectToAction("Edit", new { id = collection.Id });
- }
-
- #endregion
-
- #region Picture
-
- [PermissionAuthorizeAction(PermissionActionName.Preview)]
- public async Task<IActionResult> PicturePopup(string collectionId)
- {
- var collection = await _collectionService.GetCollectionById(collectionId);
- if (collection == null)
- return Content("Collection not exist");
-
- if (!collection.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
- return Content("This is not your collection");
-
- if (string.IsNullOrEmpty(collection.PictureId))
- return Content("Picture not exist");
-
- return View("Partials/PicturePopup",
- await _pictureViewModelService.PreparePictureModel(collection.PictureId, collection.Id));
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- public async Task<IActionResult> PicturePopup(PictureModel model)
- {
- if (ModelState.IsValid)
- {
- var collection = await _collectionService.GetCollectionById(model.ObjectId);
- if (collection == null)
- throw new ArgumentException("No collection found with the specified id");
-
- if (!collection.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
- return Content("This is not your collection");
-
- if (string.IsNullOrEmpty(collection.PictureId))
- throw new ArgumentException("No picture found with the specified id");
-
- if (collection.PictureId != model.Id)
- throw new ArgumentException("Picture ident doesn't fit with collection");
-
- await _pictureViewModelService.UpdatePicture(model);
-
- return Content("");
- }
-
- Error(ModelState);
-
- return View("Partials/PicturePopup", model);
- }
-
- #endregion
-
- #region Products
-
- [PermissionAuthorizeAction(PermissionActionName.Preview)]
- [HttpPost]
- public async Task<IActionResult> ProductList(DataSourceRequest command, string collectionId)
- {
- var collection = await _collectionService.GetCollectionById(collectionId);
- if (!collection.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
- return ErrorForKendoGridJson("This is not your collection");
-
- var (collectionProductModels, totalCount) = await _collectionViewModelService.PrepareCollectionProductModel(collectionId, _contextAccessor.StoreContext.CurrentStore.Id, command.Page, command.PageSize);
-
- var gridModel = new DataSourceResult {
- Data = collectionProductModels.ToList(),
- Total = totalCount
- };
- return Json(gridModel);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- public async Task<IActionResult> ProductUpdate(CollectionModel.CollectionProductModel model)
- {
- var product = await _productService.GetProductById(model.ProductId);
- if (product == null || !product.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
- return ErrorForKendoGridJson("This is not your product");
-
- if (ModelState.IsValid)
- {
- await _collectionViewModelService.ProductUpdate(model);
- return new JsonResult("");
- }
-
- return ErrorForKendoGridJson(ModelState);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- public async Task<IActionResult> ProductDelete(CollectionModel.CollectionProductModel model)
- {
- var product = await _productService.GetProductById(model.ProductId);
- if (product == null || !product.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
- return ErrorForKendoGridJson("This is not your product");
-
- if (ModelState.IsValid)
- {
- await _collectionViewModelService.ProductDelete(model.Id, model.ProductId);
- return new JsonResult("");
- }
-
- return ErrorForKendoGridJson(ModelState);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- public async Task<IActionResult> ProductAddPopup(string collectionId)
- {
- var model = await _collectionViewModelService.PrepareAddCollectionProductModel(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
- model.CollectionId = collectionId;
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- public async Task<IActionResult> ProductAddPopupList(DataSourceRequest command,
- CollectionModel.AddCollectionProductModel model)
- {
- model.SearchStoreId = _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;
- var products = await _collectionViewModelService.PrepareProductModel(model, command.Page, command.PageSize);
- var gridModel = new DataSourceResult {
- Data = products.products.ToList(),
- Total = products.totalCount
- };
-
- return Json(gridModel);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- public async Task<IActionResult> ProductAddPopup(CollectionModel.AddCollectionProductModel model)
- {
- var collection = await _collectionService.GetCollectionById(model.CollectionId);
- if (collection == null || !collection.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
- return Content("This is not your collection");
-
- if (ModelState.IsValid)
- {
- //InsertCollectionProductModel mutates each selected product's ProductCollections collection,
- //so every selected id must also belong to the current store.
- if (model.SelectedProductIds != null)
- {
- var validIds = new List<string>();
- foreach (var id in model.SelectedProductIds)
- {
- var selected = await _productService.GetProductById(id);
- if (selected != null && selected.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
- validIds.Add(id);
- }
- model.SelectedProductIds = validIds.ToArray();
- if (validIds.Any()) await _collectionViewModelService.InsertCollectionProductModel(model);
- }
- return Content("");
- }
-
- Error(ModelState);
- return View(model);
- }
-
- #endregion
-}
\ No newline at end of file
+ // Re-derived from the original Store CollectionController.Edit(GET) (pre-cutover) - 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. Scope.DefaultStoreId is
+ // exactly StaffStoreId for Store (StoreAdminDataScope.DefaultStoreId =>
+ // CurrentCustomer.StaffStoreId).
+ protected override void EditWarningCheck(Collection collection)
+ {
+ if (!collection.LimitedToStores ||
+ (collection.LimitedToStores &&
+ collection.Stores.Contains(Scope.DefaultStoreId) &&
+ collection.Stores.Count > 1))
+ Warning(TranslationService.GetResource("Admin.Catalog.Collections.Permissions"));
+ }
+}