Merge branch 'mainline_develop' into MAGETWO-40002

Author: Maksym Aposov

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

@@ -6,9 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
-    <type name="Magento\Quote\Model\Quote\Item\ToOrderItem">
-        <plugin name="append_bundle_data_to_order" type="Magento\Bundle\Model\Plugin\QuoteItem"/>
-    </type>
     <type name="Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper">
         <plugin name="Bundle" type="Magento\Bundle\Controller\Adminhtml\Product\Initialization\Helper\Plugin\Bundle" sortOrder="60" />
     </type>

app/code/Magento/Bundle/etc/di.xml

@@ -99,4 +99,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Quote\Model\Quote\Item\ToOrderItem">
+        <plugin name="append_bundle_data_to_order" type="Magento\Bundle\Model\Plugin\QuoteItem"/>
+    </type>
 </config>

app/code/Magento/Bundle/etc/frontend/di.xml

@@ -6,9 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
-    <type name="Magento\Quote\Model\Quote\Item\ToOrderItem">
-        <plugin name="append_bundle_data_to_order" type="Magento\Bundle\Model\Plugin\QuoteItem"/>
-    </type>
     <type name="Magento\Catalog\Helper\Product\ConfigurationPool">
         <arguments>
             <argument name="instancesByType" xsi:type="array">

app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php

@@ -6,69 +6,58 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
-use Magento\Catalog\Model\Resource\Product\Collection;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Catalog\Controller\Adminhtml\Product\Builder;
+use Magento\Backend\App\Action\Context;
+use Magento\Ui\Component\MassAction\Filter;
+use Magento\Catalog\Model\Resource\Product\CollectionFactory;
 
 class MassDelete extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
-     * Field id
+     * Massactions filter
+     *
+     * @var Filter
      */
-    const ID_FIELD = 'entity_id';
+    protected $filter;
 
     /**
-     * Redirect url
+     * @var CollectionFactory
      */
-    const REDIRECT_URL = 'catalog/*/index';
+    protected $collectionFactory;
 
     /**
-     * Resource collection
-     *
-     * @var string
+     * @param Context $context
+     * @param Builder $productBuilder
+     * @param Filter $filter
+     * @param CollectionFactory $collectionFactory
      */
-    protected $collection = 'Magento\Catalog\Model\Resource\Product\Collection';
+    public function __construct(
+        Context $context,
+        Builder $productBuilder,
+        Filter $filter,
+        CollectionFactory $collectionFactory
+    ) {
+        $this->filter = $filter;
+        $this->collectionFactory = $collectionFactory;
+        parent::__construct($context, $productBuilder);
+    }
 
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()
     {
-        $selected = $this->getRequest()->getParam('selected');
-        $excluded = $this->getRequest()->getParam('excluded');
-
-        $collection = $this->_objectManager->create($this->collection);
-        try {
-            if (!empty($excluded)) {
-                $collection->addFieldToFilter(static::ID_FIELD, ['nin' => $excluded]);
-                $this->massAction($collection);
-            } elseif (!empty($selected)) {
-                $collection->addFieldToFilter(static::ID_FIELD, ['in' => $selected]);
-                $this->massAction($collection);
-            } else {
-                $this->messageManager->addError(__('Please select product(s).'));
-            }
-        } catch (\Exception $e) {
-            $this->messageManager->addError($e->getMessage());
-        }
-
-        /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
-        $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
-        return $resultRedirect->setPath(static::REDIRECT_URL);
-    }
-
-    /**
-     * Cancel selected orders
-     *
-     * @param Collection $collection
-     * @return void
-     */
-    protected function massAction($collection)
-    {
-        $count = 0;
+        $collection = $this->filter->getCollection($this->collectionFactory->create());
+        $productDeleted = 0;
         foreach ($collection->getItems() as $product) {
             $product->delete();
-            ++$count;
+            $productDeleted++;
         }
-        $this->messageManager->addSuccess(__('A total of %1 record(s) have been deleted.', $count));
+        $this->messageManager->addSuccess(
+            __('A total of %1 record(s) have been deleted.', $productDeleted)
+        );
+
+        return $this->resultFactory->create(ResultFactory::TYPE_REDIRECT)->setPath('catalog/*/index');
     }
 }

app/code/Magento/Catalog/Model/Resource/Product/Collection.php

@@ -34,6 +34,11 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
      */
     const MAIN_TABLE_ALIAS = 'e';
 
+    /**
+     * @var string
+     */
+    protected $_idFieldName = 'entity_id';
+
     /**
      * Catalog Product Flat is enabled cache per store
      *

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

@@ -34,6 +34,7 @@ public function __construct(StoreManagerInterface $storeManager)
     public function addFilter(Collection $collection, $field, $condition = null)
     {
         if (isset($condition['eq']) && $condition['eq']) {
+            /** @var \Magento\Catalog\Model\Resource\Product\Collection $collection  */
             $collection->addStoreFilter($this->storeManager->getStore($condition['eq']));
         }
     }

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

@@ -57,16 +57,6 @@ public function __construct(
         $this->addFilterStrategies = $addFilterStrategies;
     }
 
-    /**
-     * Get collection
-     *
-     * @return \Magento\Catalog\Model\Resource\Product\Collection
-     */
-    protected function getCollection()
-    {
-        return $this->collection;
-    }
-
     /**
      * Get data
      *
@@ -104,12 +94,17 @@ public function addField($field, $alias = null)
     /**
      * {@inheritdoc}
      */
-    public function addFilter($condition, $field = null, $type = 'regular')
+    public function addFilter(\Magento\Framework\Api\Filter $filter)
     {
-        if (isset($this->addFilterStrategies[$field])) {
-            $this->addFilterStrategies[$field]->addFilter($this->getCollection(), $field, $condition);
+        if (isset($this->addFilterStrategies[$filter->getField()])) {
+            $this->addFilterStrategies[$filter->getField()]
+                ->addFilter(
+                    $this->getCollection(),
+                    $filter->getField(),
+                    [$filter->getConditionType() => $filter->getValue()]
+                );
         } else {
-            parent::addFilter($condition, $field);
+            parent::addFilter($filter);
         }
     }
 }