Merge remote-tracking branch '36104/fix-issue-36101' into augcommpr

Author: Indrani Sonawane

app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CategoriesTest.php

@@ -7,16 +7,16 @@
 
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Categories;
-use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
+use Magento\Authorization\Model\Role;
+use Magento\Backend\Model\Auth\Session;
 use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Categories;
 use Magento\Framework\App\CacheInterface;
 use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\DB\Helper as DbHelper;
 use Magento\Framework\UrlInterface;
 use Magento\Store\Model\Store;
-use Magento\Backend\Model\Auth\Session;
-use Magento\Authorization\Model\Role;
 use Magento\User\Model\User;
 use PHPUnit\Framework\MockObject\MockObject;
 
@@ -91,6 +91,9 @@ protected function setUp(): void
         $this->categoryCollectionMock->expects($this->any())
             ->method('addAttributeToSelect')
             ->willReturnSelf();
+        $this->categoryCollectionMock->expects($this->any())
+            ->method('addAttributeToSort')
+            ->willReturnSelf();
         $this->categoryCollectionMock->expects($this->any())
             ->method('addAttributeToFilter')
             ->willReturnSelf();

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php

@@ -7,18 +7,20 @@
 
 namespace Magento\Catalog\Ui\DataProvider\Product\Form\Modifier;
 
+use Magento\Backend\Model\Auth\Session;
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\Category as CategoryModel;
 use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\CacheInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\Data\Collection;
 use Magento\Framework\DB\Helper as DbHelper;
-use Magento\Catalog\Model\Category as CategoryModel;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Serialize\SerializerInterface;
-use Magento\Framework\UrlInterface;
 use Magento\Framework\Stdlib\ArrayManager;
-use Magento\Framework\AuthorizationInterface;
-use Magento\Backend\Model\Auth\Session;
+use Magento\Framework\UrlInterface;
 
 /**
  * Data provider for categories field of product page
@@ -51,6 +53,7 @@ class Categories extends AbstractModifier
     /**
      * @var array
      * @deprecated 101.0.0
+     * @see Nothing
      * @since 101.0.0
      */
     protected $categoriesTrees = [];
@@ -128,6 +131,7 @@ public function __construct(
      *
      * @return CacheInterface
      * @deprecated 101.0.3
+     * @see getCategoriesTree
      */
     private function getCacheManager(): CacheInterface
     {
@@ -442,6 +446,8 @@ private function retrieveCategoriesTree(int $storeId, array $shownCategoriesIds)
 
         $collection->addAttributeToFilter('entity_id', ['in' => array_keys($shownCategoriesIds)])
             ->addAttributeToSelect(['name', 'is_active', 'parent_id'])
+            ->addAttributeToSort(CategoryInterface::KEY_LEVEL, Collection::SORT_ORDER_ASC)
+            ->addAttributeToSort(CategoryInterface::KEY_POSITION, Collection::SORT_ORDER_ASC)
             ->setStoreId($storeId);
 
         $categoryById = [