Merge branch '2.3-develop' into 2.3-develop-com-pr2

Author: mykhailomatiola

app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml

@@ -170,6 +170,9 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()) : 0;
         <?php if ($block->getSortableUpdateCallback()) : ?>
                 <?= $block->escapeJs($block->getJsObjectName()) ?>.sortableUpdateCallback = <?= /* @noEscape */ $block->getSortableUpdateCallback() ?>;
         <?php endif; ?>
+        <?php if ($block->getFilterKeyPressCallback()) : ?>
+            <?= $block->escapeJs($block->getJsObjectName()) ?>.filterKeyPressCallback = <?= /* @noEscape */ $block->getFilterKeyPressCallback() ?>;
+        <?php endif; ?>
         <?= $block->escapeJs($block->getJsObjectName()) ?>.bindSortable();
         <?php if ($block->getRowInitCallback()) : ?>
                 <?= $block->escapeJs($block->getJsObjectName()) ?>.initRowCallback = <?= /* @noEscape */ $block->getRowInitCallback() ?>;

app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml

@@ -272,6 +272,9 @@ $numColumns = count($block->getColumns());
         <?php if ($block->getCheckboxCheckCallback()) : ?>
             <?= $block->escapeJs($block->getJsObjectName()) ?>.checkboxCheckCallback = <?= /* @noEscape */ $block->getCheckboxCheckCallback() ?>;
         <?php endif; ?>
+        <?php if ($block->getFilterKeyPressCallback()) : ?>
+            <?= $block->escapeJs($block->getJsObjectName()) ?>.filterKeyPressCallback = <?= /* @noEscape */ $block->getFilterKeyPressCallback() ?>;
+        <?php endif; ?>
         <?php if ($block->getRowInitCallback()) : ?>
             <?= $block->escapeJs($block->getJsObjectName()) ?>.initRowCallback = <?= /* @noEscape */ $block->getRowInitCallback() ?>;
             <?= $block->escapeJs($block->getJsObjectName()) ?>.initGridRows();

app/code/Magento/Braintree/Gateway/Validator/ErrorCodeProvider.php

@@ -11,6 +11,7 @@
 use Braintree\Error\Validation;
 use Braintree\Result\Error;
 use Braintree\Result\Successful;
+use Braintree\Transaction;
 
 /**
  * Processes errors codes from Braintree response.
@@ -38,12 +39,14 @@ public function getErrorCodes($response): array
             $result[] = $error->code;
         }
 
-        if (isset($response->transaction) && $response->transaction->status === 'gateway_rejected') {
-            $result[] = $response->transaction->gatewayRejectionReason;
-        }
+        if (isset($response->transaction) && $response->transaction) {
+            if ($response->transaction->status === Transaction::GATEWAY_REJECTED) {
+                $result[] = $response->transaction->gatewayRejectionReason;
+            }
 
-        if (isset($response->transaction) && $response->transaction->status === 'processor_declined') {
-            $result[] = $response->transaction->processorResponseCode;
+            if ($response->transaction->status === Transaction::PROCESSOR_DECLINED) {
+                $result[] = $response->transaction->processorResponseCode;
+            }
         }
 
         return $result;

app/code/Magento/Catalog/Model/Product/Hydrator.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product;
+
+use Magento\Framework\EntityManager\HydratorInterface;
+
+/**
+ * Class is used to extract data and populate entity with data
+ */
+class Hydrator implements HydratorInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function extract($entity)
+    {
+        return $entity->getData();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function hydrate($entity, array $data)
+    {
+        $lockedAttributes = $entity->getLockedAttributes();
+        $entity->unlockAttributes();
+        $entity->setData(array_merge($entity->getData(), $data));
+        foreach ($lockedAttributes as $attribute) {
+            $entity->lockAttribute($attribute);
+        }
+
+        return $entity;
+    }
+}

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml

@@ -191,6 +191,18 @@
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
         <dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryEntity.name)}}" stepKey="dontSeeCategoryInTree"/>
     </actionGroup>
+    <actionGroup name="AdminDeleteCategoryByName" extends="DeleteCategory">
+        <arguments>
+            <argument name="categoryName" type="string" defaultValue="category1"/>
+        </arguments>
+        <remove keyForRemoval="clickCategoryLink"/>
+        <remove keyForRemoval="dontSeeCategoryInTree"/>
+        <remove keyForRemoval="expandToSeeAllCategories"/>
+        <conditionalClick selector="{{AdminCategorySidebarTreeSection.expandAll}}" dependentSelector="{{AdminCategorySidebarTreeSection.categoryByName(categoryName)}}" visible="false" stepKey="expandCategories" after="waitForCategoryPageLoad"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryByName(categoryName)}}" stepKey="clickCategory" after="expandCategories"/>
+        <conditionalClick selector="{{AdminCategorySidebarTreeSection.expandAll}}" dependentSelector="{{AdminCategorySidebarTreeSection.categoryByName(categoryName)}}" visible="false" stepKey="expandCategoriesToSeeAll" after="seeDeleteSuccess"/>
+        <dontSee selector="{{AdminCategorySidebarTreeSection.categoryByName(categoryName)}}" stepKey="dontSeeCategory" after="expandCategoriesToSeeAll"/>
+    </actionGroup>
 
     <!-- Actions to fill out a new category from the product page-->
     <!-- The action assumes that you are already on an admin product configuration page -->

app/code/Magento/Catalog/Test/Mftf/Data/CatalogPriceConfigData.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="CatalogPriceScopeWebsiteConfigData">
+        <data key="path">catalog/price/scope</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="CatalogPriceScopeGlobalConfigData">
+        <data key="path">catalog/price/scope</data>
+        <data key="value">0</data>
+    </entity>
+</entities>

app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml

@@ -19,5 +19,6 @@
         <element name="lastCreatedCategory" type="block" selector=".x-tree-root-ct li li:last-child" />
         <element name="treeContainer" type="block" selector=".tree-holder" />
         <element name="expandRootCategory" type="text" selector="img.x-tree-elbow-end-plus"/>
+        <element name="categoryByName" type="text" selector="//div[contains(@class, 'categories-side-col')]//a/span[contains(text(), '{{categoryName}}')]" parameterized="true" timeout="30"/>
     </section>
 </sections>

app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml

@@ -8,6 +8,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminProductFormSection">
+        <element name="datepickerNewAttribute" type="input" selector="[data-index='{{attrName}}'] input" timeout="30" parameterized="true"/>
         <element name="attributeSet" type="select" selector="div[data-index='attribute_set_id'] .admin__field-control"/>
         <element name="attributeSetFilter" type="input" selector="div[data-index='attribute_set_id'] .admin__field-control input" timeout="30"/>
         <element name="attributeSetFilterResult" type="input" selector="div[data-index='attribute_set_id'] .action-menu-item._last" timeout="30"/>

app/code/Magento/Catalog/Ui/Component/UrlInput/Product.php

@@ -10,6 +10,9 @@
 
 use Magento\Framework\UrlInterface;
 
+/**
+ * Returns configuration for product Url Input type
+ */
 class Product implements \Magento\Ui\Model\UrlInput\ConfigInterface
 {
     /**
@@ -27,7 +30,7 @@ public function __construct(UrlInterface $urlBuilder)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getConfig(): array
     {
@@ -46,6 +49,7 @@ public function getConfig(): array
             'template' => 'ui/grid/filters/elements/ui-select',
             'searchUrl' => $this->urlBuilder->getUrl('catalog/product/search'),
             'filterPlaceholder' => __('Product Name or SKU'),
+            'filterRateLimitMethod' => 'notifyWhenChangesStop',
             'isDisplayEmptyPlaceholder' => true,
             'emptyOptionsHtml' => __('Start typing to find products'),
             'missingValuePlaceholder' => __('Product with ID: %s doesn\'t exist'),

app/code/Magento/Catalog/Ui/DataProvider/Product/Modifier/Attributes.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Ui\DataProvider\Product\Modifier;
+
+use Magento\Framework\Escaper;
+use Magento\Ui\DataProvider\Modifier\ModifierInterface;
+
+/**
+ * Modify product listing attributes
+ */
+class Attributes implements ModifierInterface
+{
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * @var array
+     */
+    private $escapeAttributes;
+
+    /**
+     * @param Escaper $escaper
+     * @param array $escapeAttributes
+     */
+    public function __construct(
+        Escaper $escaper,
+        array $escapeAttributes = []
+    ) {
+        $this->escaper = $escaper;
+        $this->escapeAttributes = $escapeAttributes;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function modifyData(array $data)
+    {
+        if (!empty($data) && !empty($this->escapeAttributes)) {
+            foreach ($data['items'] as &$item) {
+                foreach ($this->escapeAttributes as $escapeAttribute) {
+                    if (isset($item[$escapeAttribute])) {
+                        $item[$escapeAttribute] = $this->escaper->escapeHtml($item[$escapeAttribute]);
+                    }
+                }
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function modifyMeta(array $meta)
+    {
+        return $meta;
+    }
+}