Merge branch '2.4-develop' into 2.4-develop-prs

Author: sidolov

app/code/Magento/MessageQueue/Setup/ConfigOptionsList.php

@@ -62,8 +62,8 @@ public function getOptions()
                 self::INPUT_KEY_QUEUE_DEFAULT_CONNECTION,
                 TextConfigOption::FRONTEND_WIZARD_TEXT,
                 self::CONFIG_PATH_QUEUE_DEFAULT_CONNECTION,
-                'Message queues default connection. Can be db, amqp or a custom one.',
-                self::DEFAULT_QUEUE_CONNECTION
+                'Message queues default connection. Can be \'db\', \'amqp\' or a custom queue system.'
+                . 'The queue system must be installed and configured, otherwise messages won\'t be processed correctly.'
             ),
         ];
     }

app/code/Magento/Review/Model/ResourceModel/Review/Collection.php

@@ -14,48 +14,41 @@
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
     /**
-     * Review table
      *
      * @var string
      */
     protected $_reviewTable = null;
 
     /**
-     * Review detail table
      *
      * @var string
      */
     protected $_reviewDetailTable = null;
 
     /**
-     * Review status table
      *
      * @var string
      */
     protected $_reviewStatusTable = null;
 
     /**
-     * Review entity table
      *
      * @var string
      */
     protected $_reviewEntityTable = null;
 
     /**
-     * Review store table
      *
      * @var string
      */
     protected $_reviewStoreTable = null;
 
     /**
-     * Add store data flag
      * @var bool
      */
     protected $_addStoreDataFlag = false;
 
     /**
-     * Review data
      *
      * @var \Magento\Review\Helper\Data
      */
@@ -125,7 +118,7 @@ protected function _initSelect()
         $this->getSelect()->join(
             ['detail' => $this->getReviewDetailTable()],
             'main_table.review_id = detail.review_id',
-            ['detail_id', 'title', 'detail', 'nickname', 'customer_id']
+            ['detail_id', 'store_id', 'title', 'detail', 'nickname', 'customer_id']
         );
         return $this;
     }

app/code/Magento/Review/Test/Unit/Model/ResourceModel/Review/CollectionTest.php

@@ -104,7 +104,7 @@ public function testInitSelect(): void
             ->with(
                 ['detail' => 'review_detail'],
                 'main_table.review_id = detail.review_id',
-                ['detail_id', 'title', 'detail', 'nickname', 'customer_id']
+                ['detail_id', 'store_id', 'title', 'detail', 'nickname', 'customer_id']
             );
         $this->objectManager->getObject(
             Collection::class,

app/code/Magento/Sales/Test/Mftf/Test/AdminFilterOrderByPurchaseDateReset.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminFilterOrderByPurchaseDateReset">
+        <annotations>
+            <title value="Create Order in Admin with simple product"/>
+            <stories value="ACP2E-188: Date picker filters are not cleared after deleting the filter in Sales Order grid"/>
+            <description value="Search order by purchase date and clear date filter"/>
+            <features value="Sales"/>
+            <testCaseId value="ACP2E-188"/>
+            <severity value="MAJOR"/>
+            <group value="Sales"/>
+        </annotations>
+        <before>
+             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderIndexPage"/>
+        <waitForPageLoad stepKey="waitForIndexPageLoad"/>
+        <actionGroup ref="FilterOrderGridByPurchaseDateActionGroup" stepKey="filterOrderByPurchaseDate">
+            <argument name="from" value="01/18/2021" />
+            <argument name="to" value="01/18/2021" />
+        </actionGroup>
+        <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilter"/>
+        <grabValueFrom selector="{{AdminDataGridHeaderSection.filterFieldInput('created_at[from]')}}" stepKey="grabPurchasedDateFrom"/>
+        <grabValueFrom selector="{{AdminDataGridHeaderSection.filterFieldInput('created_at[to]')}}" stepKey="grabPurchasedDateTo"/>
+        <assertEmpty stepKey="checkPurchaseDateFromReset">
+            <actualResult type="string">$grabPurchasedDateFrom</actualResult>
+        </assertEmpty>
+        <assertEmpty stepKey="checkPurchaseDateToReset">
+            <actualResult type="string">$grabPurchasedDateTo</actualResult>
+        </assertEmpty>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+    </test>
+</tests>

app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/datepicker.js

@@ -28,8 +28,11 @@ define([
          * For more info about options take a look at "mage/calendar" and jquery.ui.datepicker widget.
          * @param {HTMLElement} el - Element, that binding is applied to
          * @param {Function} valueAccessor - Function that returns value, passed to binding
+         * @param {object} allBindings
+         * @param {object} viewModel
+         * @param {object} bindingContext
          */
-        init: function (el, valueAccessor) {
+        init: function (el, valueAccessor, allBindings, viewModel, bindingContext) {
             var config = valueAccessor(),
                 observable,
                 options = {};
@@ -50,6 +53,16 @@ define([
                     observable(this.value);
                 });
             });
+
+            if (bindingContext.$data) {
+                bindingContext.$data.value.subscribe(function (newVal) {
+                    if (!newVal) {
+                        $(el).val('');
+                    }
+                }, this);
+            }
+
+
         },
 
         /**

composer.json

@@ -88,7 +88,7 @@
     "require-dev": {
         "allure-framework/allure-phpunit": "~1.5.0",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-        "friendsofphp/php-cs-fixer": "~3.3.0",
+        "friendsofphp/php-cs-fixer": "~3.4.0",
         "lusitanian/oauth": "~0.8.10",
         "magento/magento-coding-standard": "*",
         "magento/magento2-functional-testing-framework": "^3.7",

composer.lock

@@ -12,7 +12,7 @@ return [
         'config' => [
             '--remote-storage-driver' => 'aws-s3',
             '--remote-storage-bucket' => 'myBucket',
-            '--remote-storage-region' => 'us-east-1'
+            '--remote-storage-region' => 'us-east-1',
         ]
     ]
     */

dev/tests/api-functional/config/post-install-setup-command-config.php.dist

@@ -6,15 +6,15 @@
 
 // List of bin/magento setup CLI commands to run after setup:install
 return [
-    /*
     [
         'command' => 'setup:config:set',
         'config' => [
+            '--queue-default-connection' => 'db'
+            /*
             '--remote-storage-driver' => 'aws-s3',
             '--remote-storage-bucket' => 'myBucket',
-            '--remote-storage-region' => 'us-east-1',
-            '--queue-default-connection' => 'db'
+            '--remote-storage-region' => 'us-east-1'
+            */
         ]
     ]
-    */
 ];

dev/tests/integration/etc/post-install-setup-command-config.php.dist

@@ -26,70 +26,70 @@ class Lock implements ConfigOptionsListInterface
      *
      * @const string
      */
-    const INPUT_KEY_LOCK_PROVIDER = 'lock-provider';
+    public const INPUT_KEY_LOCK_PROVIDER = 'lock-provider';
 
     /**
      * The name of an option to set DB prefix
      *
      * @const string
      */
-    const INPUT_KEY_LOCK_DB_PREFIX = 'lock-db-prefix';
+    public const INPUT_KEY_LOCK_DB_PREFIX = 'lock-db-prefix';
 
     /**
      * The name of an option to set Zookeeper host
      *
      * @const string
      */
-    const INPUT_KEY_LOCK_ZOOKEEPER_HOST = 'lock-zookeeper-host';
+    public const INPUT_KEY_LOCK_ZOOKEEPER_HOST = 'lock-zookeeper-host';
 
     /**
      * The name of an option to set Zookeeper path
      *
      * @const string
      */
-    const INPUT_KEY_LOCK_ZOOKEEPER_PATH = 'lock-zookeeper-path';
+    public const INPUT_KEY_LOCK_ZOOKEEPER_PATH = 'lock-zookeeper-path';
 
     /**
      * The name of an option to set File path
      *
      * @const string
      */
-    const INPUT_KEY_LOCK_FILE_PATH = 'lock-file-path';
+    public const INPUT_KEY_LOCK_FILE_PATH = 'lock-file-path';
 
     /**
      * The configuration path to save lock provider
      *
      * @const string
      */
-    const CONFIG_PATH_LOCK_PROVIDER = 'lock/provider';
+    public const CONFIG_PATH_LOCK_PROVIDER = 'lock/provider';
 
     /**
      * The configuration path to save DB prefix
      *
      * @const string
      */
-    const CONFIG_PATH_LOCK_DB_PREFIX = 'lock/config/prefix';
+    public const CONFIG_PATH_LOCK_DB_PREFIX = 'lock/config/prefix';
 
     /**
      * The configuration path to save Zookeeper host
      *
      * @const string
      */
-    const CONFIG_PATH_LOCK_ZOOKEEPER_HOST = 'lock/config/host';
+    public const CONFIG_PATH_LOCK_ZOOKEEPER_HOST = 'lock/config/host';
 
     /**
      * The configuration path to save Zookeeper path
      *
      * @const string
      */
-    const CONFIG_PATH_LOCK_ZOOKEEPER_PATH = 'lock/config/path';
+    public const CONFIG_PATH_LOCK_ZOOKEEPER_PATH = 'lock/config/path';
 
     /**
      * The configuration path to save locks directory path
      *
      * @const string
      */
-    const CONFIG_PATH_LOCK_FILE_PATH = 'lock/config/path';
+    public const CONFIG_PATH_LOCK_FILE_PATH = 'lock/config/path';
 
     /**
      * The list of lock providers
@@ -134,7 +134,6 @@ class Lock implements ConfigOptionsListInterface
      */
     private $defaultConfigValues = [
         self::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_DB,
-        self::INPUT_KEY_LOCK_DB_PREFIX => null,
         self::INPUT_KEY_LOCK_ZOOKEEPER_PATH => ZookeeperLock::DEFAULT_PATH,
     ];
 
@@ -317,7 +316,10 @@ private function setDefaultConfiguration(
         string $lockProvider
     ) {
         foreach ($this->mappingInputKeyToConfigPath[$lockProvider] as $input => $path) {
-            $configData->set($path, $deploymentConfig->get($path, $this->getDefaultValue($input)));
+            // do not set default value null for lock db prefix
+            if ($input !== self::INPUT_KEY_LOCK_DB_PREFIX) {
+                $configData->set($path, $deploymentConfig->get($path, $this->getDefaultValue($input)));
+            }
         }
 
         return $configData;
@@ -333,10 +335,6 @@ private function setDefaultConfiguration(
      */
     private function getDefaultValue(string $inputKey)
     {
-        if (isset($this->defaultConfigValues[$inputKey])) {
-            return $this->defaultConfigValues[$inputKey];
-        } else {
-            return null;
-        }
+        return $this->defaultConfigValues[$inputKey] ?? null;
     }
 }