Initial Category Filter with SubCategories on CategoryDetail Page without localisation of intermediate breadcrumbs (simplcommerce#865, simplcommerce#546)

Author: fhebel

src/Modules/SimplCommerce.Module.Catalog/Areas/Catalog/Components/CategoryBreadcrumbViewComponent.cs

@@ -6,16 +6,19 @@
 using SimplCommerce.Infrastructure.Web;
 using SimplCommerce.Module.Catalog.Models;
 using SimplCommerce.Module.Core.Areas.Core.ViewModels;
+using SimplCommerce.Module.Core.Services;
 
 namespace SimplCommerce.Module.Catalog.Areas.Catalog.Components
 {
     public class CategoryBreadcrumbViewComponent : ViewComponent
     {
         private readonly IRepository<Category> _categoryRepository;
+        private readonly IContentLocalizationService _contentLocalizationService;
 
-        public CategoryBreadcrumbViewComponent(IRepository<Category> categoryRepository)
+        public CategoryBreadcrumbViewComponent(IRepository<Category> categoryRepository, IContentLocalizationService contentLocalizationService)
         {
             _categoryRepository = categoryRepository;
+            _contentLocalizationService = contentLocalizationService;
         }
 
         public IViewComponentResult Invoke(long? categoryId, IEnumerable<long> categoryIds)
@@ -44,7 +47,7 @@ private IList<BreadcrumbViewModel> Create(long categoryId)
             {
                 new BreadcrumbViewModel
                 {
-                    Text = category.Name,
+                    Text = _contentLocalizationService.GetLocalizedProperty(category, nameof(category.Name), category.Name),
                     Url = category.Slug
                 }
             };
@@ -53,7 +56,7 @@ private IList<BreadcrumbViewModel> Create(long categoryId)
             {
                 breadcrumbModels.Insert(0, new BreadcrumbViewModel
                 {
-                    Text = parentCategory.Name,
+                    Text = _contentLocalizationService.GetLocalizedProperty(parentCategory, nameof(parentCategory.Name), parentCategory.Name),
                     Url = parentCategory.Slug
                 });
                 parentCategory = parentCategory.Parent;

src/Modules/SimplCommerce.Module.Catalog/Areas/Catalog/Controllers/CategoryController.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
@@ -82,6 +83,12 @@ public IActionResult CategoryDetail(long id, SearchOption searchOption)
                 query = query.Where(x => x.Price <= searchOption.MaxPrice.Value);
             }
 
+            var categories = searchOption.GetCategories();
+            if (categories.Any())
+            {
+                query = query.Where(p => p.Categories.Select(c => c.CategoryId).Intersect(_categoryRepository.Query().Where(cat => categories.Contains(cat.Slug)).Select(c => c.Id)).Any());
+            }
+
             var brands = searchOption.GetBrands().ToArray();
             if (brands.Any())
             {
@@ -141,6 +148,24 @@ private static void AppendFilterOptionsToModel(ProductsByCategory model, IQuerya
             model.FilterOption.Price.MaxPrice = query.Max(x => x.Price);
             model.FilterOption.Price.MinPrice = query.Min(x => x.Price);
 
+            model.FilterOption.Categories = query
+                .SelectMany(x => x.Categories)
+                .GroupBy(x => new
+                {
+                    x.Category.Id,
+                    x.Category.Name,
+                    x.Category.Slug,
+                    x.Category.ParentId
+                })
+                .Select(g => new FilterCategory
+                {
+                    Id = (int)g.Key.Id,
+                    Name = g.Key.Name,
+                    Slug = g.Key.Slug,
+                    ParentId = g.Key.ParentId,
+                    Count = g.Count()
+                }).ToList();
+
             model.FilterOption.Brands = query.Include(x => x.Brand)
                 .Where(x => x.BrandId != null).ToList()
                 .GroupBy(x => x.Brand)

src/Modules/SimplCommerce.Module.Catalog/Areas/Catalog/Views/Category/CategoryDetail.cshtml

@@ -27,7 +27,54 @@
     <div class="col-md-3 product-list-filters">
         <h3>@Localizer["Filter by"]</h3>
         <form id="productFilter" name="productFilter" method="GET" action="~/@Model.CategorySlug">
-            <div id="accordion-brand">
+        @if (Model.FilterOption.Categories.Where(x => x.ParentId == Model.CategoryId).Any())
+            {
+            <div id="accordion-category">
+                <div class="card">
+                    <div class="card-header" id="cardHeaderCategory">
+                        <h5 class="mb-0">
+                            <a data-toggle="collapse" href="#collapse-category" aria-expanded="true" aria-controls="collapse-category">
+                                @Localizer["Category"]
+                                <i class="fa fa-angle-down"></i>
+                            </a>
+                        </h5>
+                    </div>
+                    <div id="collapse-category" class="collapse show" aria-labelledby="cardHeaderCategory" data-parent="#accordion-category">
+                        <div class="card-body">
+                            <ul class="list-unstyled checkbox-list">
+                        @foreach (var category in Model.FilterOption.Categories.Where(x => x.ParentId == Model.CategoryId))
+                        {
+                                <li>
+                                    <label class="checkbox">
+                                        <input type="checkbox" value="@category.Slug" name="category" checked="@Model.CurrentSearchOption.GetCategories().Contains(category.Slug)">
+                                        @category.Name
+                                        <small>(@category.Count)</small>
+                                    </label>
+                            @{ var children = Model.FilterOption.Categories.Where(x => x.ParentId == category.Id); }
+                            @if (children.Any())
+                            {
+                                    <ul class="list-unstyled checkbox-list">
+                                @foreach (var child in children)
+                                {
+                                        <li>
+                                            <label class="checkbox">
+                                                <input type="checkbox" value="@child.Slug" name="category" checked="@Model.CurrentSearchOption.GetCategories().Contains(child.Slug)">
+                                                @child.Name
+                                                <small>(@child.Count)</small>
+                                            </label>
+                                        </li>
+                                }
+                                    </ul>
+                            }
+                                </li>
+                        }
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        }
+            <div id="accordion-brand" class="mt-4">
                 <div class="card">
                     <div class="card-header" id="cardBrandHeader">
                         <h5 class="mb-0">