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

Author: pradeep1819

app/code/Magento/LayeredNavigation/Test/Mftf/ActionGroup/StorefrontLayeredNavigationAttributeOptionActionGroup.xml

@@ -10,11 +10,7 @@
         <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" >
-                    <arguments>
-                        <argument name="view_model" xsi:type="object">Magento\LayeredNavigation\ViewModel\Layer\State</argument>
-                    </arguments>
-                </block>
+                <block class="Magento\LayeredNavigation\Block\Navigation\State" name="catalog.navigation.state" as="state" />
                 <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/Test/Mftf/Test/StorefrontMultipleSelectAttributeInLayeredNavigationTest.xml

@@ -10,11 +10,7 @@
         <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" >
-                    <arguments>
-                        <argument name="view_model" xsi:type="object">Magento\LayeredNavigation\ViewModel\Layer\State</argument>
-                    </arguments>
-                </block>
+                <block class="Magento\LayeredNavigation\Block\Navigation\State" name="catalogsearch.navigation.state" as="state" />
                 <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/ViewModel/Layer/State.php

@@ -8,45 +8,39 @@
 /**
  * Category layered navigation state
  *
- * @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)): ?>
+<?php if (!empty($_filters)) : ?>
 <div class="filter-current">
     <strong class="block-subtitle filter-current-subtitle"
             role="heading"
             aria-level="2"
-            data-count="<?= /* @noEscape */ count($_filters) ?>"><?= $escaper->escapeHtml(__('Now Shopping by')) ?>
-    </strong>
+            data-count="<?= /* @noEscape */ count($_filters) ?>"><?= $block->escapeHtml(__('Now Shopping by')) ?></strong>
     <ol class="items">
-        <?php foreach ($_filters as $_filter): ?>
+        <?php foreach ($_filters as $_filter) : ?>
             <li class="item">
-                <span class="filter-label"><?= $escaper->escapeHtml(__($_filter->getName())) ?></span>
-                <span class="filter-value"><?= $escaper->escapeHtml($viewModel->stripTags($_filter->getLabel())) ?></span>
+                <span class="filter-label"><?= $block->escapeHtml(__($_filter->getName())) ?></span>
+                <span class="filter-value"><?= $block->escapeHtml($block->stripTags($_filter->getLabel())) ?></span>
                 <?php
                 $clearLinkUrl = $_filter->getClearLinkUrl();
-                $currentFilterName = $escaper->escapeHtmlAttr(
-                    __($_filter->getName()) . " " . $block->stripTags($_filter->getLabel())
-                );
-                if ($clearLinkUrl):
+                $currentFilterName = $block->escapeHtmlAttr(__($_filter->getName()) . " " . $block->stripTags($_filter->getLabel()));
+                if ($clearLinkUrl) :
                     ?>
-                    <a class="action previous" href="<?= $escaper->escapeUrl($_filter->getRemoveUrl()) ?>"
-                       title="<?= $escaper->escapeHtmlAttr(__('Previous')) ?>">
-                        <span><?= $escaper->escapeHtml(__('Previous')) ?></span>
+                    <a class="action previous" href="<?= $block->escapeUrl($_filter->getRemoveUrl()) ?>"
+                       title="<?= $block->escapeHtmlAttr(__('Previous')) ?>">
+                        <span><?= $block->escapeHtml(__('Previous')) ?></span>
                     </a>
                     <a class="action remove"
-                       title="<?= $escaper->escapeHtmlAttr($_filter->getFilter()->getClearLinkText()) ?>"
-                       href="<?= $escaper->escapeUrl($clearLinkUrl) ?>">
-                        <span><?= $escaper->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
+                       title="<?= $block->escapeHtmlAttr($_filter->getFilter()->getClearLinkText()) ?>"
+                       href="<?= $block->escapeUrl($clearLinkUrl) ?>">
+                        <span><?= $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
                     </a>
-                <?php else: ?>
-                    <a class="action remove" href="<?= $escaper->escapeUrl($_filter->getRemoveUrl()) ?>"
-                       title="<?= /* @noEscape */ $escaper->escapeHtmlAttr(__('Remove')) . " " . $currentFilterName ?>">
-                        <span><?= $escaper->escapeHtml(__('Remove This Item')) ?></span>
+                <?php else : ?>
+                    <a class="action remove" href="<?= $block->escapeUrl($_filter->getRemoveUrl()) ?>"
+                       title="<?= /* @noEscape */ $block->escapeHtmlAttr(__('Remove')) . " " . $currentFilterName ?>">
+                        <span><?= $block->escapeHtml(__('Remove This Item')) ?></span>
                     </a>
                 <?php endif; ?>
             </li>