Merge branch 'release/2.26.0'

Martyna Maciejewska · Martyna Maciejewska · commit 0e1e811a3429 · 2024-03-29T07:22:13.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.26.0] - 2024-03-29
+### Fixed
+- The function getProductTitle() returns empty string (DEV-104749)
+- Hyva error "The element "topmenu_generic" can't have a child" (DEV-104435)
+    - Changed custom block names in `default_hyva.xml`:
+        - `topmenu.mobile` to `topmenu-mobile`
+        - `topmenu.desktop` to `topmenu-desktop`
+    - Removed hyva blocks in `default_hyva.xml`:
+        - `topmenu.mobile`
+        - `topmenu.desktop`
+
 ## [2.25.0] - 2024-01-19
 ### Added
 - 3-level desktop submenu variant (DEV-103924)
diff --git a/Model/ResourceModel/NodeType/Product.php b/Model/ResourceModel/NodeType/Product.php
@@ -106,7 +106,7 @@ public function fetchConfigData()
     public function fetchTitleData($storeId = Store::DEFAULT_STORE_ID, $productIds = [])
     {
         $collection = $this->productCollection->create();
-        $collection->addAttributeToSelect(['name', 'left'])
+        $collection->addAttributeToSelect('name', 'left')
             ->addFieldToFilter('entity_id', ['in' => $productIds])
             ->addStoreFilter($storeId);
 
diff --git a/view/frontend/layout/default_hyva.xml b/view/frontend/layout/default_hyva.xml
@@ -3,19 +3,31 @@
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="topmenu_generic">
-            <block name="topmenu.mobile" class="Snowdog\Menu\Block\Menu">
+            <block
+                name="topmenu-mobile"
+                class="Snowdog\Menu\Block\Menu"
+            >
                 <arguments>
                     <argument name="menu" xsi:type="string">hyva-topmenu-mobile</argument>
                 </arguments>
             </block>
-            <block name="topmenu.desktop" class="Snowdog\Menu\Block\Menu">
-                <arguments>
-                    <argument name="menu" xsi:type="string">hyva-topmenu-desktop</argument>
-                </arguments>
-            </block>
         </referenceBlock>
+
+        <block
+            name="topmenu-desktop"
+            class="Snowdog\Menu\Block\Menu"
+        >
+            <arguments>
+                <argument name="menu" xsi:type="string">hyva-topmenu-desktop</argument>
+            </arguments>
+        </block>
+
         <referenceBlock name="footer-content">
-            <block name="menu-footer" class="Snowdog\Menu\Block\Menu" before="-">
+            <block
+                name="menu-footer"
+                class="Snowdog\Menu\Block\Menu"
+                before="-"
+            >
                 <arguments>
                     <argument name="menu" xsi:type="string">hyva-menu-footer</argument>
                 </arguments>
@@ -25,9 +37,17 @@
                 remove="true"
             />
         </referenceBlock>
+
         <referenceBlock name="script-alpine-js">
-            <block name="alpine-plugin-collapse" template="Snowdog_Menu::page/js/plugins/collapse.phtml"/>
+            <block
+                name="alpine-plugin-collapse"
+                template="Snowdog_Menu::page/js/plugins/collapse.phtml"
+            />
         </referenceBlock>
-        <move element="topmenu.desktop" destination="header.container" after="-"/>
+
+        <move element="topmenu-desktop" destination="header.container" after="-"/>
+
+        <referenceBlock name="topmenu_mobile" remove="true"/>
+        <referenceBlock name="topmenu_desktop" remove="true"/>
     </body>
 </page>

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public function fetchConfigData()`
`106`	`106`	`public function fetchTitleData($storeId = Store::DEFAULT_STORE_ID, $productIds = [])`
`107`	`107`	`{`
`108`	`108`	`$collection = $this->productCollection->create();`
`109`		`- $collection->addAttributeToSelect(['name', 'left'])`
	`109`	`+ $collection->addAttributeToSelect('name', 'left')`
`110`	`110`	`->addFieldToFilter('entity_id', ['in' => $productIds])`
`111`	`111`	`->addStoreFilter($storeId);`
`112`	`112`