Skip to content

Commit 2219289

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop expedited
Accepted Community Pull Requests: - #29066: fix Custom Admin Domain and Internal Redirects (by @engcom-Charlie) - #29000: [MFTF] Use action group to click AdminProductGridSection.firstRow (by @Usik2203) - #28963: Remove unneccessary `overflowed` class from minicart sidebar widget (by @lumnn) - #28895: Fix issue extend match class in style-old admin (by @mrtuvn) - #28906: Remove over complicated setup for closing minicart dropdown (by @lumnn) Fixed GitHub Issues: - #28943: Custom Admin Domain and Internal Redirects (reported by @pocallaghan) has been fixed in #29066 by @engcom-Charlie in 2.4-develop branch Related commits: 1. c5b320b - #29295: [Issue] [MFTF] Use action group to click AdminProductGridSection.firstRow (reported by @m2-assistant[bot]) has been fixed in #29000 by @Usik2203 in 2.4-develop branch Related commits: 1. 43837b2 - #29160: [Issue] Remove unneccessary `overflowed` class from minicart sidebar widget (reported by @m2-assistant[bot]) has been fixed in #28963 by @lumnn in 2.4-develop branch Related commits: 1. a9c4d2a 2. 78375f0 3. 9c363fd - #24004: Less compilation problems in Magento/backend theme (reported by @hostep) has been fixed in #28895 by @mrtuvn in 2.4-develop branch Related commits: 1. e715fdc - #29161: [Issue] Remove over complicated setup for closing minicart dropdown (reported by @m2-assistant[bot]) has been fixed in #28906 by @lumnn in 2.4-develop branch Related commits: 1. 1cb5685
2 parents 5a95d1f + 4bccbb6 commit 2219289

File tree

27 files changed

+269
-179
lines changed

27 files changed

+269
-179
lines changed

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@
8989
<argument name="product" value="BundleProduct"/>
9090
</actionGroup>
9191
<waitForPageLoad stepKey="waitForProductFilterLoad"/>
92-
<click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
93-
<waitForPageLoad stepKey="waitForProductPageLoad"/>
92+
<actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnProductPage"/>
9493

9594
<!-- Change the product option title -->
9695
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="BundleOption2" stepKey="fillOptionTitle2"/>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridSectionClickFirstRowActionGroup.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminProductGridSectionClickFirstRowActionGroup">
11+
<annotations>
12+
<description>Click first row on the product grid page.</description>
13+
</annotations>
14+
15+
<click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
16+
<waitForPageLoad stepKey="waitForProductPageLoad"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@
3838
<argument name="product" value="SimpleTwo"/>
3939
</actionGroup>
4040
<waitForPageLoad stepKey="waitForFiltersToBeApplied"/>
41-
<click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
42-
<waitForPageLoad stepKey="waitForProductPageLoad"/>
41+
<actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnProductPage"/>
4342

4443
<!-- Fill out the form for the new category -->
4544
<actionGroup ref="FillNewProductCategoryActionGroup" stepKey="FillNewProductCategory">

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateAttributeTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@
4444
<seeElement selector="{{AdminProductGridSection.columnHeader('Set Product as New from Date')}}" stepKey="seeNewFromDateColumn"/>
4545
<waitForPageLoad stepKey="waitforFiltersToApply"/>
4646
<actionGroup ref="FilterProductGridBySetNewFromDateActionGroup" stepKey="filterProductGridToCheckSetAsNewColumn"/>
47-
<click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnFirstRowProductGrid"/>
48-
<waitForPageLoad stepKey="waitForProductEditPageToLoad"/>
47+
<actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnFirstRowProductGrid"/>
4948
<actionGroup ref="AdminFormSaveAndCloseActionGroup" stepKey="saveAndCloseProductForm"/>
5049
<click selector="{{AdminProductGridFilterSection.filters}}" stepKey="expandFilters"/>
5150
<seeInField selector="{{AdminProductGridFilterSection.newFromDateFilter}}" userInput="05/16/2018" stepKey="checkForNewFromDate"/>

‎app/code/Magento/Checkout/view/frontend/web/js/sidebar.js

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ define([
4242
update: function () {
4343
$(this.options.targetElement).trigger('contentUpdated');
4444
this._calcHeight();
45-
this._isOverflowed();
4645
},
4746

4847
/**
@@ -135,23 +134,6 @@ define([
135134

136135
this._on(this.element, events);
137136
this._calcHeight();
138-
this._isOverflowed();
139-
},
140-
141-
/**
142-
* Add 'overflowed' class to minicart items wrapper element
143-
*
144-
* @private
145-
*/
146-
_isOverflowed: function () {
147-
var list = $(this.options.minicart.list),
148-
cssOverflowClass = 'overflowed';
149-
150-
if (this.scrollHeight > list.innerHeight()) {
151-
list.parent().addClass(cssOverflowClass);
152-
} else {
153-
list.parent().removeClass(cssOverflowClass);
154-
}
155137
},
156138

157139
/**

‎app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -123,20 +123,6 @@ define([
123123
$('[data-block="minicart"]').find('[data-role="dropdownDialog"]').dropdownDialog('close');
124124
},
125125

126-
/**
127-
* @return {Boolean}
128-
*/
129-
closeSidebar: function () {
130-
var minicart = $('[data-block="minicart"]');
131-
132-
minicart.on('click', '[data-action="close"]', function (event) {
133-
event.stopPropagation();
134-
minicart.find('[data-role="dropdownDialog"]').dropdownDialog('close');
135-
});
136-
137-
return true;
138-
},
139-
140126
/**
141127
* @param {String} productType
142128
* @return {*|String}

‎app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,12 @@
2121
id="btn-minicart-close"
2222
class="action close"
2323
data-action="close"
24-
data-bind="attr: { title: $t('Close') }">
24+
data-bind="
25+
attr: {
26+
title: $t('Close')
27+
},
28+
click: closeMinicart()
29+
">
2530
<span translate="'Close'"/>
2631
</button>
2732

@@ -74,7 +79,6 @@
7479

7580
<ifnot args="getCartParam('summary_count')">
7681
<strong class="subtitle empty"
77-
data-bind="visible: closeSidebar()"
7882
translate="'You have no items in your shopping cart.'"
7983
/>
8084
<if args="getCartParam('cart_empty_message')">

‎app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</strong>
1616
</div>
1717
<div class="content minicart-items" data-role="content">
18-
<div class="minicart-items-wrapper overflowed">
18+
<div class="minicart-items-wrapper">
1919
<ol class="minicart-items">
2020
<each args="items()">
2121
<li class="product-item">

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckConfigurableProductAttributeValueUniquenessTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@
5050
<actionGroup ref="FilterProductGridByName2ActionGroup" stepKey="filterByName">
5151
<argument name="name" value="$$createConfigProduct.name$$"/>
5252
</actionGroup>
53-
<click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductName"/>
54-
<waitForPageLoad stepKey="waitForProductEditPageToLoad"/>
53+
<actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnProductName"/>
5554
<!--Create configurations for the product-->
5655
<comment userInput="Create configurations for the product" stepKey="createConfigurations"/>
5756
<conditionalClick selector="{{AdminProductFormConfigurationsSection.sectionHeader}}" dependentSelector="{{AdminProductFormConfigurationsSection.createConfigurations}}" visible="false" stepKey="expandConfigurationsTab1"/>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@
5757
<argument name="product" value="ApiConfigurableProduct"/>
5858
</actionGroup>
5959
<waitForPageLoad stepKey="waitForProductFilterLoad"/>
60-
<click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
61-
<waitForPageLoad stepKey="waitForProductPageLoad"/>
60+
<actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnProductPage"/>
6261

6362
<!-- Create configurations based off the Text Swatch we created earlier -->
6463
<click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations"/>

0 commit comments

Comments
 (0)