MC-5233: DateTime product attributes support

Author: serhii-balko

app/code/Magento/Catalog/Test/Unit/Ui/Component/ColumnFactoryTest.php

@@ -19,7 +19,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * ColumnFactory test.
+ * Test to Create columns factory on product grid page
  */
 class ColumnFactoryTest extends TestCase
 {
@@ -206,6 +206,7 @@ public function testCreateDateColumn(
                     'component' => 'Magento_Ui/js/grid/columns/date',
                     'timezone' => $expectedTimezone,
                     'dateFormat' => $expectedDateFormat,
+                    '__disableTmpl' => ['label' => true],
                     'options' => [
                         'showsTime' => $showsTime
                     ]

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

@@ -41,7 +41,7 @@
 use PHPUnit\Framework\MockObject\MockObject;
 
 /**
- * Class EavTest
+ * Class to test Data provider for eav attributes on product page
  *
  * @method Eav getModel
  * @SuppressWarnings(PHPMD.TooManyFields)
@@ -692,6 +692,7 @@ public function setupAttributeMetaDataProvider()
                     'scopeLabel' => '',
                     'globalScope' => false,
                     'sortOrder' => 0,
+                    '__disableTmpl' => ['label' => true, 'code' => true]
                 ],
                 'locked' => false,
                 'frontendInput' => 'datetime',

app/code/Magento/Catalog/Ui/Component/ColumnFactory.php

@@ -15,7 +15,7 @@
 use Magento\Ui\Component\Listing\Columns\ColumnInterface;
 
 /**
- * Column Factory
+ * Create columns factory on product grid page
  *
  * @api
  * @since 100.0.2

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

@@ -40,7 +40,7 @@
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\CollectionFactory as AttributeCollectionFactory;
 
 /**
- * Class Eav
+ * Data provider for eav attributes on product page
  *
  * @api
  *

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+use Magento\Catalog\Helper\Data;
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
@@ -63,7 +64,12 @@ function bindAttributeInputType()
 {
     checkOptionsPanelVisibility();
     switchDefaultValueField();
-    if($('frontend_input') && ($('frontend_input').value=='boolean' || $('frontend_input').value=='select' || $('frontend_input').value=='multiselect' || $('frontend_input').value=='price')){
+    if ($('frontend_input')
+        && ($('frontend_input').value=='boolean'
+            || $('frontend_input').value=='select'
+            || $('frontend_input').value=='multiselect'
+            || $('frontend_input').value=='price')
+    ){
         if($('is_filterable') && !$('is_filterable').getAttribute('readonly')){
             $('is_filterable').disabled = false;
         }
@@ -75,8 +81,7 @@ function bindAttributeInputType()
                 if($('backend_type').options[i].value=='int') $('backend_type').selectedIndex = i;
             }
         }
-    }
-    else {
+    } else {
         if($('is_filterable')){
             $('is_filterable').selectedIndex=0;
             $('is_filterable').disabled = true;
@@ -203,21 +208,22 @@ function switchDefaultValueField()
             setRowVisibility('frontend_class', false);
         break;
 
-        <?php foreach ($this->helper(Magento\Catalog\Helper\Data::class)->getAttributeHiddenFields() as $type => $fields) :?>
+        <?php // phpcs:ignore Magento2.Templates.ThisInTemplate ?>
+        <?php foreach ($this->helper(Data::class)->getAttributeHiddenFields() as $type => $fields): ?>
             case '<?= $block->escapeJs($type) ?>':
                 var isFrontTabHidden = false;
-                <?php foreach ($fields as $one) :?>
-                    <?php if ($one == '_front_fieldset') :?>
+                <?php foreach ($fields as $one): ?>
+                    <?php if ($one == '_front_fieldset'): ?>
                         getFrontTab().hide();
                         isFrontTabHidden = true;
-                    <?php elseif ($one == '_default_value') :?>
+                    <?php elseif ($one == '_default_value'): ?>
                         defaultValueTextVisibility =
                         defaultValueTextareaVisibility =
                         defaultValueDateVisibility =
                         defaultValueYesnoVisibility = false;
-                    <?php elseif ($one == '_scope') :?>
+                    <?php elseif ($one == '_scope'): ?>
                         scopeVisibility = false;
-                    <?php else :?>
+                    <?php else: ?>
                         setRowVisibility('<?= $block->escapeJs($one) ?>', false);
                     <?php endif; ?>
                 <?php endforeach; ?>

app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeTest.php

@@ -5,14 +5,21 @@
  */
 namespace Magento\Eav\Test\Unit\Model\Entity;
 
+use Magento\Eav\Model\Entity\Attribute;
+use Magento\Eav\Model\Entity\Attribute\FrontendLabel;
+use Magento\Eav\Model\Entity\Attribute\FrontendLabelFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
 /**
- * Class AttributeTest.
+ * Test for EAV Entity attribute model
  */
-class AttributeTest extends \PHPUnit\Framework\TestCase
+class AttributeTest extends TestCase
 {
     /**
      * Attribute model to be tested
-     * @var \Magento\Eav\Model\Entity\Attribute|\PHPUnit_Framework_MockObject_MockObject
+     * @var Attribute|MockObject
      */
     protected $_model;
 
@@ -21,7 +28,7 @@ class AttributeTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-        $this->_model = $this->createPartialMock(\Magento\Eav\Model\Entity\Attribute::class, ['__wakeup']);
+        $this->_model = $this->createPartialMock(Attribute::class, ['__wakeup']);
     }
 
     /**
@@ -132,7 +139,7 @@ public function testGetFrontendLabels()
     {
         $attributeId = 1;
         $storeLabels = ['test_attribute_store1'];
-        $frontendLabelFactory = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\FrontendLabelFactory::class)
+        $frontendLabelFactory = $this->getMockBuilder(FrontendLabelFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
@@ -144,15 +151,15 @@ public function testGetFrontendLabels()
             '_resource' => $resource,
             'frontendLabelFactory' => $frontendLabelFactory,
         ];
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->_model = $objectManager->getObject(\Magento\Eav\Model\Entity\Attribute::class, $arguments);
+        $objectManager = new ObjectManager($this);
+        $this->_model = $objectManager->getObject(Attribute::class, $arguments);
         $this->_model->setAttributeId($attributeId);
 
         $resource->expects($this->once())
             ->method('getStoreLabelsByAttributeId')
             ->with($attributeId)
             ->willReturn($storeLabels);
-        $frontendLabel = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\FrontendLabel::class)
+        $frontendLabel = $this->getMockBuilder(FrontendLabel::class)
             ->setMethods(['setStoreId', 'setLabel'])
             ->disableOriginalConstructor()
             ->getMock();

app/code/Magento/Ui/Component/Form/Element/DataType/Date.php

@@ -11,7 +11,7 @@
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 
 /**
- * Class Date
+ * UI component date type
  */
 class Date extends AbstractDataType
 {

app/code/Magento/Ui/Test/Unit/Component/Filters/Type/DateTest.php

@@ -16,7 +16,7 @@
 use PHPUnit\Framework\MockObject\MockObject;
 
 /**
- * Class DateTest
+ * Test for Date grid filter functionality
  */
 class DateTest extends \PHPUnit\Framework\TestCase
 {