Merge remote-tracking branch 'origin/MC-29677' into 2.4-develop-pr5

Author: serhii-balko

app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/ProductCustomOptionsDataProviderTest.php

@@ -11,6 +11,9 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 use Magento\Framework\DB\Select as DbSelect;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\EntityManager\EntityMetadataInterface;
+use Magento\Ui\DataProvider\Modifier\PoolInterface;
 
 class ProductCustomOptionsDataProviderTest extends \PHPUnit\Framework\TestCase
 {
@@ -44,6 +47,21 @@ class ProductCustomOptionsDataProviderTest extends \PHPUnit\Framework\TestCase
      */
     protected $dbSelectMock;
 
+    /**
+     * @var MetadataPool|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $metadataPool;
+
+    /**
+     * @var EntityMetadataInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $entityMetadata;
+
+    /**
+     * @var PoolInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $modifiersPool;
+
     protected function setUp()
     {
         $this->collectionFactoryMock = $this->getMockBuilder(CollectionFactory::class)
@@ -73,12 +91,29 @@ protected function setUp()
             ->method('create')
             ->willReturn($this->collectionMock);
 
+        $this->modifiersPool = $this->getMockBuilder(PoolInterface::class)
+            ->getMockForAbstractClass();
+        $this->entityMetadata = $this->getMockBuilder(EntityMetadataInterface::class)
+            ->getMockForAbstractClass();
+        $this->entityMetadata->expects($this->any())
+            ->method('getLinkField')
+            ->willReturn('entity_id');
+        $this->metadataPool = $this->getMockBuilder(MetadataPool::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getMetadata'])
+            ->getMock();
+        $this->metadataPool->expects($this->any())
+            ->method('getMetadata')
+            ->willReturn($this->entityMetadata);
+
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->dataProvider = $this->objectManagerHelper->getObject(
             ProductCustomOptionsDataProvider::class,
             [
                 'collectionFactory' => $this->collectionFactoryMock,
-                'request' => $this->requestMock
+                'request' => $this->requestMock,
+                'modifiersPool' => $this->modifiersPool,
+                'metadataPool' => $this->metadataPool
             ]
         );
     }

app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCustomOptionsDataProvider.php

@@ -12,6 +12,9 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product\Option as ProductOption;
 use Magento\Framework\DataObject;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\App\ObjectManager;
+use Magento\Ui\DataProvider\Modifier\PoolInterface;
 
 /**
  * DataProvider for grid on Import Custom Options modal panel
@@ -39,6 +42,11 @@ class ProductCustomOptionsDataProvider extends ProductDataProvider
      */
     protected $productOptionValueModel;
 
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
     /**
      * @param string $name
      * @param string $primaryFieldName
@@ -51,6 +59,8 @@ class ProductCustomOptionsDataProvider extends ProductDataProvider
      * @param \Magento\Ui\DataProvider\AddFilterToCollectionInterface[] $addFilterStrategies
      * @param array $meta
      * @param array $data
+     * @param PoolInterface|null $modifiersPool
+     * @param MetadataPool|null $metadataPool
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -64,7 +74,9 @@ public function __construct(
         array $addFieldStrategies = [],
         array $addFilterStrategies = [],
         array $meta = [],
-        array $data = []
+        array $data = [],
+        PoolInterface $modifiersPool = null,
+        MetadataPool $metadataPool = null
     ) {
         parent::__construct(
             $name,
@@ -74,16 +86,19 @@ public function __construct(
             $addFieldStrategies,
             $addFilterStrategies,
             $meta,
-            $data
+            $data,
+            $modifiersPool
         );
 
         $this->request = $request;
         $this->productOptionRepository = $productOptionRepository;
         $this->productOptionValueModel = $productOptionValueModel;
+        $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()
+            ->get(MetadataPool::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.0.0
      */
     public function getData()
@@ -95,9 +110,16 @@ public function getData()
                 $this->getCollection()->getSelect()->where('e.entity_id != ?', $currentProductId);
             }
 
+            try {
+                $entityMetadata = $this->metadataPool->getMetadata(ProductInterface::class);
+                $linkField = $entityMetadata->getLinkField();
+            } catch (\Exception $e) {
+                $linkField = 'entity_id';
+            }
+
             $this->getCollection()->getSelect()->distinct()->join(
                 ['opt' => $this->getCollection()->getTable('catalog_product_option')],
-                'opt.product_id = e.entity_id',
+                'opt.product_id = e.' . $linkField,
                 null
             );
             $this->getCollection()->load();