Merge pull request #148 from EasyAbp/improve-get-product-list-input

Add `ShowUnpublished` property in GetProductListInput

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/GetProductListInput.cs

@@ -13,5 +13,7 @@ namespace EasyAbp.EShop.Products.Products.Dtos
         public Guid? CategoryId { get; set; }
         
         public bool ShowHidden { get; set; }
+        
+        public bool ShowUnpublished { get; set; }
     }
 }

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/NotAllowedToGetProductListWithShowHiddenException.cs

@@ -1,12 +0,0 @@
-using System;
-using Volo.Abp;
-
-namespace EasyAbp.EShop.Products.Products
-{
-    public class NotAllowedToGetProductListWithShowHiddenException : BusinessException
-    {
-        public NotAllowedToGetProductListWithShowHiddenException() : base(ProductsErrorCodes.NotAllowedToGetProductListWithShowHidden)
-        {
-        }
-    }
-}

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductCategories/ProductCategoryAppService.cs

@@ -11,7 +11,7 @@ namespace EasyAbp.EShop.Products.ProductCategories
     public class ProductCategoryAppService : ReadOnlyAppService<ProductCategory, ProductCategoryDto, Guid, GetProductCategoryListDto>,
         IProductCategoryAppService
     {
-        protected override string GetListPolicyName { get; set; } = ProductsPermissions.Products.Default;
+        protected override string GetListPolicyName { get; set; } = ProductsPermissions.Products.Manage;
         
         private readonly IProductCategoryRepository _repository;
 

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductDetailHistories/ProductDetailHistoryAppService.cs

@@ -11,7 +11,7 @@ namespace EasyAbp.EShop.Products.ProductDetailHistories
     public class ProductDetailHistoryAppService : ReadOnlyAppService<ProductDetailHistory, ProductDetailHistoryDto, Guid, GetProductDetailHistoryListDto>,
         IProductDetailHistoryAppService
     {
-        protected override string GetListPolicyName { get; set; } = ProductsPermissions.Products.Default;
+        protected override string GetListPolicyName { get; set; } = ProductsPermissions.Products.Manage;
         
         private readonly IProductDetailHistoryRepository _repository;
 

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductDetails/ProductDetailAppService.cs

@@ -17,7 +17,7 @@ namespace EasyAbp.EShop.Products.ProductDetails
         protected override string DeletePolicyName { get; set; } = ProductsPermissions.Products.Delete;
         protected override string UpdatePolicyName { get; set; } = ProductsPermissions.Products.Update;
         protected override string GetPolicyName { get; set; } = null;
-        protected override string GetListPolicyName { get; set; } = ProductsPermissions.Products.Default;
+        protected override string GetListPolicyName { get; set; } = ProductsPermissions.Products.Manage;
 
         private readonly IProductDetailRepository _repository;
 

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductHistories/ProductHistoryAppService.cs

@@ -11,7 +11,7 @@ namespace EasyAbp.EShop.Products.ProductHistories
     public class ProductHistoryAppService : ReadOnlyAppService<ProductHistory, ProductHistoryDto, Guid, GetProductHistoryListDto>,
         IProductHistoryAppService
     {
-        protected override string GetListPolicyName { get; set; } = ProductsPermissions.Products.Default;
+        protected override string GetListPolicyName { get; set; } = ProductsPermissions.Products.Manage;
 
         private readonly IProductHistoryRepository _repository;
 

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs

@@ -1,6 +1,5 @@
 using EasyAbp.EShop.Products.Permissions;
 using EasyAbp.EShop.Products.Products.Dtos;
-using EasyAbp.EShop.Stores.Authorization;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -58,7 +57,8 @@ namespace EasyAbp.EShop.Products.Products
 
             return query
                 .Where(x => x.StoreId == input.StoreId)
-                .WhereIf(!input.ShowHidden, x => !x.IsHidden);
+                .WhereIf(!input.ShowHidden, x => !x.IsHidden)
+                .WhereIf(!input.ShowUnpublished, x => x.IsPublished);
         }
 
         protected override Product MapToEntity(CreateUpdateProductDto createInput)
@@ -257,23 +257,14 @@ namespace EasyAbp.EShop.Products.Products
         {
             await CheckGetListPolicyAsync();
 
-            var isCurrentUserStoreAdmin =
-                await AuthorizationService.IsMultiStoreGrantedAsync(input.StoreId,
-                    ProductsPermissions.Products.Default, ProductsPermissions.Products.CrossStore);
-
-            if (input.ShowHidden && !isCurrentUserStoreAdmin)
+            if (input.ShowHidden || input.ShowUnpublished)
             {
-                throw new NotAllowedToGetProductListWithShowHiddenException();
+                await CheckMultiStorePolicyAsync(input.StoreId, ProductsPermissions.Products.Manage);
             }
 
             // Todo: Products cache.
             var query = await CreateFilteredQueryAsync(input);
 
-            if (!isCurrentUserStoreAdmin)
-            {
-                query = query.Where(x => x.IsPublished);
-            }
-
             var totalCount = await AsyncExecuter.CountAsync(query);
 
             query = ApplySorting(query, input);

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductViewAppService.cs

@@ -2,9 +2,11 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using EasyAbp.EShop.Products.Permissions;
 using EasyAbp.EShop.Products.Products.CacheItems;
 using EasyAbp.EShop.Products.Products.Dtos;
 using EasyAbp.EShop.Products.Settings;
+using EasyAbp.EShop.Stores.Stores;
 using Microsoft.Extensions.Caching.Distributed;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
@@ -13,7 +15,7 @@ using Volo.Abp.Uow;
 
 namespace EasyAbp.EShop.Products.Products
 {
-    public class ProductViewAppService : ReadOnlyAppService<ProductView, ProductViewDto, Guid, GetProductListInput>,
+    public class ProductViewAppService : MultiStoreReadOnlyAppService<ProductView, ProductViewDto, Guid, GetProductListInput>,
         IProductViewAppService
     {
         protected override string GetPolicyName { get; set; } = null;
@@ -47,12 +49,18 @@ namespace EasyAbp.EShop.Products.Products
 
             return query
                 .Where(x => x.StoreId == input.StoreId)
-                .WhereIf(!input.ShowHidden, x => !x.IsHidden);
+                .WhereIf(!input.ShowHidden, x => !x.IsHidden)
+                .WhereIf(!input.ShowUnpublished, x => x.IsPublished);
         }
 
         public override async Task<PagedResultDto<ProductViewDto>> GetListAsync(GetProductListInput input)
         {
             await CheckGetListPolicyAsync();
+            
+            if (input.ShowHidden || input.ShowUnpublished)
+            {
+                await CheckMultiStorePolicyAsync(input.StoreId, ProductsPermissions.Products.Manage);
+            }
 
             if (await _cache.GetAsync(await GetCacheKeyAsync(input.StoreId), true) == null)
             {

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/cs.json

@@ -88,7 +88,6 @@
     "EasyAbp.EShop.Products:ProductSkuCodeDuplicated": "Sku code {code} is duplicate for the product {productId}",
     "EasyAbp.EShop.Products:ProductSkuDuplicated": "Sku {serializedAttributeOptionIds} is duplicate for the product {productId}",
     "EasyAbp.EShop.Products:NotAllowedToGetCategoryListWithShowHidden": "You have no permission to get category list with hidden categories.",
-    "EasyAbp.EShop.Products:NotAllowedToGetProductListWithShowHidden": "You have no permission to get product list with hidden products.",
     "EasyAbp.EShop.Products:ProductAttributeOptionsDeletionFailed": "Should ensure there are no SKUs using the attribute option which you want to delete.",
     "EasyAbp.EShop.Products:ProductAttributesModificationFailed": "Should ensure SKUs are empty if you want to modify attributes of a product.",
     "EasyAbp.EShop.Products:StaticProductCannotBeModified": "Cannot modify the static product: {productId}",

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/en.json

@@ -89,7 +89,6 @@
     "EasyAbp.EShop.Products:ProductSkuCodeDuplicated": "Sku code {code} is duplicate for the product {productId}",
     "EasyAbp.EShop.Products:ProductSkuDuplicated": "Sku {serializedAttributeOptionIds} is duplicate for the product {productId}",
     "EasyAbp.EShop.Products:NotAllowedToGetCategoryListWithShowHidden": "You have no permission to get category list with hidden categories.",
-    "EasyAbp.EShop.Products:NotAllowedToGetProductListWithShowHidden": "You have no permission to get product list with hidden products.",
     "EasyAbp.EShop.Products:ProductAttributeOptionsDeletionFailed": "Should ensure there are no SKUs using the attribute option which you want to delete.",
     "EasyAbp.EShop.Products:ProductAttributesModificationFailed": "Should ensure SKUs are empty if you want to modify attributes of a product.",
     "EasyAbp.EShop.Products:StaticProductCannotBeModified": "Cannot modify the static product: {productId}",

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/pl.json

@@ -88,7 +88,6 @@
     "EasyAbp.EShop.Products:ProductSkuCodeDuplicated": "Sku code {code} is duplicate for the product {productId}",
     "EasyAbp.EShop.Products:ProductSkuDuplicated": "Sku {serializedAttributeOptionIds} is duplicate for the product {productId}",
     "EasyAbp.EShop.Products:NotAllowedToGetCategoryListWithShowHidden": "You have no permission to get category list with hidden categories.",
-    "EasyAbp.EShop.Products:NotAllowedToGetProductListWithShowHidden": "You have no permission to get product list with hidden products.",
     "EasyAbp.EShop.Products:ProductAttributeOptionsDeletionFailed": "Should ensure there are no SKUs using the attribute option which you want to delete.",
     "EasyAbp.EShop.Products:ProductAttributesModificationFailed": "Should ensure SKUs are empty if you want to modify attributes of a product.",
     "EasyAbp.EShop.Products:StaticProductCannotBeModified": "Cannot modify the static product: {productId}",

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/pt-BR.json

@@ -88,7 +88,6 @@
     "EasyAbp.EShop.Products:ProductSkuCodeDuplicated": "Sku code {code} is duplicate for the product {productId}",
     "EasyAbp.EShop.Products:ProductSkuDuplicated": "Sku {serializedAttributeOptionIds} is duplicate for the product {productId}",
     "EasyAbp.EShop.Products:NotAllowedToGetCategoryListWithShowHidden": "You have no permission to get category list with hidden categories.",
-    "EasyAbp.EShop.Products:NotAllowedToGetProductListWithShowHidden": "You have no permission to get product list with hidden products.",
     "EasyAbp.EShop.Products:ProductAttributeOptionsDeletionFailed": "Should ensure there are no SKUs using the attribute option which you want to delete.",
     "EasyAbp.EShop.Products:ProductAttributesModificationFailed": "Should ensure SKUs are empty if you want to modify attributes of a product.",
     "EasyAbp.EShop.Products:StaticProductCannotBeModified": "Cannot modify the static product: {productId}",

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/sl.json

@@ -89,7 +89,6 @@
     "EasyAbp.EShop.Products:ProductSkuCodeDuplicated": "Sku code {code} is duplicate for the product {productId}",
     "EasyAbp.EShop.Products:ProductSkuDuplicated": "Sku {serializedAttributeOptionIds} is duplicate for the product {productId}",
     "EasyAbp.EShop.Products:NotAllowedToGetCategoryListWithShowHidden": "You have no permission to get category list with hidden categories.",
-    "EasyAbp.EShop.Products:NotAllowedToGetProductListWithShowHidden": "You have no permission to get product list with hidden products.",
     "EasyAbp.EShop.Products:ProductAttributeOptionsDeletionFailed": "Should ensure there are no SKUs using the attribute option which you want to delete.",
     "EasyAbp.EShop.Products:ProductAttributesModificationFailed": "Should ensure SKUs are empty if you want to modify attributes of a product.",
     "EasyAbp.EShop.Products:StaticProductCannotBeModified": "Cannot modify the static product: {productId}",

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/tr.json

@@ -89,7 +89,6 @@
     "EasyAbp.EShop.Products:ProductSkuCodeDuplicated": "Sku code {code} is duplicate for the product {productId}",
     "EasyAbp.EShop.Products:ProductSkuDuplicated": "Sku {serializedAttributeOptionIds} is duplicate for the product {productId}",
     "EasyAbp.EShop.Products:NotAllowedToGetCategoryListWithShowHidden": "You have no permission to get category list with hidden categories.",
-    "EasyAbp.EShop.Products:NotAllowedToGetProductListWithShowHidden": "You have no permission to get product list with hidden products.",
     "EasyAbp.EShop.Products:ProductAttributeOptionsDeletionFailed": "Should ensure there are no SKUs using the attribute option which you want to delete.",
     "EasyAbp.EShop.Products:ProductAttributesModificationFailed": "Should ensure SKUs are empty if you want to modify attributes of a product.",
     "EasyAbp.EShop.Products:StaticProductCannotBeModified": "Cannot modify the static product: {productId}",

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/vi.json

@@ -88,7 +88,6 @@
     "EasyAbp.EShop.Products:ProductSkuCodeDuplicated": "Sku code {code} is duplicate for the product {productId}",
     "EasyAbp.EShop.Products:ProductSkuDuplicated": "Sku {serializedAttributeOptionIds} is duplicate for the product {productId}",
     "EasyAbp.EShop.Products:NotAllowedToGetCategoryListWithShowHidden": "You have no permission to get category list with hidden categories.",
-    "EasyAbp.EShop.Products:NotAllowedToGetProductListWithShowHidden": "You have no permission to get product list with hidden products.",
     "EasyAbp.EShop.Products:ProductAttributeOptionsDeletionFailed": "Should ensure there are no SKUs using the attribute option which you want to delete.",
     "EasyAbp.EShop.Products:ProductAttributesModificationFailed": "Should ensure SKUs are empty if you want to modify attributes of a product.",
     "EasyAbp.EShop.Products:StaticProductCannotBeModified": "Cannot modify the static product: {productId}",

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/zh-Hans.json

@@ -86,7 +86,6 @@
     "EasyAbp.EShop.Products:ProductSkuCodeDuplicated": "商品{productId}的Sku代码{code}重复",
     "EasyAbp.EShop.Products:ProductSkuDuplicated": "商品{productId}的Sku{serializedAttributeOptionIds}重复",
     "EasyAbp.EShop.Products:NotAllowedToGetCategoryListWithShowHidden": "您没有权限获取带有隐藏类别的类别列表",
-    "EasyAbp.EShop.Products:NotAllowedToGetProductListWithShowHidden": "您没有权限获取包含隐藏产品的产品列表",
     "EasyAbp.EShop.Products:ProductAttributeOptionsDeletionFailed": "请确保没有使用您想要删除的属性选项的sku",
     "EasyAbp.EShop.Products:ProductAttributesModificationFailed": "请先确保Sku为空再修改商品的属性",
     "EasyAbp.EShop.Products:StaticProductCannotBeModified": "不能修改静态商品{productId}",

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/Localization/Products/zh-Hant.json

@@ -86,7 +86,6 @@
     "EasyAbp.EShop.Products:ProductSkuCodeDuplicated": "商品{productId}的Sku代碼{code}重復",
     "EasyAbp.EShop.Products:ProductSkuDuplicated": "商品{productId}的Sku{serializedAttributeOptionIds}重復",
     "EasyAbp.EShop.Products:NotAllowedToGetCategoryListWithShowHidden": "您沒有權限獲取帶有隱藏類別的類別列表",
-    "EasyAbp.EShop.Products:NotAllowedToGetProductListWithShowHidden": "您沒有權限獲取包含隱藏產品的產品列表",
     "EasyAbp.EShop.Products:ProductAttributeOptionsDeletionFailed": "請確保沒有使用您想要刪除的屬性選項的sku",
     "EasyAbp.EShop.Products:ProductAttributesModificationFailed": "請先確保Sku為空再修改商品的屬性",
     "EasyAbp.EShop.Products:StaticProductCannotBeModified": "不能修改靜態商品{productId}",

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain.Shared/EasyAbp/EShop/Products/ProductsErrorCodes.cs

@@ -9,7 +9,6 @@
         public const string ProductSkuCodeDuplicated = "EasyAbp.EShop.Products:ProductSkuCodeDuplicated";
         public const string ProductSkuDuplicated = "EasyAbp.EShop.Products:ProductSkuDuplicated";
         public const string NotAllowedToGetCategoryListWithShowHidden = "EasyAbp.EShop.Products:NotAllowedToGetCategoryListWithShowHidden";
-        public const string NotAllowedToGetProductListWithShowHidden = "EasyAbp.EShop.Products:NotAllowedToGetProductListWithShowHidden";
         public const string ProductAttributeOptionsDeletionFailed = "EasyAbp.EShop.Products:ProductAttributeOptionsDeletionFailed";
         public const string ProductAttributesModificationFailed = "EasyAbp.EShop.Products:ProductAttributesModificationFailed";
         public const string StaticProductCannotBeModified = "EasyAbp.EShop.Products:StaticProductCannotBeModified";

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/Product/index.js

@@ -15,7 +15,7 @@ $(function () {
         autoWidth: false,
         scrollCollapse: true,
         ajax: abp.libs.datatables.createAjax(viewService.getList, function () {
-            return { storeId: storeId, categoryId: categoryId, showHidden: true }
+            return { storeId: storeId, categoryId: categoryId, showHidden: true, showUnpublished: true }
         }),
         columnDefs: [
             {