Merge branch '2.4-develop' into foxes-pr

Author: dhaecker

app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php

@@ -573,8 +573,12 @@ protected function insertOptions()
 
         $optionIds = $this->connection->fetchAssoc(
             $this->connection->select()->from(
-                $this->_resource->getTableName('catalog_product_bundle_option'),
+                ['bo' => $this->_resource->getTableName('catalog_product_bundle_option')],
                 ['option_id', 'position', 'parent_id']
+            )->joinLeft(
+                ['bov' => $this->_resource->getTableName('catalog_product_bundle_option_value')],
+                'bo.option_id = bov.option_id',
+                ['title']
             )->where(
                 'parent_id IN (?)',
                 $productIds
@@ -600,8 +604,10 @@ protected function populateInsertOptionValues(array $optionIds): array
         foreach ($this->_cachedOptions as $entityId => $options) {
             foreach ($options as $key => $option) {
                 foreach ($optionIds as $optionId => $assoc) {
-                    if ($assoc['position'] == $this->_cachedOptions[$entityId][$key]['index']
-                        && $assoc['parent_id'] == $entityId) {
+                    if ($assoc['position'] == $this->_cachedOptions[$entityId][$key]['index'] &&
+                        $assoc['parent_id'] == $entityId &&
+                        (empty($assoc['title']) || $assoc['title'] == $this->_cachedOptions[$entityId][$key]['name'])
+                    ) {
                         $option['parent_id'] = $entityId;
                         $optionValues[] = $this->populateOptionValueTemplate($option, $optionId);
                         $this->_cachedOptions[$entityId][$key]['option_id'] = $optionId;

app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php

@@ -289,6 +289,7 @@ public function testSaveData($skus, $bunch, $allowImport)
                         'type' => 'bundle',
                         'value_id' => '6',
                         'title' => 'Bundle6',
+                        'name' => 'Bundle6',
                         'selections' => [
                             [
                                 'name' => 'Bundlen6',

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php

@@ -67,7 +67,8 @@ public function execute(\Iterator $iterator): array
                 $tree = $this->mergeCategoriesTrees($currentLevelTree, $tree);
             }
         }
-        return $tree;
+
+        return $this->sortTree($tree);
     }
 
     /**
@@ -141,4 +142,24 @@ private function explodePathToArray(array $pathElements, int $index): array
         }
         return $tree;
     }
+
+    /**
+     * Recursive method to sort tree
+     *
+     * @param array $tree
+     * @return array
+     */
+    private function sortTree(array $tree): array
+    {
+        foreach ($tree as &$node) {
+            if ($node['children']) {
+                uasort($node['children'], function ($element1, $element2) {
+                    return $element1['position'] > $element2['position'];
+                });
+                $node['children'] = $this->sortTree($node['children']);
+            }
+        }
+
+        return $tree;
+    }
 }