From 4dd1ab0d4d3a4314282c27c9ca5ede79b1badef8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20J=C3=A4ger?= <uwej711@googlemail.com>
Date: Tue, 9 Feb 2021 17:14:55 +0100
Subject: [PATCH] Pass missing isEmptyCategoryFilterValueVisible and add
 condition

---
 .../filter-category/filter-category.twig      | 64 ++++++++++---------
 .../page-layout-catalog.twig                  |  1 +
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/src/Pyz/Yves/CatalogPage/Theme/default/components/molecules/filter-category/filter-category.twig b/src/Pyz/Yves/CatalogPage/Theme/default/components/molecules/filter-category/filter-category.twig
index da52436428..fc234550a8 100644
--- a/src/Pyz/Yves/CatalogPage/Theme/default/components/molecules/filter-category/filter-category.twig
+++ b/src/Pyz/Yves/CatalogPage/Theme/default/components/molecules/filter-category/filter-category.twig
@@ -27,39 +27,43 @@
                 {% set quantity = filterValue.docCount %}
             {% endfor %}
 
-            {% if data.filterPath is not empty %}
-                {% set currentUrl = url(data.filterPath, {categoryPath: (app.request.attributes.get('categoryPath'))}) %}
-            {% else %}
-                {% set currentUrl = app.request.attributes.get('categoryNode') ? app.request.attributes.get('categoryNode').url : null %}
-            {% endif %}
+            {% if (quantity > 0) or (quantity <= 0 and data.isEmptyCategoryFilterValueVisible == true) %}
 
-            {% set categoryUrl = data.filterPath is not empty ? url(data.filterPath, {categoryPath: (categoryNode.url | trimLocale)}) : categoryNode.url %}
-            {% set isActive = (currentUrl == categoryUrl) %}
-            {% set isHidden = (data.levelMenu != 1) %}
-            {% set disableAttribute = quantity == 0 ? 'disabled' %}
-            {% set menuItemActiveClass = isActive ? config.name ~ '__menu-item--active ' ~ config.jsName ~ '__menu-item' %}
-            {% set menuItemHiddenClass = isHidden and not isActive ? 'is-hidden-lg-xxl' %}
-            {% set menuLinkActiveClass = isActive ? config.name ~ '__menu-link--active' %}
-            {% set linkTextActiveClass = isActive ? config.name ~ '__link-text--active' %}
-            {% set triggerButtonJsName = data.parentJsName ? data.parentJsName ~ '__trigger' %}
+                {% if data.filterPath is not empty %}
+                    {% set currentUrl = url(data.filterPath, {categoryPath: (app.request.attributes.get('categoryPath'))}) %}
+                {% else %}
+                    {% set currentUrl = app.request.attributes.get('categoryNode') ? app.request.attributes.get('categoryNode').url : null %}
+                {% endif %}
 
-            <li class="{{ config.name }}__menu-item {{ config.name }}__menu-item--lvl-{{ data.levelMenu }} {{ menuItemActiveClass }} {{ menuItemHiddenClass }}">
-                <button class="{{ config.name }}__menu-link {{ config.name }}__menu-link--lvl-{{ data.levelMenu }} {{ menuLinkActiveClass }} {{ triggerButtonJsName }}" type="button" {{ disableAttribute }} data-url={{ categoryUrl }}>
-                    <span class="{{ config.name }}__link-text {{ linkTextActiveClass }}">{{ categoryNode.name }}</span> <span>{{ quantity }}</span>
-                </button>
+                {% set categoryUrl = data.filterPath is not empty ? url(data.filterPath, {categoryPath: (categoryNode.url | trimLocale)}) : categoryNode.url %}
+                {% set isActive = (currentUrl == categoryUrl) %}
+                {% set isHidden = (data.levelMenu != 1) %}
+                {% set disableAttribute = quantity == 0 ? 'disabled' %}
+                {% set menuItemActiveClass = isActive ? config.name ~ '__menu-item--active ' ~ config.jsName ~ '__menu-item' %}
+                {% set menuItemHiddenClass = isHidden and not isActive ? 'is-hidden-lg-xxl' %}
+                {% set menuLinkActiveClass = isActive ? config.name ~ '__menu-link--active' %}
+                {% set linkTextActiveClass = isActive ? config.name ~ '__link-text--active' %}
+                {% set triggerButtonJsName = data.parentJsName ? data.parentJsName ~ '__trigger' %}
 
-                {% if hasChildren %}
-                    {% include molecule('filter-category', 'CatalogPage') with {
-                        data: {
-                            filter: data.filter,
-                            filterPath: data.filterPath,
-                            categories: categoryNode.children,
-                            levelMenu: data.levelMenu + 1,
-                            parentJsName: data.parentJsName,
-                        },
-                    } only %}
-                {% endif %}
-            </li>
+                <li class="{{ config.name }}__menu-item {{ config.name }}__menu-item--lvl-{{ data.levelMenu }} {{ menuItemActiveClass }} {{ menuItemHiddenClass }}">
+                    <button class="{{ config.name }}__menu-link {{ config.name }}__menu-link--lvl-{{ data.levelMenu }} {{ menuLinkActiveClass }} {{ triggerButtonJsName }}" type="button" {{ disableAttribute }} data-url={{ categoryUrl }}>
+                        <span class="{{ config.name }}__link-text {{ linkTextActiveClass }}">{{ categoryNode.name }}</span> <span>{{ quantity }}</span>
+                    </button>
+
+                    {% if hasChildren %}
+                        {% include molecule('filter-category', 'CatalogPage') with {
+                            data: {
+                                filter: data.filter,
+                                filterPath: data.filterPath,
+                                categories: categoryNode.children,
+                                levelMenu: data.levelMenu + 1,
+                                isEmptyCategoryFilterValueVisible: data.isEmptyCategoryFilterValueVisible,
+                                parentJsName: data.parentJsName,
+                            },
+                        } only %}
+                    {% endif %}
+                </li>
+            {% endif %}
         {% endfor %}
     </ul>
 {% endblock %}
diff --git a/src/Pyz/Yves/CatalogPage/Theme/default/templates/page-layout-catalog/page-layout-catalog.twig b/src/Pyz/Yves/CatalogPage/Theme/default/templates/page-layout-catalog/page-layout-catalog.twig
index 6d3bb607e8..38af152f56 100644
--- a/src/Pyz/Yves/CatalogPage/Theme/default/templates/page-layout-catalog/page-layout-catalog.twig
+++ b/src/Pyz/Yves/CatalogPage/Theme/default/templates/page-layout-catalog/page-layout-catalog.twig
@@ -62,6 +62,7 @@
                             facets: data.facets,
                             filterPath: data.filterPath,
                             categories: data.categories,
+                            isEmptyCategoryFilterValueVisible: data.isEmptyCategoryFilterValueVisible,
                             parentJsName: catalogJsName,
                         },
                     } only %}