Merge remote-tracking branch 'firedrakes/MAGETWO-57753-dev' into PRS

Author: slavvka

app/code/Magento/Catalog/Api/Data/EavAttributeInterface.php

@@ -139,6 +139,30 @@ public function getIsVisibleInGrid();
      */
     public function getIsFilterableInGrid();
 
+    /**
+     * Set is attribute used in grid
+     *
+     * @param bool|null $isUsedInGrid
+     * @return $this
+     */
+    public function setIsUsedInGrid($isUsedInGrid);
+
+    /**
+     * Set is attribute visible in grid
+     *
+     * @param bool|null $isVisibleInGrid
+     * @return $this
+     */
+    public function setIsVisibleInGrid($isVisibleInGrid);
+
+    /**
+     * Set is attribute filterable in grid
+     *
+     * @param bool|null $isFilterableInGrid
+     * @return $this
+     */
+    public function setIsFilterableInGrid($isFilterableInGrid);
+
     /**
      * Set whether it is used in search results layered navigation
      *

app/code/Magento/Catalog/Model/Category/Attribute.php

@@ -361,4 +361,31 @@ public function setScope($scope)
             return $this;
         }
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function setIsUsedInGrid($isUsedInGrid)
+    {
+        $this->setData(self::IS_USED_IN_GRID, $isUsedInGrid);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setIsVisibleInGrid($isVisibleInGrid)
+    {
+        $this->setData(self::IS_VISIBLE_IN_GRID, $isVisibleInGrid);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setIsFilterableInGrid($isFilterableInGrid)
+    {
+        $this->setData(self::IS_FILTERABLE_IN_GRID, $isFilterableInGrid);
+        return $this;
+    }
 }

app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php

@@ -848,4 +848,31 @@ public function __wakeup()
         $this->_productFlatIndexerHelper = $objectManager->get(\Magento\Catalog\Helper\Product\Flat\Indexer::class);
         $this->attrLockValidator = $objectManager->get(LockValidatorInterface::class);
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function setIsUsedInGrid($isUsedInGrid)
+    {
+        $this->setData(self::IS_USED_IN_GRID, $isUsedInGrid);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setIsVisibleInGrid($isVisibleInGrid)
+    {
+        $this->setData(self::IS_VISIBLE_IN_GRID, $isVisibleInGrid);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setIsFilterableInGrid($isFilterableInGrid)
+    {
+        $this->setData(self::IS_FILTERABLE_IN_GRID, $isFilterableInGrid);
+        return $this;
+    }
 }

app/code/Magento/Eav/Api/Data/AttributeInterface.php

@@ -94,7 +94,7 @@ public function setFrontendInput($frontendInput);
     /**
      * Retrieve entity type id
      *
-     * @return string|null
+     * @return string
      */
     public function getEntityTypeId();
 

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeRepositoryTest.php

@@ -91,6 +91,7 @@ public function testCreate()
         $expectedData = [
             'attribute_code' => $attributeCode,
             'is_required' => true,
+            'entity_type_id' => "4",
             "frontend_input" => "select",
             "is_visible_on_front" => true,
             "is_searchable" => true,
@@ -142,6 +143,8 @@ public function testUpdate()
             'attribute' => [
                 'attribute_id' => $attribute['attribute_id'],
                 'attribute_code' => $attributeCode,
+                'entity_type_id' => 4,
+                'is_used_in_grid' => true,
                 'default_frontend_label' => 'default_label_new',
                 'frontend_labels' => [
                     ['store_id' => 1, 'label' => 'front_lbl_new'],
@@ -183,6 +186,7 @@ public function testUpdate()
         $result = $this->updateAttribute($attributeCode, $attributeData);
 
         $this->assertEquals($attribute['attribute_id'], $result['attribute_id']);
+        $this->assertEquals(true, $result['is_used_in_grid']);
         $this->assertEquals($attributeCode, $result['attribute_code']);
         $this->assertEquals('default_label_new', $result['default_frontend_label']);
         //New option set as default
@@ -202,6 +206,7 @@ public function testUpdateWithNewOption()
             'attribute' => [
                 'attribute_id' => $attribute['attribute_id'],
                 'attribute_code' => $attributeCode,
+                'entity_type_id' => 4,
                 'is_required' => true,
                 'frontend_labels' => [
                     ['store_id' => 0, 'label' => 'front_lbl_new'],
@@ -278,6 +283,7 @@ protected function createAttribute($attributeCode)
         $attributeData = [
             'attribute' => [
                 'attribute_code' => $attributeCode,
+                'entity_type_id' => '4',
                 'frontend_labels' => [
                     [
                         'store_id' => 0,