🔃 [Magento Community Engineering] Community Contributions - 2.4-develop

Accepted Community Pull Requests:
 - #27896: ui select list visible even though it is disabled (by @Mohamed-Asar)
 - #28689: #28431 issue fixed (by @syed-ziffity)
 - #29771: Remove space between textarea field in contact form (by @mrtuvn)
 - #29278: Resolve Can not export Coupon Code to CSV,XML issue29277 (by @edenduong)
 - #29861: Fix issue with saving filters from url-applier to default view of bookmark (by @Nazar65)
 - #29913: Removed redundant less styles navigation in blank theme (by @mrtuvn)
 - #29856: removed redundant and clean code less (by @mrtuvn)
 - #29276: Redirect to "Options" config path more accurate (in Currency Rate form) (by @edenduong)


Fixed GitHub Issues:
 - #29098: [Issue] ui select list visible even though it is disabled (reported by @m2-assistant[bot]) has been fixed in #27896 by @Mohamed-Asar in 2.4-develop branch
   Related commits:
     1. 6ba9fff
     2. 2e75bae
     3. 66ee024

 - #28431: REST API Bundle Product Details Price Issue (reported by @mack4hack) has been fixed in #28689 by @syed-ziffity in 2.4-develop branch
   Related commits:
     1. 8974e16
     2. e962d7c
     3. 2178617
     4. 7f4eccb
     5. 34a6433
     6. 1d82b50

 - #29779: [Issue] Remove space between textarea field in contact form (reported by @m2-assistant[bot]) has been fixed in #29771 by @mrtuvn in 2.4-develop branch
   Related commits:
     1. 16f97b0

 - #29277: Can not export Coupon Code to CSV,XML (reported by @edenduong) has been fixed in #29278 by @edenduong in 2.4-develop branch
   Related commits:
     1. ca09097
     2. c82e68f
     3. e04514e
     4. af02e48
     5. c379cea

 - #1789: Merchant beta release date? (reported by @CRYX2) has been fixed in #29861 by @Nazar65 in 2.4-develop branch
   Related commits:
     1. 04a9f44
     2. 47b5eea

 - #29914: [Issue] Removed redundant less styles navigation in blank theme (reported by @m2-assistant[bot]) has been fixed in #29913 by @mrtuvn in 2.4-develop branch
   Related commits:
     1. 1b76317

 - #29857: [Issue] removed redundant and clean code less (reported by @m2-assistant[bot]) has been fixed in #29856 by @mrtuvn in 2.4-develop branch
   Related commits:
     1. c1cac89

 - #29336: [Issue] Redirect to "Options" config path more accurate (in Currency Rate form) (reported by @m2-assistant[bot]) has been fixed in #29276 by @edenduong in 2.4-develop branch
   Related commits:
     1. 37e5e15
     2. dc8a387
     3. 2ffc03f
     4. 1e8f523

Author: gabrieldagama

app/code/Magento/Bundle/Model/Product/LinksList.php

@@ -39,6 +39,8 @@ public function __construct(
     }
 
     /**
+     * Bundle Product Items Data
+     *
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @param int $optionId
      * @return \Magento\Bundle\Api\Data\LinkInterface[]
@@ -50,8 +52,12 @@ public function getItems(\Magento\Catalog\Api\Data\ProductInterface $product, $o
         $productLinks = [];
         /** @var \Magento\Catalog\Model\Product $selection */
         foreach ($selectionCollection as $selection) {
+            $bundledProductPrice = $selection->getSelectionPriceValue();
+            if ($bundledProductPrice <= 0) {
+                $bundledProductPrice = $selection->getPrice();
+            }
             $selectionPriceType = $product->getPriceType() ? $selection->getSelectionPriceType() : null;
-            $selectionPrice = $product->getPriceType() ? $selection->getSelectionPriceValue() : null;
+            $selectionPrice = $bundledProductPrice ? $bundledProductPrice : null;
 
             /** @var \Magento\Bundle\Api\Data\LinkInterface $productLink */
             $productLink = $this->linkFactory->create();

app/code/Magento/Bundle/Test/Unit/Model/Product/LinksListTest.php

@@ -91,7 +91,7 @@ public function testLinksList()
             ->method('getSelectionsCollection')
             ->with([$optionId], $this->productMock)
             ->willReturn([$this->selectionMock]);
-        $this->productMock->expects($this->exactly(2))->method('getPriceType')->willReturn('price_type');
+        $this->productMock->expects($this->once())->method('getPriceType')->willReturn('price_type');
         $this->selectionMock->expects($this->once())
             ->method('getSelectionPriceType')
             ->willReturn('selection_price_type');

app/code/Magento/Contact/view/frontend/templates/form.phtml

@@ -69,8 +69,8 @@ $viewModel = $block->getViewModel();
                           class="input-text"
                           cols="5"
                           rows="3"
-                          data-validate="{required:true}"><?= $block->escapeHtml($viewModel->getUserComment()) ?>
-                </textarea>
+                          data-validate="{required:true}"
+                ><?= $block->escapeHtml($viewModel->getUserComment()) ?></textarea>
             </div>
         </div>
         <?= $block->getChildHtml('form.additional.info') ?>

app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php

@@ -41,7 +41,14 @@ protected function _prepareLayout()
             ]
         );
 
-        $onClick = "setLocation('" . $this->getUrl('adminhtml/system_config/edit/section/currency') . "')";
+        $currencyOptionPath = $this->getUrl(
+            'adminhtml/system_config/edit',
+            [
+                'section' => 'currency',
+                '_fragment' => 'currency_options-link'
+            ]
+        );
+        $onClick = "setLocation('$currencyOptionPath')";
 
         $this->getToolbar()->addChild(
             'options_button',

app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminNavigateToCurrencyRatesOptionActionGroup.xml

@@ -0,0 +1,15 @@
+<?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="AdminNavigateToCurrencyRatesOptionActionGroup">
+        <click selector="{{AdminCurrencyRatesSection.options}}" stepKey="clickOptionsButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/CurrencySymbol/Test/Mftf/Section/AdminCurrencyRatesSection.xml

@@ -11,6 +11,7 @@
     <section name="AdminCurrencyRatesSection">
         <element name="import" type="button" selector="//button[@title='Import']"/>
         <element name="saveCurrencyRates" type="button" selector="//button[@title='Save Currency Rates']"/>
+        <element name="options" type="button" selector="//button[@title='Options']"/>
         <element name="oldRate" type="text" selector="//div[contains(@class, 'admin__field-note') and contains(text(), 'Old rate:')]/strong"/>
         <element name="rateService" type="select" selector="#rate_services"/>
         <element name="currencyRate" type="input" selector="input[name='rate[{{fistCurrency}}][{{secondCurrency}}]']" parameterized="true"/>

app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminCurrencyOptionsSystemConfigExpandedTabTest.xml

@@ -0,0 +1,37 @@
+<?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="AdminCurrencyOptionsSystemConfigExpandedTabTest">
+        <annotations>
+            <features value="Expanded tab on Currency Option page"/>
+            <stories value="Expanded tab"/>
+            <title value=" Verify the Currency Option tab expands automatically."/>
+            <description value="Check auto open the collapse on Currency Option page."/>
+            <severity value="MINOR"/>
+            <testCaseId value="MC-37425"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresCurrencyRatesPage">
+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuStoresCurrencyCurrencyRates.dataUiId}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminNavigateToCurrencyRatesOptionActionGroup" stepKey="navigateToOptions" />
+        <grabAttributeFrom selector="{{CurrencySetupSection.currencyOptions}}" userInput="class" stepKey="grabClass"/>
+        <assertStringContainsString stepKey="assertClass">
+            <actualResult type="string">{$grabClass}</actualResult>
+            <expectedResult type="string">open</expectedResult>
+        </assertStringContainsString>
+    </test>
+</tests>

app/code/Magento/CurrencySymbol/Test/Unit/Block/Adminhtml/System/CurrencyTest.php

@@ -7,15 +7,22 @@
 
 namespace Magento\CurrencySymbol\Test\Unit\Block\Adminhtml\System;
 
+use Magento\Backend\Block\Template\Context;
 use Magento\Backend\Block\Widget\Button;
 use Magento\CurrencySymbol\Block\Adminhtml\System\Currency;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\BlockInterface;
 use Magento\Framework\View\LayoutInterface;
 use PHPUnit\Framework\TestCase;
+use Magento\Framework\UrlInterface;
 
 class CurrencyTest extends TestCase
 {
+    /**
+     * Stub currency option link url
+     */
+    const STUB_OPTION_LINK_URL = 'https://localhost/admin/system_config/edit/section/currency#currency_options-link';
+
     /**
      * Object manager helper
      *
@@ -70,12 +77,25 @@ public function testPrepareLayout()
                 ]
             );
 
+        $contextMock = $this->createMock(Context::class);
+        $urlBuilderMock = $this->createMock(UrlInterface::class);
+
+        $contextMock->expects($this->once())->method('getUrlBuilder')->willReturn($urlBuilderMock);
+
+        $urlBuilderMock->expects($this->once())->method('getUrl')->with(
+            'adminhtml/system_config/edit',
+            [
+                'section' => 'currency',
+                '_fragment' => 'currency_options-link'
+            ]
+        )->willReturn(self::STUB_OPTION_LINK_URL);
+
         $childBlockMock->expects($this->at(1))
             ->method('addChild')
             ->with(
                 'options_button',
                 Button::class,
-                ['label' => __('Options'), 'onclick' => 'setLocation(\'\')']
+                ['label' => __('Options'), 'onclick' => 'setLocation(\''.self::STUB_OPTION_LINK_URL.'\')']
             );
 
         $childBlockMock->expects($this->at(2))
@@ -90,7 +110,8 @@ public function testPrepareLayout()
         $block = $this->objectManagerHelper->getObject(
             Currency::class,
             [
-                'layout' => $layoutMock
+                'layout' => $layoutMock,
+                'context' => $contextMock
             ]
         );
         $block->setLayout($layoutMock);

app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCouponsCsv.php

@@ -15,13 +15,14 @@
 use Magento\Framework\View\Result\Layout;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
 /**
  * Export Coupons to csv file
  *
  * Class \Magento\SalesRule\Controller\Adminhtml\Promo\Quote\ExportCouponsCsv
  */
-class ExportCouponsCsv extends Quote implements HttpGetActionInterface
+class ExportCouponsCsv extends Quote implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * Export coupon codes as CSV file

app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCouponsXml.php

@@ -15,13 +15,14 @@
 use Magento\Framework\View\Result\Layout;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
 /**
  * Export coupons to xml file
  *
  * Class \Magento\SalesRule\Controller\Adminhtml\Promo\Quote\ExportCouponsXml
  */
-class ExportCouponsXml extends Quote implements HttpGetActionInterface
+class ExportCouponsXml extends Quote implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * Export coupon codes as excel xml file

app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js

@@ -668,7 +668,7 @@ define([
          * @returns {Object} Chainable
          */
         toggleListVisible: function () {
-            this.listVisible(!this.listVisible());
+            this.listVisible(!this.disabled() && !this.listVisible());
 
             return this;
         },

app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js

@@ -13,10 +13,12 @@ define([
     return Component.extend({
         defaults: {
             listingNamespace: null,
+            bookmarkProvider: 'componentType = bookmark, ns = ${ $.listingNamespace }',
             filterProvider: 'componentType = filters, ns = ${ $.listingNamespace }',
             filterKey: 'filters',
             searchString: location.search,
             modules: {
+                bookmarks: '${ $.bookmarkProvider }',
                 filterComponent: '${ $.filterProvider }'
             }
         },
@@ -49,6 +51,16 @@ define([
                 return;
             }
 
+            if (!_.isUndefined(this.bookmarks())) {
+                if (!_.size(this.bookmarks().getViewData(this.bookmarks().defaultIndex))) {
+                    setTimeout(function () {
+                        this.apply();
+                    }.bind(this), 500);
+
+                    return;
+                }
+            }
+
             if (Object.keys(urlFilter).length) {
                 applied = this.filterComponent().get('applied');
                 filters = $.extend({}, applied, urlFilter);

app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/components/_currency-addon.less

@@ -18,15 +18,10 @@
 //  _____________________________________________
 
 .currency-addon {
+    .lib-vendor-prefix-display(inline-flex);
     border: 1px solid rgb(173,173,173);
-    position: relative;
-    display: -webkit-inline-flex;
-    display: -ms-inline-flexbox;
-    display: inline-flex;
-    -webkit-flex-direction: row;
-    -ms-flex-direction: row;
-    flex-direction: row;
     flex-flow: row nowrap;
+    position: relative;
     width: 100%;
 
     .admin__control-text {