Merge branch 'MC-42750' of https://github.com/magento-l3/magento2ce into L3-PR-20211001

Author: ArtemVasyliev

app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml

@@ -19,6 +19,9 @@
         </annotations>
 
         <before>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value="customer_grid"/>
+            </actionGroup>
             <createData entity="CustomCustomerGroup" stepKey="customerGroup" />
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>

app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml

@@ -19,6 +19,9 @@
         </annotations>
 
         <before>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexAfterTest">
+                <argument name="indices" value="customer_grid"/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>
         </before>
         <after>

app/code/Magento/Customer/Test/Mftf/Test/AdminSearchCustomerAddressByKeywordTest.xml

@@ -20,7 +20,9 @@
 
         <before>
             <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="createCustomer"/>
-            <comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value="customer_grid"/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>

app/code/Magento/Customer/Test/Mftf/Test/AdminUpdateCustomerTest/AdminUpdateCustomerInfoFromDefaultToNonDefaultTest.xml

@@ -20,7 +20,9 @@
         </annotations>
         <before>
             <createData stepKey="customer" entity="Simple_Customer_Without_Address"/>
-            <comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value="customer_grid"/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>

app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridColumnHideActionGroup.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminGridColumnHideActionGroup">
+        <annotations>
+            <description>
+                Hides a column on Admin Grid page.
+            </description>
+        </annotations>
+        <arguments>
+            <argument name="columnLabel" type="string"/>
+        </arguments>
+        <click selector="{{AdminDataGridHeaderSection.columnsToggle}}" stepKey="openColumnsTab"/>
+        <uncheckOption selector="{{AdminDataGridHeaderSection.columnCheckbox(columnLabel)}}" stepKey="hideColumn"/>
+        <click selector="{{AdminDataGridHeaderSection.columnsToggle}}" stepKey="closeColumnsTab"/>
+        <dontSeeElement selector="{{AdminDataGridTableSection.columnHeader(columnLabel)}}" stepKey="dontSeeColumnInGrid"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Ui/view/base/web/js/grid/columns/date.js

@@ -48,7 +48,7 @@ define([
 
             date = moment.utc(this._super());
 
-            if (!_.isUndefined(this.timezone)) {
+            if (!_.isUndefined(this.timezone) && moment.tz.zone(this.timezone) !== null) {
                 date = date.tz(this.timezone);
             }