Skip to content

Commit ec4c33b

Browse files
glo71317glo71317
committed
Merge remote-tracking branch 'origin/2.4-develop' into AC-12025
2 parents aa92c07 + 0c53bbf commit ec4c33b

File tree

630 files changed

+7219
-4467
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

630 files changed

+7219
-4467
lines changed

‎app/code/Magento/Backend/Block/Media/Uploader.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public function getImageUploadMaxHeight()
145145
*/
146146
protected function _prepareLayout()
147147
{
148-
$this->pageConfig->addPageAsset('jquery/fileUploader/css/jquery.fileupload-ui.css');
148+
$this->pageConfig->addPageAsset('jquery/uppy/dist/uppy.fileupload-ui.css');
149149
return parent::_prepareLayout();
150150
}
151151

‎app/code/Magento/Backend/ViewModel/RequireJsConfigModifierInterface.php‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?php
2+
/**
3+
* Copyright 2024 Adobe
4+
* All Rights Reserved.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\Backend\ViewModel;
9+
10+
/**
11+
* View model interface for requirejs configuration modifier
12+
*/
13+
interface RequireJsConfigModifierInterface
14+
{
15+
/**
16+
* Modifies requirejs configuration
17+
*
18+
* @param array $config requirejs configuration
19+
* @return array
20+
*/
21+
public function modify(array $config): array;
22+
}

‎app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,20 @@
55
*/
66

77
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
8+
/** @var \Magento\Backend\Block\Page\RequireJs $block */
9+
10+
$requireJsConfig = [
11+
'baseUrl' => $block->getViewFileUrl('/'),
12+
];
13+
14+
$configModifier = $block->getConfigModifier();
15+
$requireJsConfig = $configModifier instanceof \Magento\Backend\ViewModel\RequireJsConfigModifierInterface
16+
? $configModifier->modify($requireJsConfig)
17+
: $requireJsConfig;
818

919
$scriptString = '
1020
var BASE_URL = \'' . /* @noEscape */ $block->getUrl('*') . '\';
1121
var FORM_KEY = \'' . /* @noEscape */ $block->getFormKey() . '\';
12-
var require = {
13-
\'baseUrl\': \'' . /* @noEscape */ $block->getViewFileUrl('/') . '\'
14-
};';
15-
16-
echo /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false);
22+
var require = ' . /* @noEscape */ json_encode($requireJsConfig) .';';
23+
?>
24+
<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="openCheckoutPage"/>
7878
<!-- Click next button to open payment section -->
7979
<actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/>
80+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectDefaultPaymentMethod"/>
8081
<!-- Click place order -->
8182
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="placeOrder"/>
8283
<actionGroup ref="StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup" stepKey="clickOrderLink"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="openCheckoutPage"/>
8080
<!--Click next button to open payment section-->
8181
<actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/>
82+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectDefaultPaymentMethod"/>
8283
<!--Click place order-->
8384
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="placeOrder"/>
8485
<actionGroup ref="StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup" stepKey="clickOrderLink"/>

‎app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows.js‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -71,25 +71,19 @@ define([
7171
* @param {Number|String} index - element index
7272
*/
7373
removeBundleItemsFromOption: function (index) {
74-
var bundleSelections = registry.get(this.name + '.' + index + '.' + this.bundleSelectionsName),
75-
bundleSelectionsLength = (bundleSelections.elems() || []).length,
76-
i;
74+
let bundleSelections = registry.get(this.name + '.' + index + '.' + this.bundleSelectionsName);
7775

78-
if (bundleSelectionsLength) {
79-
for (i = 0; i < bundleSelectionsLength; i++) {
80-
bundleSelections.elems()[0].destroy();
81-
}
82-
}
76+
bundleSelections.destroyChildren();
8377
},
8478

8579
/**
8680
* {@inheritdoc}
8781
*/
8882
processingAddChild: function (ctx, index, prop) {
8983
var recordIds = _.map(this.recordData(), function (rec) {
90-
return parseInt(rec['record_id'], 10);
91-
}),
92-
maxRecordId = _.max(recordIds);
84+
return parseInt(rec['record_id'], 10);
85+
}),
86+
maxRecordId = _.max(recordIds);
9387

9488
prop = maxRecordId > -1 ? maxRecordId + 1 : prop;
9589
this._super(ctx, index, prop);

‎app/code/Magento/Catalog/Controller/Product/Compare/Index.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77
namespace Magento\Catalog\Controller\Product\Compare;
88

9-
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
109
use Magento\Catalog\Api\ProductRepositoryInterface;
10+
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
1111
use Magento\Framework\Data\Form\FormKey\Validator;
1212
use Magento\Framework\View\Result\PageFactory;
1313

@@ -81,6 +81,8 @@ public function execute()
8181
$this->_catalogSession->setBeforeCompareUrl(
8282
$this->urlDecoder->decode($beforeUrl)
8383
);
84+
} else {
85+
$this->_catalogSession->unsBeforeCompareUrl();
8486
}
8587
return $this->resultPageFactory->create();
8688
}

‎app/code/Magento/Catalog/CustomerData/CompareProducts.php‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Magento\Framework\App\Config\ScopeConfigInterface;
1010
use Magento\Framework\App\ObjectManager;
1111
use Magento\Framework\Exception\LocalizedException;
12+
use Magento\Framework\UrlInterface;
1213
use Magento\Store\Model\StoreManagerInterface;
1314

1415
/**
@@ -43,25 +44,33 @@ class CompareProducts implements SectionSourceInterface
4344
*/
4445
private $storeManager;
4546

47+
/**
48+
* @var UrlInterface
49+
*/
50+
private $urlBuilder;
51+
4652
/**
4753
* @param \Magento\Catalog\Helper\Product\Compare $helper
4854
* @param \Magento\Catalog\Model\Product\Url $productUrl
4955
* @param \Magento\Catalog\Helper\Output $outputHelper
5056
* @param ScopeConfigInterface|null $scopeConfig
5157
* @param StoreManagerInterface|null $storeManager
58+
* @param UrlInterface|null $urlBuilder
5259
*/
5360
public function __construct(
5461
\Magento\Catalog\Helper\Product\Compare $helper,
5562
\Magento\Catalog\Model\Product\Url $productUrl,
5663
\Magento\Catalog\Helper\Output $outputHelper,
5764
?ScopeConfigInterface $scopeConfig = null,
58-
?StoreManagerInterface $storeManager = null
65+
?StoreManagerInterface $storeManager = null,
66+
?UrlInterface $urlBuilder = null
5967
) {
6068
$this->helper = $helper;
6169
$this->productUrl = $productUrl;
6270
$this->outputHelper = $outputHelper;
6371
$this->scopeConfig = $scopeConfig ?? ObjectManager::getInstance()->get(ScopeConfigInterface::class);
6472
$this->storeManager = $storeManager ?? ObjectManager::getInstance()->get(StoreManagerInterface::class);
73+
$this->urlBuilder = $urlBuilder ?? ObjectManager::getInstance()->get(UrlInterface::class);
6574
}
6675

6776
/**
@@ -73,7 +82,7 @@ public function getSectionData()
7382
return [
7483
'count' => $count,
7584
'countCaption' => $count == 1 ? __('1 item') : __('%1 items', $count),
76-
'listUrl' => $this->helper->getListUrl(),
85+
'listUrl' => $this->urlBuilder->getUrl('catalog/product_compare/index'),
7786
'items' => $count ? $this->getItems() : [],
7887
'websiteId' => $this->storeManager->getWebsite()->getId()
7988
];

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminAddOptionsForProductAttributeActionGroup">
12+
<annotations>
13+
<description>Click on new value of selector attribute and fill the values for storefront view, and admin product edit page</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="adminAttributeFirstRowValue" defaultValue="Blue" type="string" />
17+
<argument name="adminAttributeSecondRowValue" defaultValue="Yellow" type="string" />
18+
<argument name="storeViewAttributeFirstRowValue" defaultValue="Blau" type="string" />
19+
<argument name="storeViewAttributeSecondRowValue" defaultValue="Gelb" type="string" />
20+
<argument name="firstRow" defaultValue="0" type="string"/>
21+
<argument name="secondRow" defaultValue="1" type="string"/>
22+
</arguments>
23+
<scrollTo selector="{{AdminCreateNewProductAttributeSection.addValue}}" stepKey="scrollToOption"/>
24+
<waitForElementClickable selector="{{AdminCreateNewProductAttributeSection.addValue}}" stepKey="waitForAddButtonToBeClickable"/>
25+
<click selector="{{AdminCreateNewProductAttributeSection.addValue}}" stepKey="clickOnAddValueButton"/>
26+
<waitForElementVisible selector="{{AdminCreateNewProductAttributeSection.adminOption(firstRow)}}" stepKey="waitForFirstAdminAttributeFieldToVisible"/>
27+
<fillField selector="{{AdminCreateNewProductAttributeSection.adminOption(firstRow)}}" userInput="{{adminAttributeFirstRowValue}}" stepKey="fillFirstRowAdminField"/>
28+
<waitForElementVisible selector="{{AdminCreateNewProductAttributeSection.firstOptionStoreView}}" stepKey="waitForFirstRowCustomAttributeFieldToVisible"/>
29+
<fillField selector="{{AdminCreateNewProductAttributeSection.firstOptionStoreView}}" userInput="{{storeViewAttributeFirstRowValue}}" stepKey="fillFirstRowCustomField"/>
30+
<waitForElementClickable selector="{{AdminCreateNewProductAttributeSection.addValue}}" stepKey="againWaitForAddButtonToBeClickable"/>
31+
<click selector="{{AdminCreateNewProductAttributeSection.addValue}}" stepKey="againClickOnAddValueButton"/>
32+
<waitForElementVisible selector="{{AdminCreateNewProductAttributeSection.adminOption(secondRow)}}" stepKey="waitForSecondRowAdminAttributeFieldToVisible"/>
33+
<fillField selector="{{AdminCreateNewProductAttributeSection.adminOption(secondRow)}}" userInput="{{adminAttributeSecondRowValue}}" stepKey="fillSecondRowAdminField"/>
34+
<waitForElementVisible selector="{{AdminCreateNewProductAttributeSection.secondOptionStoreView}}" stepKey="waitForSecondRowCustomAttributeFieldToVisible"/>
35+
<fillField selector="{{AdminCreateNewProductAttributeSection.secondOptionStoreView}}" userInput="{{storeViewAttributeSecondRowValue}}" stepKey="fillSecondRowCustomField"/>
36+
</actionGroup>
37+
</actionGroups>

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

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminCreateProductAttributeWithCustomChangesActionGroup">
12+
<annotations>
13+
<description>Creating a product attribute with required custom changes.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="defaultLabel" type="string" defaultValue="Text_EN"/>
17+
<argument name="attributeType" type="string" defaultValue="text"/>
18+
<argument name="tabName" type="string" defaultValue="Manage Labels"/>
19+
<argument name="labelName" type="string" defaultValue="Text_DE"/>
20+
<argument name="catalogType" type="string" defaultValue="Yes"/>
21+
</arguments>
22+
23+
<amOnPage url="{{ProductAttributePage.url}}" stepKey="goToNewProductAttributePage"/>
24+
<waitForPageLoad stepKey="waitForAttributePageLoad"/>
25+
<waitForElementVisible selector="{{AttributePropertiesSection.DefaultLabel}}" stepKey="waitForDefaultLabelFieldToBeVisible"/>
26+
<fillField selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{defaultLabel}}" stepKey="fillDefaultLabel"/>
27+
<waitForElement selector="{{AttributePropertiesSection.InputType}}" stepKey="waitForInputTypeElement"/>
28+
<selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="{{attributeType}}" stepKey="selectInputType"/>
29+
<waitForElementClickable selector="{{AdminEditProductAttributesSection.tabButton(tabName)}}" stepKey="waitForManageLabelElementToBeClickable"/>
30+
<click selector="{{AdminEditProductAttributesSection.tabButton(tabName)}}" stepKey="clickManageLabel"/>
31+
<waitForElementVisible selector="{{AdminProductAttributeManageLabelsSection.customStoreLabel}}" stepKey="waitForCustomStoreViewLabelToBeVisible"/>
32+
<fillField selector="{{AdminProductAttributeManageLabelsSection.customStoreLabel}}" userInput="{{labelName}}" stepKey="fillCustomStoreViewLabel"/>
33+
<waitForElementClickable selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="waitForStorefrontPropertiesTabToBeClickable"/>
34+
<click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="clickStorefrontPropertiesTab"/>
35+
<waitForElement selector="{{StorefrontPropertiesSection.visibleOnCatalogPagesOnStorefront}}" stepKey="waitForVisibleOnCatalogElement"/>
36+
<selectOption selector="{{StorefrontPropertiesSection.visibleOnCatalogPagesOnStorefront}}" userInput="{{catalogType}}" stepKey="enableVisibleOnStorefront"/>
37+
<waitForElementVisible selector="{{AttributePropertiesSection.Save}}" stepKey="waitForSaveButton"/>
38+
<click selector="{{AttributePropertiesSection.Save}}" stepKey="clickSaveButton"/>
39+
<waitForPageLoad stepKey="waitForAttributeToSave"/>
40+
</actionGroup>
41+
</actionGroups>

0 commit comments

Comments
 (0)