🔃 [Magento Community Engineering] Community Contributions - 2.4.1-develop latest changes

slavvka · web-flow · commit f8b9214abc75 · 2020-05-21T01:17:52.000-05:00
Accepted Community Pull Requests: - #28083: Fix issue button used action-primary class changed color if click outside (by @mrtuvn) - #28039: StorefrontLoginWithIncorrectCredentialsTest refactored (by @ajithkumar-maragathavel) - #28084: Fix inconsistent visual labels form login in theme blank (by @mrtuvn) - #28032: Fix icon advance attributes properties not change (by @mrtuvn) - #27670: [MFTF] remove redundunt ActionGroup (by @Usik2203) Fixed GitHub Issues: - #27095: In Floating cart delete pop-up, When user click on out side of OK button than button color is changed. (reported by @dipeshrangani) has been fixed in #28083 by @mrtuvn in 2.4.1-develop branch Related commits: 1. d7cf188 2. 77a4e8c 3. 6b8fc4c 4. facbe37 5. 1ef8a51 6. 6e81906 7. 03a2908 8. 8c0eff0 9. 0e84ed4 10. 63550be 11. e3975c6 12. b285342 13. 1b8199a 14. b8e26ce 15. cc3f6a0 16. 628f7d5 - #28059: Missaligned fields on the Customer Login form (reported by @gjportegies) has been fixed in #28084 by @mrtuvn in 2.4.1-develop branch Related commits: 1. d7cf188 2. 77a4e8c 3. 6b8fc4c 4. facbe37 5. 1ef8a51 6. 6e81906 7. 03a2908 8. 8c0eff0 9. 0e84ed4 10. 63550be 11. e3975c6 12. d68fa5d 13. 63552f8 14. 80c6ba7 - #22702: Toggle icon not working in create configuration Product creation Page (reported by @nehaguptacedcoss) has been fixed in #28032 by @mrtuvn in 2.4.1-develop branch Related commits: 1. d7cf188 2. 77a4e8c 3. 6b8fc4c 4. facbe37 5. 1ef8a51 6. 6e81906 7. 03a2908 8. 8c0eff0 9. 0e84ed4 10. 63550be 11. 321f5c1 12. 13fe206 13. aae2b7f 14. 2c88396 15. cfec001 - #26022: Admin attributes Advanced Attribute Properties icon doesn't change while collapsing block (reported by @speedy008) has been fixed in #28032 by @mrtuvn in 2.4.1-develop branch Related commits: 1. d7cf188 2. 77a4e8c 3. 6b8fc4c 4. facbe37 5. 1ef8a51 6. 6e81906 7. 03a2908 8. 8c0eff0 9. 0e84ed4 10. 63550be 11. 321f5c1 12. 13fe206 13. aae2b7f 14. 2c88396 15. cfec001
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/template/variations/steps/summary-grid.html b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/template/variations/steps/summary-grid.html
@@ -5,14 +5,14 @@
  */
 -->
 
-<div class="admin__collapsible-block-wrapper opened">
-    <div class="fieldset-wrapper-title">
+<div class="fieldset-wrapper admin__collapsible-block-wrapper opened" data-bind="mageInit: {'collapsible':{'active':true,'openedState':'opened'}}">
+    <div class="fieldset-wrapper-title toggle" data-role="title">
         <strong class="admin__collapsible-title" data-toggle="collapse" data-bind="attr:{'data-target': '#'+id}">
             <span data-bind="text: title"></span>
         </strong>
     </div>
 
-    <div class="fieldset-wrapper-content in collapse" data-collapsed="true" data-bind="attr: {id: id}">
+    <div class="fieldset-wrapper-content in collapse" data-role="content" data-collapsed="true" data-bind="attr: {id: id}">
         <!-- ko template: {
             name: "ui/grid/paging/paging", data: paging
             } -->
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontLoginWithIncorrectCredentialsTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontLoginWithIncorrectCredentialsTest.xml
@@ -26,10 +26,14 @@
             <deleteData stepKey="deleteCustomer" createDataKey="customer" />
         </after>
 
-        <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
-        <fillField  stepKey="fillEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
-        <fillField  stepKey="fillPassword" userInput="$$customer.password$$INVALID" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
-        <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
-        <see stepKey="seeErrorMessage" selector="{{StorefrontCustomerLoginMessagesSection.errorMessage}}" userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later."/>
+        <actionGroup ref="StorefrontOpenCustomerLoginPageActionGroup" stepKey="goToSignInPage"/>
+        <actionGroup ref="StorefrontFillCustomerLoginFormWithWrongPasswordActionGroup" stepKey="fillLoginFormWithCustomerData">
+            <argument name="customer" value="$$customer$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButtonFirstAttempt"/>
+        <actionGroup ref="AssertMessageCustomerLoginActionGroup" stepKey="seeErrorMessageAfterFirstAttempt">
+            <argument name="messageType" value="error"/>
+            <argument name="message" value="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontClickOnMiniCartActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontClickOnMiniCartActionGroup.xml
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
@@ -122,11 +122,6 @@
                 &:before {
                     content: @icon-expand-close__content;
                 }
-                &.active {
-                    &:before {
-                        content: @icon-expand-open__content;
-                    }
-                }
             }
         }
 
diff --git a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
@@ -414,8 +414,6 @@
             &:extend(.abs-blocks-2columns all);
             .login {
                 .actions-toolbar {
-                    margin-left: 0;
-
                     > .primary {
                         margin-bottom: 0;
                         margin-right: @indent__l;
@@ -430,19 +428,8 @@
 
         .fieldset {
             &:after {
-                margin-left: 0;
                 &:extend(.abs-margin-for-forms-desktop all);
             }
-
-            > .field {
-                > .control {
-                    width: 80%;
-                }
-
-                .label {
-                    text-align: left;
-                }
-            }
         }
     }
 
diff --git a/app/design/frontend/Magento/blank/web/css/source/_buttons.less b/app/design/frontend/Magento/blank/web/css/source/_buttons.less
@@ -25,7 +25,8 @@
         .lib-link-as-button();
     }
 
-    .action.primary {
+    .action.primary,
+    .action-primary {
         .lib-button-primary();
     }
 }
diff --git a/app/design/frontend/Magento/luma/web/css/source/_buttons.less b/app/design/frontend/Magento/luma/web/css/source/_buttons.less
@@ -17,7 +17,7 @@
 
     button {
         &:not(.primary) {
-            .lib-css(box-shadow, @button__shadow);
+            .lib-css(box-shadow, none);
 
             &:active {
                 .lib-css(box-shadow, @button__shadow-active);
@@ -39,7 +39,8 @@
         .lib-link-as-button();
     }
 
-    .action.primary {
+    .action.primary,
+    .action-primary {
         .lib-button-primary();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -122,11 +122,6 @@`
`122`	`122`	`&:before {`
`123`	`123`	`content: @icon-expand-close__content;`
`124`	`124`	`}`
`125`		`- &.active {`
`126`		`- &:before {`
`127`		`- content: @icon-expand-open__content;`
`128`		`- }`
`129`		`- }`
`130`	`125`	`}`
`131`	`126`	`}`
`132`	`127`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@`
`25`	`25`	`.lib-link-as-button();`
`26`	`26`	`}`
`27`	`27`
`28`		`- .action.primary {`
	`28`	`+ .action.primary,`
	`29`	`+ .action-primary {`
`29`	`30`	`.lib-button-primary();`
`30`	`31`	`}`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`
`18`	`18`	`button {`
`19`	`19`	`&:not(.primary) {`
`20`		`- .lib-css(box-shadow, @button__shadow);`
	`20`	`+ .lib-css(box-shadow, none);`
`21`	`21`
`22`	`22`	`&:active {`
`23`	`23`	`.lib-css(box-shadow, @button__shadow-active);`
`@@ -39,7 +39,8 @@`
`39`	`39`	`.lib-link-as-button();`
`40`	`40`	`}`
`41`	`41`
`42`		`- .action.primary {`
	`42`	`+ .action.primary,`
	`43`	`+ .action-primary {`
`43`	`44`	`.lib-button-primary();`
`44`	`45`	`}`
`45`	`46`	`}`