MAGETWO-50123: Unable to assign blank value to attribute #3545 #4910 #5485 #5225

- modifying logic and unit test according to resolved logic agreed, only new products should select default value

Author: cpartica

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

@@ -182,7 +182,6 @@ class EavTest extends AbstractModifierTest
      */
     protected $eventManagerMock;
 
-
     /**
      * @var ObjectManager
      */
@@ -193,6 +192,9 @@ class EavTest extends AbstractModifierTest
      */
     protected $eav;
 
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -466,13 +468,14 @@ public function testSetupAttributeMetaDefaultAttribute($productId, $productRequi
         $this->productMock->expects($this->any())
             ->method('getId')
             ->willReturn($productId);
+
         $this->productAttributeMock->expects($this->any())
             ->method('getIsRequired')
             ->willReturn($productRequired);
 
         $this->productAttributeMock->expects($this->any())
             ->method('getDefaultValue')
-            ->willReturn($productRequired? 'required_value' : null);
+            ->willReturn('required_value');
 
         $this->productAttributeMock->expects($this->any())
             ->method('getAttributeCode')
@@ -529,14 +532,14 @@ public function setupAttributeMetaDataProvider()
             'default_null_prod_not_new_and_required' => [
                 'productId' => 1,
                 'productRequired' => true,
-                'attrValue' => null,
+                'attrValue' => 'val',
                 'expected' => [
                     'dataType' => null,
                     'formElement' => null,
                     'visible' => null,
                     'required' => true,
                     'notice' => null,
-                    'default' => 'required_value',
+                    'default' => null,
                     'label' => null,
                     'code' => 'code',
                     'source' => 'product-details',
@@ -545,15 +548,15 @@ public function setupAttributeMetaDataProvider()
                     'sortOrder' => 0
                     ],
                 ],
-            'default_null_prod_not_new_and_required_with_value' => [
+            'default_null_prod_not_new_and_not_required' => [
                 'productId' => 1,
-                'productRequired' => true,
+                'productRequired' => false,
                 'attrValue' => 'val',
                 'expected' => [
                     'dataType' => null,
                     'formElement' => null,
                     'visible' => null,
-                    'required' => true,
+                    'required' => false,
                     'notice' => null,
                     'default' => null,
                     'label' => null,
@@ -562,10 +565,10 @@ public function setupAttributeMetaDataProvider()
                     'scopeLabel' => '',
                     'globalScope' => false,
                     'sortOrder' => 0
+                    ],
                 ],
-            ],
-            'default_null_prod_not_new_and_not_required_no_value' => [
-                'productId' => 1,
+            'default_null_prod_new_and_not_required' => [
+                'productId' => null,
                 'productRequired' => false,
                 'attrValue' => null,
                 'expected' => [
@@ -574,7 +577,7 @@ public function setupAttributeMetaDataProvider()
                     'visible' => null,
                     'required' => false,
                     'notice' => null,
-                    'default' => null,
+                    'default' => 'required_value',
                     'label' => null,
                     'code' => 'code',
                     'source' => 'product-details',
@@ -583,15 +586,15 @@ public function setupAttributeMetaDataProvider()
                     'sortOrder' => 0
                 ],
             ],
-            'default_null_prod_NEW_no_value' => [
+            'default_null_prod_new_and_required' => [
                 'productId' => null,
-                'productRequired' => true,
+                'productRequired' => false,
                 'attrValue' => null,
                 'expected' => [
                     'dataType' => null,
                     'formElement' => null,
                     'visible' => null,
-                    'required' => true,
+                    'required' => false,
                     'notice' => null,
                     'default' => 'required_value',
                     'label' => null,
@@ -601,7 +604,7 @@ public function setupAttributeMetaDataProvider()
                     'globalScope' => false,
                     'sortOrder' => 0
                 ],
-            ],
+            ]
         ];
     }
 }

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

@@ -527,41 +527,11 @@ private function getPreviousSetAttributes()
      *
      * @return bool
      */
-    private function isProductNew()
+    private function isProductExists()
     {
         return (bool) $this->locator->getProduct()->getId();
     }
 
-    /**
-     * Check is product has some value for attribute
-     *
-     * @param ProductAttributeInterface $attribute
-     * @return bool
-     */
-    private function isProductHasValueForAttribute(ProductAttributeInterface $attribute)
-    {
-        /** @var \Magento\Framework\Api\AttributeInterface $attributeCode */
-        $attributeCode = $this->locator->getProduct()->getCustomAttribute($attribute->getAttributeCode());
-        return (bool)($attributeCode !== null) && $attributeCode->getValue();
-    }
-
-    /**
-     * Check should we display default values for attribute or not
-     *
-     * @param ProductAttributeInterface $attribute
-     * @return bool
-     */
-    private function isShowDefaultValue(ProductAttributeInterface $attribute)
-    {
-        if (!$this->isProductNew()) {
-            return true;
-        } elseif ($attribute->getIsRequired() && !$this->isProductHasValueForAttribute($attribute)) {
-            return true;
-        }
-
-        return false;
-    }
-
     /**
      * Initial meta setup
      *
@@ -584,7 +554,7 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC
             'visible' => $attribute->getIsVisible(),
             'required' => $attribute->getIsRequired(),
             'notice' => $attribute->getNote(),
-            'default' => $this->isShowDefaultValue($attribute) ? $attribute->getDefaultValue() : null,
+            'default' => (!$this->isProductExists()) ? $attribute->getDefaultValue() : null,
             'label' => $attribute->getDefaultFrontendLabel(),
             'code' => $attribute->getAttributeCode(),
             'source' => $groupCode,

app/code/Magento/Ui/view/base/web/js/form/element/select.js

@@ -44,9 +44,9 @@ define([
                 if (_.isUndefined(caption)) {
                     caption = node.label;
                 }
-            } else {
-                return node;
             }
+
+            return node;
         });
 
         return {
@@ -163,10 +163,6 @@ define([
             this.observe('options')
                 .setOptions(this.options());
 
-            if (_.isUndefined(this.value()) && !this.default) {
-                this.clear();
-            }
-
             return this;
         },
 
@@ -290,6 +286,11 @@ define([
             return preview;
         },
 
+        /**
+         *
+         * @param {Number} value
+         * @returns {Object} Chainable
+         */
         getOption: function (value) {
             return this.indexedOptions[value];
         },
@@ -305,6 +306,19 @@ define([
             this.value(value);
 
             return this;
+        },
+
+        /**
+         * Initializes observable properties of instance
+         *
+         * @returns {Object} Chainable.
+         */
+        setInitialValue: function () {
+            if (_.isUndefined(this.value()) && !this.default) {
+                this.clear();
+            }
+
+            return this._super();
         }
     });
 });