Merge remote-tracking branch 'origin/MAGETWO-70062' into PANDA-FIXES-2.1

Author: RuslanKostiv1

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

@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Ui\DataProvider\Product;
+
+/**
+ * Collection which is used for rendering product list in the backend.
+ *
+ * Used for product grid and customizes behavior of the default Product collection for grid needs.
+ */
+class ProductCollection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
+{
+    /**
+     * Disables using of price index for grid rendering
+     *
+     * Admin area shouldn't use price index and should rely on actual product data instead.
+     *
+     * @codeCoverageIgnore
+     * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
+     */
+    protected function _productLimitationJoinPrice()
+    {
+        $this->_productLimitationFilters->setUsePriceIndex(false);
+        return $this->_productLimitationPrice(true);
+    }
+}

app/code/Magento/Catalog/etc/adminhtml/di.xml

@@ -77,6 +77,11 @@
     <type name="Magento\Catalog\Model\ResourceModel\Attribute">
         <plugin name="invalidate_pagecache_after_attribute_save" type="Magento\Catalog\Plugin\Model\ResourceModel\Attribute\Save" />
     </type>
+    <virtualType name="\Magento\Catalog\Ui\DataProvider\Product\ProductCollectionFactory" type="\Magento\Catalog\Model\ResourceModel\Product\CollectionFactory">
+        <arguments>
+            <argument name="instanceName" xsi:type="string">\Magento\Catalog\Ui\DataProvider\Product\ProductCollection</argument>
+        </arguments>
+    </virtualType>
     <type name="Magento\Catalog\Ui\DataProvider\Product\ProductDataProvider">
         <arguments>
             <argument name="addFieldStrategies" xsi:type="array">
@@ -85,6 +90,7 @@
             <argument name="addFilterStrategies" xsi:type="array">
                 <item name="store_id" xsi:type="object">Magento\Catalog\Ui\DataProvider\Product\AddStoreFieldToCollection</item>
             </argument>
+            <argument name="collectionFactory" xsi:type="object">\Magento\Catalog\Ui\DataProvider\Product\ProductCollectionFactory</argument>
         </arguments>
     </type>
     <type name="Magento\Catalog\Model\Product\Action">

dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/ProductTest.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Ui\DataProvider;
+
+use Magento\Framework\Data\Collection;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class ProductTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Catalog\Ui\DataProvider\Product\ProductDataProvider
+     */
+    private $dataProvider;
+
+    protected function setUp()
+    {
+        $this->dataProvider = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Catalog\Ui\DataProvider\Product\ProductDataProvider::class,
+            [
+                'name'=> 'products',
+                'primaryFieldName' => 'entity_id',
+                'requestFieldName' => 'id',
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider sortingFieldsDataProvider
+     * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
+     *
+     * @param string $orderByField
+     * @param string $direction
+     */
+    public function testSortingNotAffectsCount($orderByField, $direction)
+    {
+        $this->dataProvider->addOrder($orderByField, $direction);
+        $result = $this->dataProvider->getData();
+        $this->assertEquals(3, $result['totalRecords']);
+    }
+
+    /**
+     * @return array
+     */
+    public function sortingFieldsDataProvider()
+    {
+        return [
+            'name ASC' => ['name', Collection::SORT_ORDER_ASC],
+            'name DESC' => ['name', Collection::SORT_ORDER_DESC],
+            'sku ASC' => ['sku', Collection::SORT_ORDER_ASC],
+            'sku DESC' => ['sku', Collection::SORT_ORDER_DESC],
+            'price ASC' => ['price', Collection::SORT_ORDER_ASC],
+            'price DESC' => ['price', Collection::SORT_ORDER_DESC],
+        ];
+    }
+}