Skip to content

Commit c7c7e3d

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [EngCom] Public Pull Requests - 2.3-develop Minor Fixes
Accepted Public Pull Requests: - #21716: [DB] Remove unused variable (by @eduard13) - #21701: Fix Broken Tax Rate Search Filter Admin grid #21521 (by @tuyennn) - #21685: Spelling Correction (by @ansari-krish) - #21611: Advanced-Search-layout-not-proper (by @amol2jcommerce) - #21420: Wishlist review summary (by @Den4ik) - #21638: Minicart search logo not vertically aligned (by @amol2jcommerce) - #21542: Remove Environment emulation for better performance on sitemap generation (by @Nazar65) - #21371: Fix Admin Customizable Options Dropdown sort_order issue (by @omiroshnichenko) - #20938: Fixed Massaction design with submenu on grid pages (by @ananth-iyer) - #19635: Patch 18017 magento 23 (by @niravkrish) - #21074: Added space above error message. (by @suryakant-krish) - #20429: 'fixes-for-#20414' :: Recent orders grid not aligned from left in mob� (by @nainesh2jcommerce) - #13184: [FEATURE] added ability to create default/fixed value nodes during XSD Schema Validation (by @matthiasherold) Fixed GitHub Issues: - #21521: Broken Tax Rate Search Filter - SQLSTATE[23000] (reported by @robyerevan) has been fixed in #21701 by @tuyennn in 2.3-develop branch Related commits: 1. 924dca2 - #20809: Advanced Search layout not proper (reported by @amol2jcommerce) has been fixed in #21611 by @amol2jcommerce in 2.3-develop branch Related commits: 1. 13991bb 2. 1f0f7a1 3. caa0727 4. 23e7e36 - #21419: Wishlist is missing review summary (reported by @Den4ik) has been fixed in #21420 by @Den4ik in 2.3-develop branch Related commits: 1. a168c95 2. 0def6c2 3. 473f9a5 - #20905: Minicart, search & logo not vertically aligned between 640 to767 device pixel. (reported by @Surabhi-Cedcoss) has been fixed in #21638 by @amol2jcommerce in 2.3-develop branch Related commits: 1. a21901a - #20989: Admin Customizable Options Dropdown sort_order issue (reported by @dharmendra-wagento) has been fixed in #21371 by @omiroshnichenko in 2.3-develop branch Related commits: 1. 4e348fd 2. e270dee 3. 795d532 - #20928: Admin product grid Massaction design issue with sub menu (reported by @ananth-iyer) has been fixed in #20938 by @ananth-iyer in 2.3-develop branch Related commits: 1. facfa44 2. 314d3a8 3. 631c6b1 4. 524eef3 - #18017: URL pre-selection of configurable product swatches with associated product images throws JavaScript error (reported by @leoquijano) has been fixed in #19635 by @niravkrish in 2.3-develop branch Related commits: 1. b92bbc4 2. 95d5f44 3. 30c3eac 4. ee64ecd 5. 7feaedd 6. bbceaab 7. 0611394 8. 41c2d90 9. ec5c01f - #20414: Recent orders grid not aligned from left in mobile as all content aligned from left (reported by @irajneeshgupta) has been fixed in #20429 by @nainesh2jcommerce in 2.3-develop branch Related commits: 1. f4d4d9b
2 parents 6d8e725 + 3fb6b28 commit c7c7e3d

File tree

35 files changed

+158
-67
lines changed

35 files changed

+158
-67
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ Tests:
489489
* Fixed an issue where found records in global search in Backend could not be selected via keyboard
490490
* Fixed an issue where Category menu items went out of screen when page side was reached
491491
* Fixed an issue where subcategories in menu were shown instantly when user moved mouse quickly
492-
* Fixed an issue where popup header was our of window range while creating group product
492+
* Fixed an issue where popup header was out of window range while creating group product
493493
* Fixed an issue where region field was absent in customer address form on backend for "United Kingdom" country
494494
* Fixed an ability to edit the Order from Admin panel
495495
* Fixed an issue where email could not be retrieved from \Magento\Quote\Api\Data\AddressInterface after adding an address on OnePageCheckout

‎app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969

7070
<!-- ko foreach: { data: $record().elems(), as: 'elem'} -->
7171
<td if="elem.template"
72-
visible="elem.visible"
72+
visible="elem.visible() && elem.formElement !== 'hidden'"
7373
disable="elem.disabled"
7474
css="$parent.setClasses(elem)"
7575
template="elem.template"

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -871,6 +871,7 @@ protected function getPositionFieldConfig($sortOrder)
871871
'formElement' => Hidden::NAME,
872872
'dataScope' => static::FIELD_SORT_ORDER_NAME,
873873
'dataType' => Number::NAME,
874+
'visible' => false,
874875
'sortOrder' => $sortOrder,
875876
],
876877
],

‎app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,15 @@
77
namespace Magento\Sitemap\Controller\Adminhtml\Sitemap;
88

99
use Magento\Backend\App\Action;
10+
use Magento\Framework\App\Action\HttpGetActionInterface;
11+
use Magento\Sitemap\Controller\Adminhtml\Sitemap;
1012
use Magento\Store\Model\App\Emulation;
1113
use Magento\Framework\App\ObjectManager;
1214

13-
class Generate extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
15+
/**
16+
* Generate sitemap file
17+
*/
18+
class Generate extends Sitemap implements HttpGetActionInterface
1419
{
1520
/** @var \Magento\Store\Model\App\Emulation $appEmulation */
1621
private $appEmulation;
@@ -44,23 +49,14 @@ public function execute()
4449
// if sitemap record exists
4550
if ($sitemap->getId()) {
4651
try {
47-
//We need to emulate to get the correct frontend URL for the product images
48-
$this->appEmulation->startEnvironmentEmulation(
49-
$sitemap->getStoreId(),
50-
\Magento\Framework\App\Area::AREA_FRONTEND,
51-
true
52-
);
5352
$sitemap->generateXml();
54-
5553
$this->messageManager->addSuccessMessage(
5654
__('The sitemap "%1" has been generated.', $sitemap->getSitemapFilename())
5755
);
5856
} catch (\Magento\Framework\Exception\LocalizedException $e) {
5957
$this->messageManager->addErrorMessage($e->getMessage());
6058
} catch (\Exception $e) {
6159
$this->messageManager->addExceptionMessage($e, __('We can\'t generate the sitemap right now.'));
62-
} finally {
63-
$this->appEmulation->stopEnvironmentEmulation();
6460
}
6561
} else {
6662
$this->messageManager->addErrorMessage(__('We can\'t find a sitemap to generate.'));

‎app/code/Magento/Sitemap/Model/Observer.php

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
namespace Magento\Sitemap\Model;
77

8-
use Magento\Store\Model\App\Emulation;
98
use Magento\Sitemap\Model\EmailNotification as SitemapEmail;
109
use Magento\Framework\App\Config\ScopeConfigInterface;
1110
use Magento\Sitemap\Model\ResourceModel\Sitemap\CollectionFactory;
@@ -57,11 +56,6 @@ class Observer
5756
*/
5857
private $collectionFactory;
5958

60-
/**
61-
* @var Emulation
62-
*/
63-
private $appEmulation;
64-
6559
/**
6660
* @var $emailNotification
6761
*/
@@ -72,17 +66,14 @@ class Observer
7266
* @param ScopeConfigInterface $scopeConfig
7367
* @param CollectionFactory $collectionFactory
7468
* @param EmailNotification $emailNotification
75-
* @param Emulation $appEmulation
7669
*/
7770
public function __construct(
7871
ScopeConfigInterface $scopeConfig,
7972
CollectionFactory $collectionFactory,
80-
SitemapEmail $emailNotification,
81-
Emulation $appEmulation
73+
SitemapEmail $emailNotification
8274
) {
8375
$this->scopeConfig = $scopeConfig;
8476
$this->collectionFactory = $collectionFactory;
85-
$this->appEmulation = $appEmulation;
8677
$this->emailNotification = $emailNotification;
8778
}
8879

@@ -114,17 +105,9 @@ public function scheduledGenerateSitemaps()
114105
foreach ($collection as $sitemap) {
115106
/* @var $sitemap \Magento\Sitemap\Model\Sitemap */
116107
try {
117-
$this->appEmulation->startEnvironmentEmulation(
118-
$sitemap->getStoreId(),
119-
\Magento\Framework\App\Area::AREA_FRONTEND,
120-
true
121-
);
122-
123108
$sitemap->generateXml();
124109
} catch (\Exception $e) {
125110
$errors[] = $e->getMessage();
126-
} finally {
127-
$this->appEmulation->stopEnvironmentEmulation();
128111
}
129112
}
130113
if ($errors && $recipient) {

‎app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,7 @@ protected function _prepareProduct(array $productRow, $storeId)
389389
*/
390390
protected function _loadProductImages($product, $storeId)
391391
{
392+
$this->_storeManager->setCurrentStore($storeId);
392393
/** @var $helper \Magento\Sitemap\Helper\Data */
393394
$helper = $this->_sitemapData;
394395
$imageIncludePolicy = $helper->getProductImageIncludePolicy($storeId);

‎app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public function testScheduledGenerateSitemapsSendsExceptionEmail()
118118
->method('getStoreId')
119119
->willReturn($storeId);
120120

121-
$this->sitemapMock->expects($this->at(1))
121+
$this->sitemapMock->expects($this->once())
122122
->method('generateXml')
123123
->willThrowException(new \Exception($exception));
124124

@@ -130,17 +130,6 @@ public function testScheduledGenerateSitemapsSendsExceptionEmail()
130130
)
131131
->willReturn('[email protected]');
132132

133-
$this->appEmulationMock->expects($this->at(0))
134-
->method('startEnvironmentEmulation')
135-
->with(
136-
$storeId,
137-
Area::AREA_FRONTEND,
138-
true
139-
);
140-
141-
$this->appEmulationMock->expects($this->at(1))
142-
->method('stopEnvironmentEmulation');
143-
144133
$this->observer->scheduledGenerateSitemaps();
145134
}
146135
}

‎app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1238,6 +1238,11 @@ define([
12381238

12391239
if (!_.isUndefined(gallery)) {
12401240
gallery.updateData(imagesToUpdate);
1241+
} else {
1242+
context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) {
1243+
loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery');
1244+
loadedGallery.updateData(imagesToUpdate);
1245+
}.bind(this));
12411246
}
12421247

12431248
if (isInitial) {
@@ -1248,6 +1253,7 @@ define([
12481253
dataMergeStrategy: this.options.gallerySwitchStrategy
12491254
});
12501255
}
1256+
12511257
} else if (justAnImage && justAnImage.img) {
12521258
context.find('.product-image-photo').attr('src', justAnImage.img);
12531259
}

‎app/code/Magento/Tax/etc/di.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@
143143
<arguments>
144144
<argument name="fieldMapping" xsi:type="array">
145145
<item name="id" xsi:type="string">tax_calculation_rule_id</item>
146+
<item name="code" xsi:type="string">main_table.code</item>
146147
<item name="tax_rate_ids" xsi:type="string">tax_calculation_rate_id</item>
147148
<item name="customer_tax_class_ids" xsi:type="string">cd.customer_tax_class_id</item>
148149
<item name="product_tax_class_ids" xsi:type="string">cd.product_tax_class_id</item>
@@ -154,6 +155,7 @@
154155
<arguments>
155156
<argument name="fieldMapping" xsi:type="array">
156157
<item name="id" xsi:type="string">tax_calculation_rule_id</item>
158+
<item name="code" xsi:type="string">main_table.code</item>
157159
<item name="tax_rate_ids" xsi:type="string">tax_calculation_rate_id</item>
158160
<item name="customer_tax_class_ids" xsi:type="string">cd.customer_tax_class_id</item>
159161
<item name="product_tax_class_ids" xsi:type="string">cd.product_tax_class_id</item>

‎app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,7 @@ define([
543543
data = this.createHeaderTemplate(cell.config);
544544
cell.config.labelVisible = false;
545545
_.extend(data, {
546+
defaultLabelVisible: data.visible(),
546547
label: cell.config.label,
547548
name: cell.name,
548549
required: !!cell.config.validation,

‎app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ define([
245245
label = _.findWhere(this.parentComponent().labels(), {
246246
name: index
247247
});
248-
label.visible() !== state ? label.visible(state) : false;
248+
label.defaultLabelVisible && label.visible(state);
249249
} else {
250250
elems[curElem].visible(state);
251251
}

‎app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<!-- ko foreach: { data: $record().elems(), as: 'elem'} -->
4242
<td if="elem.template"
4343
css="$parent.setClasses(elem)"
44-
visible="elem.visible"
44+
visible="elem.visible() && elem.formElement !== 'hidden'"
4545
disable="elem.disabled"
4646
template="elem.template"/>
4747
<!-- /ko -->

‎app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858

5959
<!-- ko foreach: { data: $record().elems(), as: 'elem'} -->
6060
<td if="elem.template"
61-
visible="elem.visible"
61+
visible="elem.visible() && elem.formElement !== 'hidden'"
6262
disable="elem.disabled"
6363
css="$parent.setClasses(elem)"
6464
template="elem.template"

‎app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
*/
66

77
/**
8-
* Wishlist for item column in customer wishlist
9-
*
108
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
1311

1412
/**
13+
* Model for item column in customer wishlist.
14+
*
1515
* @api
16+
* @deprecated
1617
* @since 100.0.2
1718
*/
1819
class Actions extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column

‎app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
*/
66

77
/**
8-
* Wishlist block customer item cart column
9-
*
108
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
1311

1412
/**
13+
* Wishlist block customer item cart column.
14+
*
1515
* @api
16+
* @deprecated
1617
* @since 100.0.2
1718
*/
1819
class Comment extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column

‎app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
*/
66

77
/**
8-
* Edit item in customer wishlist table
9-
*
108
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
1311

1412
/**
13+
* Edit item in customer wishlist table.
14+
*
1515
* @api
16+
* @deprecated
1617
* @since 100.0.2
1718
*/
1819
class Edit extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column

‎app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
*/
66

77
/**
8-
* Wishlist block customer item cart column
9-
*
108
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
1311

1412
/**
13+
* Wishlist block customer item cart column.
14+
*
1515
* @api
16+
* @deprecated
1617
* @since 100.0.2
1718
*/
1819
class Info extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column

‎app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
*/
66

77
/**
8-
* Delete item column in customer wishlist table
9-
*
108
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
1311

1412
/**
13+
* Delete item column in customer wishlist table
14+
*
1515
* @api
16+
* @deprecated
1617
* @since 100.0.2
1718
*/
1819
class Remove extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column

‎app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<block class="Magento\Wishlist\Block\Customer\Wishlist\Items" name="customer.wishlist.items" as="items" template="Magento_Wishlist::item/list.phtml" cacheable="false">
1919
<block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Image" name="customer.wishlist.item.image" template="Magento_Wishlist::item/column/image.phtml" cacheable="false"/>
2020
<block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Info" name="customer.wishlist.item.name" template="Magento_Wishlist::item/column/name.phtml" cacheable="false"/>
21+
<block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column" name="customer.wishlist.item.review" template="Magento_Wishlist::item/column/review.phtml" cacheable="false"/>
2122
<block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Cart" name="customer.wishlist.item.price" template="Magento_Wishlist::item/column/price.phtml" cacheable="false">
2223
<block class="Magento\Catalog\Pricing\Render" name="product.price.render.wishlist">
2324
<arguments>

‎app/code/Magento/Wishlist/view/frontend/templates/item/column/review.phtml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
/** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column $block */
8+
$product = $block->getItem()->getProduct();
9+
?>
10+
<?= $block->getReviewsSummaryHtml($product, 'short') ?>

‎app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@
77
// Actions -> Action select
88
// _____________________________________________
99

10+
//
11+
// Variables
12+
// _____________________________________________
13+
14+
@_dropdown__padding-right: @action__height;
15+
@_triangle__height: @button-marker-triangle__height;
16+
@_triangle__width: @button-marker-triangle__width;
17+
1018
// Action select have the same visual styles and functionality as native <select>
1119
.action-select-wrap {
1220
@_action-select__border-color: @button__border-color;
@@ -18,9 +26,9 @@
1826

1927
.action-select {
2028
.action-toggle-triangle(
21-
@_dropdown__padding-right: @_action-select-toggle__size;
22-
@_triangle__height: @button-marker-triangle__height;
23-
@_triangle__width: @button-marker-triangle__width;
29+
@_dropdown__padding-right;
30+
@_triangle__height;
31+
@_triangle__width;
2432
);
2533
.lib-text-overflow-ellipsis();
2634

@@ -108,12 +116,9 @@
108116
min-width: 100%;
109117
position: static;
110118

111-
._parent._visible {
112-
position: relative;
113-
}
114-
115119
.action-submenu {
116120
position: absolute;
121+
right: -100%;
117122
}
118123
}
119124
}

0 commit comments

Comments
 (0)