MAGETWO-91434: Default option for 'Status' attribute not being set

Author: fascinosum

app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GeneralTest.php

@@ -5,8 +5,11 @@
  */
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\General;
+use Magento\Eav\Api\AttributeRepositoryInterface;
+use Magento\Eav\Api\Data\AttributeInterface;
+use Magento\Framework\Stdlib\ArrayManager;
 
 /**
  * Class GeneralTest
@@ -15,6 +18,35 @@
  */
 class GeneralTest extends AbstractModifierTest
 {
+    /**
+     * @var AttributeRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attributeRepositoryMock;
+
+    /**
+     * @var General
+     */
+    private $generalModifier;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->attributeRepositoryMock = $this->getMockBuilder(AttributeRepositoryInterface::class)
+        ->getMockForAbstractClass();
+
+        $arrayManager = $this->objectManager->getObject(ArrayManager::class);
+
+        $this->generalModifier = $this->objectManager->getObject(
+            General::class,
+            [
+                'attributeRepository' => $this->attributeRepositoryMock,
+                'locator' => $this->locatorMock,
+                'arrayManager' => $arrayManager,
+            ]
+        );
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -40,4 +72,59 @@ public function testModifyMeta()
             ]
         ]));
     }
+
+    /**
+     * @param array $data
+     * @param int $defaultStatusValue
+     * @param array $expectedResult
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @dataProvider modifyDataDataProvider
+     */
+    public function testModifyDataNewProduct(array $data, int $defaultStatusValue, array $expectedResult)
+    {
+        $attributeMock = $this->getMockBuilder(AttributeInterface::class)
+            ->getMockForAbstractClass();
+        $attributeMock
+            ->method('getDefaultValue')
+            ->willReturn($defaultStatusValue);
+        $this->attributeRepositoryMock
+            ->method('get')
+            ->with(
+                ProductAttributeInterface::ENTITY_TYPE_CODE,
+                ProductAttributeInterface::CODE_STATUS
+            )
+            ->willReturn($attributeMock);
+        $this->assertSame($expectedResult, $this->generalModifier->modifyData($data));
+    }
+
+    /**
+     * @return array
+     */
+    public function modifyDataDataProvider(): array
+    {
+        return [
+            'With default status value' => [
+                'data' => [],
+                'defaultStatusAttributeValue' => 5,
+                'expectedResult' => [
+                    null => [
+                        General::DATA_SOURCE_DEFAULT => [
+                            ProductAttributeInterface::CODE_STATUS => 5,
+                        ],
+                    ],
+                ],
+            ],
+            'Without default status value' => [
+                'data' => [],
+                'defaultStatusAttributeValue' => 0,
+                'expectedResult' => [
+                    null => [
+                        General::DATA_SOURCE_DEFAULT => [
+                            ProductAttributeInterface::CODE_STATUS => 1,
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
 }

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php

@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Eav\Api\AttributeRepositoryInterface;
 use Magento\Ui\Component\Form;
 use Magento\Framework\Stdlib\ArrayManager;
 
@@ -35,21 +36,31 @@ class General extends AbstractModifier
      */
     private $localeCurrency;
 
+    /**
+     * @var AttributeRepositoryInterface
+     */
+    private $attributeRepository;
+
     /**
      * @param LocatorInterface $locator
      * @param ArrayManager $arrayManager
+     * @param AttributeRepositoryInterface|null $attributeRepository
      */
     public function __construct(
         LocatorInterface $locator,
-        ArrayManager $arrayManager
+        ArrayManager $arrayManager,
+        AttributeRepositoryInterface $attributeRepository = null
     ) {
         $this->locator = $locator;
         $this->arrayManager = $arrayManager;
+        $this->attributeRepository = $attributeRepository
+            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(AttributeRepositoryInterface::class);
     }
 
     /**
      * {@inheritdoc}
      * @since 101.0.0
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function modifyData(array $data)
     {
@@ -58,7 +69,12 @@ public function modifyData(array $data)
         $modelId = $this->locator->getProduct()->getId();
 
         if (!isset($data[$modelId][static::DATA_SOURCE_DEFAULT][ProductAttributeInterface::CODE_STATUS])) {
-            $data[$modelId][static::DATA_SOURCE_DEFAULT][ProductAttributeInterface::CODE_STATUS] = '1';
+            $attributeStatus = $this->attributeRepository->get(
+                ProductAttributeInterface::ENTITY_TYPE_CODE,
+                ProductAttributeInterface::CODE_STATUS
+            );
+            $data[$modelId][static::DATA_SOURCE_DEFAULT][ProductAttributeInterface::CODE_STATUS] =
+                $attributeStatus->getDefaultValue() ?: 1;
         }
 
         return $data;