Skip to content

Commit 18da36b

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop
Accepted Community Pull Requests: - #29576: Add suport of reading PNG JPEG Exif metadata (by @Nazar65) - #29429: Fix ui-select options placeholders for url-filter-applier (by @Nazar65) - #29400: #1703: The deleted tags are not removed from Tags drop-down until the web page is refreshed (by @yolouiese) - #29433: Reorganize Media Gallery stores configuration UI (by @konarshankar07) - #29494: #1748: Some category grid columns are empty (by @joweecaquicla) - #29461: #1727: Introduce internal class wrapping SplFileInfo (by @joweecaquicla) - #29491: #1712: Remove DataObject usage from OpenDialogUrl provider (by @joweecaquicla) - #29458: magento/web-api-test-recursive-array-comparison (by @bricht) - #29511: #29496 :- UI : Time field element in admin (by @konarshankar07) - #29483: fix fatal error when exception was thrown (by @rafal-kos) - #27478: improve exception handling in Layout render (by @fsw) - #29413: Fix #24060 - Terms and Conditions label doesn't fit longer texts (by @Bartlomiejsz) - #29452: Fix date timestamp typo ( Created and Modified date are different for newly saved Image Preview) (by @Nazar65) - #29410: Changed misunderstanding title (by @angelo983) - #29435: #1711: Use product model instead of data object for catalog image helper init (by @jmonteros422) Fixed GitHub Issues: - #1449: Duplicated attributes in sidebar when installing with sample data (reported by @markoshust) has been fixed in #29576 by @Nazar65 in 2.4-develop branch Related commits: 1. a74d422 2. 9b8c81c 3. 5c7c959 4. 4ef4c6c 5. 4a7fbd7 6. 5e07290 7. 0830d38 8. c29e740 9. bed58c5 10. 58fbad4 11. 9a74037 12. 583b013 - #1694: Remove / Edit Item in minicart does not work if span css is changed (reported by @Zaylril) has been fixed in #29429 by @Nazar65 in 2.4-develop branch Related commits: 1. 4ebe9d6 - #1755: why i disable all caches and enable xdebug that cause magento very slow? (reported by @LifeAsBook) has been fixed in #29429 by @Nazar65 in 2.4-develop branch Related commits: 1. 4ebe9d6 - #1703: when multiple productInterface implement which to use (reported by @LifeAsBook) has been fixed in #29400 by @yolouiese in 2.4-develop branch Related commits: 1. b2b45e6 2. c716884 3. 9a2f265 4. 8d9d0a5 5. 512942e 6. 7e34bc9 7. 0f9189e 8. c4055cc 9. 3b350fd 10. bf77de0 11. 5f1d43a - #1738: Where the relevant information about the template <!--ko--> (reported by @LifeAsBook) has been fixed in #29433 by @konarshankar07 in 2.4-develop branch Related commits: 1. 3633542 2. 651bd69 3. 8b592ee 4. 3fc2303 5. e76cb95 6. 1fe9c22 7. de6d2a7 - #29498: [Issue] magento/web-api-test-recursive-array-comparison (reported by @m2-assistant[bot]) has been fixed in #29458 by @bricht in 2.4-develop branch Related commits: 1. 9cf55e5 2. 289af76 - #29496: UI : Time field element in admin (reported by @sankalpshekhar) has been fixed in #29511 by @konarshankar07 in 2.4-develop branch Related commits: 1. 23b5a24 2. 3723b61 - #29525: [Issue] fix fatal error when exception was thrown (reported by @m2-assistant[bot]) has been fixed in #29483 by @rafal-kos in 2.4-develop branch Related commits: 1. 8b8e496 - #29606: [Issue] improve exception handling in Layout render (reported by @m2-assistant[bot]) has been fixed in #27478 by @fsw in 2.4-develop branch Related commits: 1. 9565c44 2. ab74f29 3. c30dd60 - #24060: Terms and Conditions label doesn't fit longer texts (reported by @DanieliMi) has been fixed in #29413 by @Bartlomiejsz in 2.4-develop branch Related commits: 1. 5a0680c - #29416: [Issue] Changed misunderstanding title (reported by @m2-assistant[bot]) has been fixed in #29410 by @angelo983 in 2.4-develop branch Related commits: 1. 209018c 2. afdcc93 3. e2b6d33 - #1711: Clear static content when enabling new module from CLI (reported by @markoshust) has been fixed in #29435 by @jmonteros422 in 2.4-develop branch Related commits: 1. 11d0a35 2. 25133c5 3. c72447f 4. 73d032f 5. 36427dc
2 parents bdde24b + 1adcc4a commit 18da36b

File tree

66 files changed

+1329
-266
lines changed

Some content is hidden

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

66 files changed

+1329
-266
lines changed

‎app/code/Magento/Checkout/i18n/en_US.csv‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,12 @@ Summary,Summary
176176
"We'll send your order confirmation here.","We'll send your order confirmation here."
177177
Payment,Payment
178178
"Not yet calculated","Not yet calculated"
179-
"We received your order!","We received your order!"
179+
"The order was not successful!","The order was not successful!"
180180
"Thank you for your purchase!","Thank you for your purchase!"
181181
"Password", "Password"
182182
"Something went wrong while saving the page. Please refresh the page and try again.","Something went wrong while saving the page. Please refresh the page and try again."
183183
"Item in Cart","Item in Cart"
184184
"Items in Cart","Items in Cart"
185185
"Close","Close"
186186
"Show Cross-sell Items in the Shopping Cart","Show Cross-sell Items in the Shopping Cart"
187-
"You added %1 to your <a href=""%2"">shopping cart</a>.","You added %1 to your <a href=""%2"">shopping cart</a>."
187+
"You added %1 to your <a href=""%2"">shopping cart</a>.","You added %1 to your <a href=""%2"">shopping cart</a>."

‎app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_failure.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<body>
1010
<referenceBlock name="page.main.title">
1111
<action method="setPageTitle">
12-
<argument translate="true" name="title" xsi:type="string">We received your order!</argument>
12+
<argument translate="true" name="title" xsi:type="string">The order was not successful!</argument>
1313
</action>
1414
</referenceBlock>
1515
<referenceContainer name="content">

‎app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@
1212
<description>Assert category grid page basic columns values for default category</description>
1313
</annotations>
1414

15+
<seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.image('1','image')}}" stepKey="assertImageColumn"/>
1516
<seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.path('1')}}" stepKey="assertPathColumn"/>
1617
<seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.name('1', 'Default Category')}}" stepKey="assertNameColumn"/>
1718
<seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.displayMode('1', 'PRODUCTS')}}" stepKey="assertDisplayModeColumn"/>
1819
<seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.products('1', '0')}}" stepKey="assertProductsColumn"/>
20+
<seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.inMenu('1', 'Yes')}}" stepKey="assertInMenuColumn"/>
21+
<seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.enabled('1', 'Yes')}}" stepKey="assertEnabledColumn"/>
1922
</actionGroup>
2023
</actionGroups>

‎app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminMediaGalleryAssetFilterPlaceHolderActionGroup.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="AssertAdminMediaGalleryAssetFilterPlaceHolderActionGroup">
11+
<annotations>
12+
<description>Assert asset filter placeholder value</description>
13+
</annotations>
14+
<arguments>
15+
<argument name="filterPlaceholder" type="string"/>
16+
</arguments>
17+
18+
<seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.activeFilterPlaceholder(filterPlaceholder)}}" stepKey="assertFilterPLaceHolder" />
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,14 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminMediaGalleryCatalogUiCategoryGridSection">
12+
<element name="activeFilterPlaceholder" type="text" selector="//div[@class='admin__current-filters-list-wrap']//li//span[contains(text(), '{{filterPlaceholder}}')]" parameterized="true"/>
13+
<element name="image" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Image')]/preceding-sibling::th) +1]//img[contains(@src, '{{imageName}}')]" parameterized="true"/>
1214
<element name="path" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Path')]/preceding-sibling::th)]" parameterized="true"/>
1315
<element name="name" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Name')]/preceding-sibling::th) +1 ]//*[text()='{{categoryName}}']" parameterized="true"/>
1416
<element name="displayMode" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Display Mode')]/preceding-sibling::th) +1 ]//*[text()='{{productsText}}']" parameterized="true"/>
1517
<element name="products" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Products')]/preceding-sibling::th) +1 ]//*[text()='{{productsQty}}']" parameterized="true"/>
18+
<element name="inMenu" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'In Menu')]/preceding-sibling::th) +1 ]//*[text()='{{inMenuValue}}']" parameterized="true"/>
19+
<element name="enabled" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Enabled')]/preceding-sibling::th) +1 ]//*[text()='{{enabledValue}}']" parameterized="true"/>
1620
<element name="edit" type="button" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Action')]/preceding-sibling::th) +1 ]//*[text()='{{edit}}']" parameterized="true"/>
1721
</section>
1822
</sections>

‎app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,20 @@
6262
<actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
6363
<argument name="title" value="ImageMetadata.title"/>
6464
</actionGroup>
65+
66+
<wait time="10" stepKey="waitForBookmarkToSaveView"/>
67+
<reloadPage stepKey="reloadPage"/>
68+
<waitForPageLoad stepKey="waitForGridReloaded"/>
69+
<actionGroup ref="AdminAssertMediaGalleryFilterPlaceholderActionGroup" stepKey="assertFilterApplied">
70+
<argument name="filterPlaceholder" value="$$product.name$$"/>
71+
</actionGroup>
72+
6573
<actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
6674
<actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
6775
<argument name="imageName" value="{{ImageMetadata.title}}"/>
6876
</actionGroup>
6977
<actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
7078
<actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
71-
79+
7280
</test>
7381
</tests>

‎app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@
5454
<actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInCategories">
5555
<argument name="entityName" value="Categories"/>
5656
</actionGroup>
57+
<actionGroup ref="AssertAdminMediaGalleryAssetFilterPlaceHolderActionGroup" stepKey="assertFilterApplied">
58+
<argument name="filterPlaceholder" value="{{UpdatedImageDetails.title}}"/>
59+
</actionGroup>
5760
<actionGroup ref="AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup" stepKey="assertCategoryInGrid">
5861
<argument name="categoryName" value="$$category.name$$"/>
5962
</actionGroup>

‎app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/InMenu.php‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns;
7+
8+
use Magento\Ui\Component\Listing\Columns\Column;
9+
10+
/**
11+
* Class InMenu column for Category grid
12+
*/
13+
class InMenu extends Column
14+
{
15+
/**
16+
* Prepare data source.
17+
*
18+
* @param array $dataSource
19+
* @return array
20+
*/
21+
public function prepareDataSource(array $dataSource)
22+
{
23+
if (isset($dataSource['data']['items'])) {
24+
$fieldName = $this->getData('name');
25+
foreach ($dataSource['data']['items'] as & $item) {
26+
if (isset($item[$fieldName]) && $item[$fieldName] == 1) {
27+
$item[$fieldName] = 'Yes';
28+
} else {
29+
$item[$fieldName] = 'No';
30+
}
31+
}
32+
}
33+
34+
return $dataSource;
35+
}
36+
}

‎app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/IsActive.php‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns;
7+
8+
use Magento\Ui\Component\Listing\Columns\Column;
9+
10+
/**
11+
* Class IsActive column for Category grid
12+
*/
13+
class IsActive extends Column
14+
{
15+
/**
16+
* Prepare data source.
17+
*
18+
* @param array $dataSource
19+
* @return array
20+
*/
21+
public function prepareDataSource(array $dataSource)
22+
{
23+
if (isset($dataSource['data']['items'])) {
24+
$fieldName = $this->getData('name');
25+
foreach ($dataSource['data']['items'] as & $item) {
26+
if (isset($item[$fieldName]) && $item[$fieldName] == 1) {
27+
$item[$fieldName] = 'Yes';
28+
} else {
29+
$item[$fieldName] = 'No';
30+
}
31+
}
32+
}
33+
34+
return $dataSource;
35+
}
36+
}

‎app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Thumbnail.php‎

Lines changed: 55 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
*/
66
namespace Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns;
77

8-
use Magento\Catalog\Helper\Image;
9-
use Magento\Framework\DataObject;
8+
use Magento\Catalog\Model\Category\Image;
9+
use Magento\Catalog\Model\CategoryRepository;
10+
use Magento\Framework\View\Asset\Repository as AssetRepository;
1011
use Magento\Framework\View\Element\UiComponent\ContextInterface;
1112
use Magento\Framework\View\Element\UiComponentFactory;
1213
use Magento\Store\Model\Store;
@@ -27,48 +28,87 @@ class Thumbnail extends Column
2728
/**
2829
* @var Image
2930
*/
30-
private $imageHelper;
31+
private $categoryImage;
3132

3233
/**
34+
* @var CategoryRepository
35+
*/
36+
private $categoryRepository;
37+
38+
/**
39+
* @var AssetRepository
40+
*/
41+
private $assetRepository;
42+
43+
/**
44+
* @var string[]
45+
*/
46+
private $defaultPlaceholder;
47+
48+
/**
49+
* Thumbnail constructor.
3350
* @param ContextInterface $context
3451
* @param UiComponentFactory $uiComponentFactory
3552
* @param StoreManagerInterface $storeManager
36-
* @param Image $image
53+
* @param Image $categoryImage
54+
* @param CategoryRepository $categoryRepository
55+
* @param AssetRepository $assetRepository
56+
* @param array $defaultPlaceholder
3757
* @param array $components
3858
* @param array $data
3959
*/
4060
public function __construct(
4161
ContextInterface $context,
4262
UiComponentFactory $uiComponentFactory,
4363
StoreManagerInterface $storeManager,
44-
Image $image,
64+
Image $categoryImage,
65+
CategoryRepository $categoryRepository,
66+
AssetRepository $assetRepository,
67+
array $defaultPlaceholder = [],
4568
array $components = [],
4669
array $data = []
4770
) {
4871
parent::__construct($context, $uiComponentFactory, $components, $data);
49-
$this->imageHelper = $image;
5072
$this->storeManager = $storeManager;
73+
$this->categoryImage = $categoryImage;
74+
$this->categoryRepository = $categoryRepository;
75+
$this->assetRepository = $assetRepository;
76+
$this->defaultPlaceholder = $defaultPlaceholder;
5177
}
5278

5379
/**
5480
* Prepare Data Source
5581
*
5682
* @param array $dataSource
5783
* @return array
84+
* @throws \Magento\Framework\Exception\LocalizedException
85+
* @throws \Magento\Framework\Exception\NoSuchEntityException
5886
*/
5987
public function prepareDataSource(array $dataSource)
6088
{
61-
if (isset($dataSource['data']['items'])) {
62-
$fieldName = $this->getData('name');
63-
foreach ($dataSource['data']['items'] as & $item) {
64-
if (isset($item[$fieldName])) {
65-
$item[$fieldName . '_src'] = $this->getUrl($item[$fieldName]);
66-
} else {
67-
$category = new DataObject($item);
68-
$imageHelper = $this->imageHelper->init($category, 'product_listing_thumbnail');
69-
$item[$fieldName . '_src'] = $imageHelper->getUrl();
89+
if (!isset($dataSource['data']['items'])) {
90+
return $dataSource;
91+
}
92+
93+
$fieldName = $this->getData('name');
94+
foreach ($dataSource['data']['items'] as & $item) {
95+
if (isset($item[$fieldName])) {
96+
$item[$fieldName . '_src'] = $this->getUrl($item[$fieldName]);
97+
continue;
98+
}
99+
100+
if (isset($item['entity_id'])) {
101+
$src = $this->categoryImage->getUrl(
102+
$this->categoryRepository->get($item['entity_id'])
103+
);
104+
105+
if (!empty($src)) {
106+
$item[$fieldName . '_src'] = $src;
107+
continue;
70108
}
71109
}
110+
111+
$item[$fieldName . '_src'] = $this->assetRepository->getUrl($this->defaultPlaceholder['image']);
72112
}
73113

74114
return $dataSource;

0 commit comments

Comments
 (0)