Merge remote-tracking branch 'tango/MC-37347' into PR-10-14

Author: dhorytskyi

app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml

@@ -15,33 +15,39 @@
             <title value="Product grid filtering by store view level attribute"/>
             <description value="Verify that products grid can be filtered on all store view level by attribute"/>
             <severity value="MAJOR"/>
-            <testCaseId value="MAGETWO-98755"/>
-            <useCaseId value="MAGETWO-98335"/>
+            <testCaseId value="MC-28534"/>
+            <useCaseId value="MC-37347"/>
             <group value="catalog"/>
         </annotations>
+
         <before>
-            <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct2"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
+
         <after>
-            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createSimpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>
             <actionGroup ref="ClearProductsFilterActionGroup" stepKey="clearProductsFilter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
+
         <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToEditPage">
-            <argument name="productId" value="$$createSimpleProduct.id$$"/>
+            <argument name="productId" value="$$createSimpleProduct1.id$$"/>
         </actionGroup>
         <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="switchToDefaultStoreView">
             <argument name="storeView" value="_defaultStore.name"/>
         </actionGroup>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
         <click selector="{{AdminProductFormSection.productNameUseDefault}}" stepKey="uncheckUseDefault"/>
-        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="fillNewName"/>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="$$createSimpleProduct2.name$$" stepKey="fillNewName"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveSimpleProduct"/>
         <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
-        <actionGroup ref="FilterProductGridByNameActionGroup" stepKey="filterGridByName">
-            <argument name="product" value="SimpleProduct"/>
+        <actionGroup ref="FilterProductGridByName2ActionGroup" stepKey="filterGridByName">
+            <argument name="name" value="$$createSimpleProduct2.name$$"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.firstProductRow}}" userInput="{{SimpleProduct2.name}}" stepKey="seeProductNameInGrid"/>
+        <seeElement selector="{{AdminProductGridSection.productRowBySku('$$createSimpleProduct2.sku$$')}}" stepKey="seeProduct2InGrid"/>
+        <dontSeeElement selector="{{AdminProductGridSection.productRowBySku('$$createSimpleProduct1.sku$$')}}" stepKey="dontSeeProduct1InGrid"/>
     </test>
 </tests>

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

@@ -5,16 +5,10 @@
  */
 namespace Magento\Catalog\Ui\DataProvider\Product;
 
-use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Eav\Model\Entity\Attribute\AttributeInterface;
-
 /**
  * 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.
- *
- * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class ProductCollection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {
@@ -31,66 +25,4 @@ protected function _productLimitationJoinPrice()
         $this->_productLimitationFilters->setUsePriceIndex(false);
         return $this->_productLimitationPrice(true);
     }
-
-    /**
-     * Add attribute filter to collection
-     *
-     * @param AttributeInterface|integer|string|array $attribute
-     * @param null|string|array $condition
-     * @param string $joinType
-     * @return $this
-     * @throws LocalizedException
-     */
-    public function addAttributeToFilter($attribute, $condition = null, $joinType = 'inner')
-    {
-        $storeId = (int)$this->getStoreId();
-        if ($attribute === 'is_saleable'
-            || is_array($attribute)
-            || $storeId !== $this->getDefaultStoreId()
-        ) {
-            return parent::addAttributeToFilter($attribute, $condition, $joinType);
-        }
-
-        if ($attribute instanceof AttributeInterface) {
-            $attributeModel = $attribute;
-        } else {
-            $attributeModel = $this->getEntity()->getAttribute($attribute);
-            if ($attributeModel === false) {
-                throw new LocalizedException(
-                    __('Invalid attribute identifier for filter (%1)', get_class($attribute))
-                );
-            }
-        }
-
-        if ($attributeModel->isScopeGlobal() || $attributeModel->getBackend()->isStatic()) {
-            return parent::addAttributeToFilter($attribute, $condition, $joinType);
-        }
-
-        $this->addAttributeToFilterAllStores($attributeModel, $condition);
-
-        return $this;
-    }
-
-    /**
-     * Add attribute to filter by all stores
-     *
-     * @param Attribute $attributeModel
-     * @param array $condition
-     * @return void
-     */
-    private function addAttributeToFilterAllStores(Attribute $attributeModel, array $condition): void
-    {
-        $tableName = $this->getTable($attributeModel->getBackendTable());
-        $entity = $this->getEntity();
-        $fKey = 'e.' . $this->getEntityPkName($entity);
-        $pKey = $tableName . '.' . $this->getEntityPkName($entity);
-        $attributeId = $attributeModel->getAttributeId();
-        $condition = "({$pKey} = {$fKey}) AND ("
-            . $this->_getConditionSql("{$tableName}.value", $condition)
-            . ') AND ('
-            . $this->_getConditionSql("{$tableName}.attribute_id", $attributeId)
-            . ')';
-        $selectExistsInAllStores = $this->getConnection()->select()->from($tableName);
-        $this->getSelect()->exists($selectExistsInAllStores, $condition);
-    }
 }