ACP2E-3058: Missing label in LayeredNavigation with option name 0

Author: pradeep1819

app/code/Magento/LayeredNavigation/ViewModel/Layer/State.php

@@ -0,0 +1,46 @@
+<?php
+/************************************************************************
+ *
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ************************************************************************
+ */
+
+namespace Magento\LayeredNavigation\ViewModel\Layer;
+
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\LayeredNavigation\Block\Navigation\State as StateBlock;
+
+class State implements ArgumentInterface
+{
+    /**
+     * @param StateBlock $block
+     */
+    public function __construct(private StateBlock $block)
+    {
+    }
+
+    /**
+     * Skip string value '0' to be filtered against stripTags
+     *
+     * @param string $data
+     * @return string
+     */
+    public function stripTags(string $data): string
+    {
+        if ($data !== '0') {
+            return $this->block->stripTags($data);
+        }
+
+        return $data;
+    }
+}

app/code/Magento/LayeredNavigation/view/frontend/layout/catalog_category_view_type_layered.xml

@@ -10,7 +10,11 @@
         <attribute name="class" value="page-with-filter"/>
         <referenceContainer name="sidebar.main">
             <block class="Magento\LayeredNavigation\Block\Navigation\Category" name="catalog.leftnav" before="-" template="Magento_LayeredNavigation::layer/view.phtml">
-                <block class="Magento\LayeredNavigation\Block\Navigation\State" name="catalog.navigation.state" as="state" />
+                <block class="Magento\LayeredNavigation\Block\Navigation\State" name="catalog.navigation.state" as="state" >
+                    <arguments>
+                        <argument name="view_model" xsi:type="object">Magento\LayeredNavigation\ViewModel\Layer\State</argument>
+                    </arguments>
+                </block>
                 <block class="Magento\LayeredNavigation\Block\Navigation\FilterRenderer" name="catalog.navigation.renderer" as="renderer" template="Magento_LayeredNavigation::layer/filter.phtml">
                     <arguments>
                         <argument name="product_layer_view_model" xsi:type="object">Magento\LayeredNavigation\ViewModel\Layer\Filter</argument>

app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_result_index.xml

@@ -10,7 +10,11 @@
         <attribute name="class" value="page-with-filter"/>
         <referenceContainer name="sidebar.main">
             <block class="Magento\LayeredNavigation\Block\Navigation\Search" name="catalogsearch.leftnav" before="-" template="Magento_LayeredNavigation::layer/view.phtml">
-                <block class="Magento\LayeredNavigation\Block\Navigation\State" name="catalogsearch.navigation.state" as="state" />
+                <block class="Magento\LayeredNavigation\Block\Navigation\State" name="catalogsearch.navigation.state" as="state" >
+                    <arguments>
+                        <argument name="view_model" xsi:type="object">Magento\LayeredNavigation\ViewModel\Layer\State</argument>
+                    </arguments>
+                </block>
                 <block class="Magento\LayeredNavigation\Block\Navigation\FilterRenderer" name="catalogsearch.navigation.renderer" as="renderer" template="Magento_LayeredNavigation::layer/filter.phtml">
                     <arguments>
                         <argument name="product_layer_view_model" xsi:type="object">Magento\LayeredNavigation\ViewModel\Layer\Filter</argument>

app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml

@@ -10,7 +10,9 @@
  *
  * @var $escaper \Magento\Framework\Escaper
  * @var $block \Magento\LayeredNavigation\Block\Navigation\State
+ * @var $viewModel \Magento\LayeredNavigation\ViewModel\Layer\State
  */
+$viewModel = $block->getViewModel();
 ?>
 <?php $_filters = $block->getActiveFilters() ?>
 <?php if (!empty($_filters)): ?>
@@ -24,10 +26,7 @@
         <?php foreach ($_filters as $_filter): ?>
             <li class="item">
                 <span class="filter-label"><?= $escaper->escapeHtml(__($_filter->getName())) ?></span>
-                <span class="filter-value">
-                <?= ((string)$_filter->getLabel() === "0") ? $escaper->escapeHtml($_filter->getLabel()) :
-                    $escaper->escapeHtml($block->stripTags($_filter->getLabel())) ?>
-                </span>
+                <span class="filter-value"><?= $escaper->escapeHtml($viewModel->stripTags($_filter->getLabel())) ?></span>
                 <?php
                 $clearLinkUrl = $_filter->getClearLinkUrl();
                 $currentFilterName = $escaper->escapeHtmlAttr(

app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/state.phtml

@@ -12,7 +12,9 @@
  *
  * @var $escaper \Magento\Framework\Escaper
  * @var $block \Magento\LayeredNavigation\Block\Navigation\State
+ * @var $viewModel \Magento\LayeredNavigation\ViewModel\Layer\State
  */
+$viewModel = $block->getViewModel();
 ?>
 <?php $_filters = $block->getActiveFilters() ?>
 <?php if (!empty($_filters)): ?>
@@ -26,10 +28,7 @@
         <?php foreach ($_filters as $_filter): ?>
             <li class="item">
                 <span class="filter-label"><?= $escaper->escapeHtml(__($_filter->getName())) ?></span>
-                <span class="filter-value">
-                <?= ((string)$_filter->getLabel() === "0") ? $escaper->escapeHtml($_filter->getLabel()) :
-                    $escaper->escapeHtml($block->stripTags($_filter->getLabel())) ?>
-                </span>
+                <span class="filter-value"><?= $escaper->escapeHtml($viewModel->stripTags($_filter->getLabel())) ?></span>
                 <?php
                 $clearLinkUrl = $_filter->getClearLinkUrl();
                 $currentFilterName = $escaper->escapeHtmlAttr(__($_filter->getName()) . " " . $block->stripTags($_filter->getLabel()));