#7515 Next minor changes

Author: exileDev

src/Libraries/Nop.Services/Catalog/IProductAttributeService.cs

@@ -27,14 +27,14 @@ public partial interface IProductAttributeService
     /// <summary>
     /// Gets all product attributes
     /// </summary>
+    /// <param name="name">Filter by name</param>
     /// <param name="pageIndex">Page index</param>
     /// <param name="pageSize">Page size</param>
-    /// <param name="name">Filter by name</param>
     /// <returns>
     /// A task that represents the asynchronous operation
     /// The task result contains the product attributes
     /// </returns>
-    Task<IPagedList<ProductAttribute>> GetAllProductAttributesAsync(int pageIndex = 0, int pageSize = int.MaxValue, string name = "");
+    Task<IPagedList<ProductAttribute>> GetAllProductAttributesAsync(string name = null, int pageIndex = 0, int pageSize = int.MaxValue);
 
     /// <summary>
     /// Gets a product attribute 

src/Libraries/Nop.Services/Catalog/ProductAttributeService.cs

@@ -85,15 +85,14 @@ public virtual async Task DeleteProductAttributesAsync(IList<ProductAttribute> p
     /// <summary>
     /// Gets all product attributes
     /// </summary>
+    /// <param name="name">Filter by name</param>
     /// <param name="pageIndex">Page index</param>
     /// <param name="pageSize">Page size</param>
-    /// <param name="name">Filter by name</param>
     /// <returns>
     /// A task that represents the asynchronous operation
     /// The task result contains the product attributes
     /// </returns>
-    public virtual async Task<IPagedList<ProductAttribute>> GetAllProductAttributesAsync(int pageIndex = 0,
-        int pageSize = int.MaxValue, string name = "")
+    public virtual async Task<IPagedList<ProductAttribute>> GetAllProductAttributesAsync(string name = null, int pageIndex = 0, int pageSize = int.MaxValue)
     {
         var query = _productAttributeRepository.Table;
 

src/Presentation/Nop.Web.Framework/Migrations/UpgradeTo490/LocalizationMigration.cs

@@ -137,7 +137,7 @@ public override void Up()
 
             //#7515
             ["Admin.Catalog.Attributes.ProductAttributes.List.SearchProductAttributeName"] = "Product attribute name",
-            ["Admin.Catalog.Attributes.ProductAttributes.List.SearchProductAttributeName.Hint"] = "A Product attribute name.",
+            ["Admin.Catalog.Attributes.ProductAttributes.List.SearchProductAttributeName.Hint"] = "A product attribute name.",
         }, languageId);
 
         #endregion

src/Presentation/Nop.Web/App_Data/Localization/defaultResources.nopres.xml

@@ -1966,7 +1966,7 @@
     <Value>Product attribute name</Value>
   </LocaleResource>
   <LocaleResource Name="Admin.Catalog.Attributes.ProductAttributes.List.SearchProductAttributeName.Hint">
-    <Value>A Product attribute name.</Value>
+    <Value>A product attribute name.</Value>
   </LocaleResource>
   <LocaleResource Name="Admin.Catalog.Attributes.SpecificationAttributes">
     <Value>Specification attributes</Value>

src/Presentation/Nop.Web/Areas/Admin/Controllers/ProductAttributeController.cs

@@ -25,7 +25,7 @@ public partial class ProductAttributeController : BaseAdminController
     protected readonly IProductAttributeModelFactory _productAttributeModelFactory;
     protected readonly IProductAttributeService _productAttributeService;
 
-    #endregion Fields
+    #endregion
 
     #region Ctor
 

src/Presentation/Nop.Web/Areas/Admin/Factories/ProductAttributeModelFactory.cs

@@ -116,8 +116,10 @@ public virtual async Task<ProductAttributeListModel> PrepareProductAttributeList
         ArgumentNullException.ThrowIfNull(searchModel);
 
         //get product attributes
-        var productAttributes = await _productAttributeService
-            .GetAllProductAttributesAsync(pageIndex: searchModel.Page - 1, pageSize: searchModel.PageSize, name: searchModel.SearchProductAttributeName);
+        var productAttributes = await _productAttributeService.GetAllProductAttributesAsync(
+            name: searchModel.SearchProductAttributeName,
+            pageIndex: searchModel.Page - 1,
+            pageSize: searchModel.PageSize);
 
         //prepare list model
         var model = new ProductAttributeListModel().PrepareToGrid(searchModel, productAttributes, () =>

src/Presentation/Nop.Web/Areas/Admin/Views/ProductAttribute/List.cshtml

@@ -74,38 +74,38 @@
                                 <nop-doc-reference asp-string-resource="@T("Admin.Documentation.Reference.ProductAttributes", Docs.ProductAttributes + Utm.OnAdmin)" asp-add-wrapper="false" />
                             </p>
                             @await Html.PartialAsync("Table", new DataTablesModel
-                       {
-                           Name = "products-grid",
-                           UrlRead = new DataUrl("List", "ProductAttribute", null),
-                           SearchButtonId = "search-productattributes",
-                           Length = Model.PageSize,
-                           LengthMenu = Model.AvailablePageSizes,
-                           Filters = new List<FilterParameter>
                             {
-                            new FilterParameter(nameof(Model.SearchProductAttributeName))
-                            },
-                           ColumnCollection = new List<ColumnProperty>
-                            {
-                            new ColumnProperty(nameof(ProductAttributeModel.Id))
-                            {
-                            IsMasterCheckBox = true,
-                            Render = new RenderCheckBox("checkbox_productattributes"),
-                            ClassName =  NopColumnClassDefaults.CenterAll,
-                            Width = "50"
-                            },
-                            new ColumnProperty(nameof(ProductAttributeModel.Name))
-                            {
-                            Title = T("Admin.Catalog.Attributes.ProductAttributes.Fields.Name").Text
-                            },
-                            new ColumnProperty(nameof(ProductAttributeModel.Id))
-                            {
-                            Title = T("Admin.Common.Edit").Text,
-                            Width = "100",
-                            ClassName =  NopColumnClassDefaults.Button,
-                            Render = new RenderButtonEdit(new DataUrl("~/Admin/ProductAttribute/Edit"))
-                            }
-                            }
-                       })
+                                Name = "products-grid",
+                                UrlRead = new DataUrl("List", "ProductAttribute", null),
+                                SearchButtonId = "search-productattributes",
+                                Length = Model.PageSize,
+                                LengthMenu = Model.AvailablePageSizes,
+                                Filters = new List<FilterParameter>
+                                {
+                                    new FilterParameter(nameof(Model.SearchProductAttributeName))
+                                },
+                                ColumnCollection = new List<ColumnProperty>
+                                {
+                                    new ColumnProperty(nameof(ProductAttributeModel.Id))
+                                    {
+                                       IsMasterCheckBox = true,
+                                       Render = new RenderCheckBox("checkbox_productattributes"),
+                                       ClassName =  NopColumnClassDefaults.CenterAll,
+                                       Width = "50"
+                                    },
+                                    new ColumnProperty(nameof(ProductAttributeModel.Name))
+                                    {
+                                        Title = T("Admin.Catalog.Attributes.ProductAttributes.Fields.Name").Text
+                                    },
+                                    new ColumnProperty(nameof(ProductAttributeModel.Id))
+                                    {
+                                        Title = T("Admin.Common.Edit").Text,
+                                        Width = "100",
+                                        ClassName =  NopColumnClassDefaults.Button,
+                                        Render = new RenderButtonEdit(new DataUrl("~/Admin/ProductAttribute/Edit"))
+                                    }
+                                }
+                            })
 
                             <script>
                                 $(function() {