Skip to content

Commit 0053757

Browse files
🔃 [Magento Community Engineering] Community Contributions - 2.3-develop latest changes
Accepted Community Pull Requests: - #24119: Resolve Missing "expand/collapse" icon in paypal setting (issue 24118) (by @edenduong) - #24078: Resolve Account sidebar current tab is not marked as Active (issue 24068) (by @edenduong) - #23698: Resolve Searching "Categories" is wrong in New Product form when pressing 1 character issue 23697 (by @edenduong) - #23687: Resolve Warning during search in catalog by multiple custom option values. Warning should not be generated in log (by @edenduong) Fixed GitHub Issues: - #24118: Missing "expand/collapse" icon in paypal setting (reported by @edenduong) has been fixed in #24119 by @edenduong in 2.3-develop branch Related commits: 1. 2895106 - #24068: Account sidebar current tab is not marked as Active (reported by @ankitpatel2931) has been fixed in #24078 by @edenduong in 2.3-develop branch Related commits: 1. 491b295 2. b32b91b 3. a1323a8 - #23697: Searching "Categories" is wrong when pressing 1 character (reported by @edenduong) has been fixed in #23698 by @edenduong in 2.3-develop branch Related commits: 1. aa26e07 - #23557: Warning during search in catalog by multiple custom option values. Warning should not be generated in log. (reported by @alexeya-ven) has been fixed in #23687 by @edenduong in 2.3-develop branch Related commits: 1. be1e905 2. ac582d6
2 parents 74aa9c6 + 6c4c005 commit 0053757

File tree

4 files changed

+19
-8
lines changed

4 files changed

+19
-8
lines changed

app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\CatalogSearch\Model\Layer\Filter;
79

810
use Magento\Catalog\Model\Layer\Filter\AbstractFilter;
@@ -62,6 +64,9 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
6264
->getProductCollection();
6365
$productCollection->addFieldToFilter($attribute->getAttributeCode(), $attributeValue);
6466
$label = $this->getOptionText($attributeValue);
67+
if (is_array($label)) {
68+
$label = implode(',', $label);
69+
}
6570
$this->getLayer()
6671
->getState()
6772
->addFilter($this->_createItem($label, $attributeValue));

app/code/Magento/Paypal/view/adminhtml/web/styles.css

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
.paypal-other-header > .admin__collapsible-block > a::before {content: '' !important; width: 0; height: 0; border-color: transparent; border-top-color: #000; border-style: solid; border-width: .8rem .5rem 0 .5rem; margin-top:1px; transition: all .2s linear;}
3030
.paypal-other-header > .admin__collapsible-block > a.open::before {border-color: transparent; border-bottom-color: #000; border-width: 0 .5rem .8rem .5rem;}
3131
.paypal-other-header > .admin__collapsible-block > a {color: #007bdb !important; text-align: right;}
32-
.payments-other-header > .admin__collapsible-block > a {display: inline-block;}
33-
.payments-other-header > .admin__collapsible-block > a::before {content: '' !important; width: 0; height: 0; border-color: transparent; border-top-color: #000; border-style: solid; border-width: .8rem .5rem 0 .5rem; margin-top:1px; transition: all .2s linear;}
34-
.payments-other-header > .admin__collapsible-block > a.open::before {border-color: transparent; border-bottom-color: #000; border-width: 0 .5rem .8rem .5rem;}
32+
.payments-other-header > .admin__collapsible-block > a,
33+
.paypal-recommended-header > .admin__collapsible-block > a {display: inline-block;}
34+
.payments-other-header > .admin__collapsible-block > a::before,
35+
.paypal-recommended-header > .admin__collapsible-block > a::before {content: '' !important; width: 0; height: 0; border-color: transparent; border-top-color: #000; border-style: solid; border-width: .8rem .5rem 0 .5rem; margin-top:1px; transition: all .2s linear;}
36+
.payments-other-header > .admin__collapsible-block > a.open::before,
37+
.paypal-recommended-header > .admin__collapsible-block > a.open::before {border-color: transparent; border-bottom-color: #000; border-width: 0 .5rem .8rem .5rem;}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -461,10 +461,6 @@ define([
461461
var value = this.filterInputValue().trim().toLowerCase(),
462462
array = [];
463463

464-
if (value && value.length < 2) {
465-
return false;
466-
}
467-
468464
if (this.searchOptions) {
469465
return this.loadOptions(value);
470466
}

lib/internal/Magento/Framework/View/Element/Html/Link/Current.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@
2323
*/
2424
class Current extends Template
2525
{
26+
/**
27+
* Search redundant /index and / in url
28+
*/
29+
private const REGEX_INDEX_URL_PATTERN = '/(\/index|(\/))+($|\/$)/';
30+
2631
/**
2732
* Default path
2833
*
@@ -87,7 +92,9 @@ private function getMca()
8792
*/
8893
public function isCurrent()
8994
{
90-
return $this->getCurrent() || $this->getUrl($this->getPath()) == $this->getUrl($this->getMca());
95+
return $this->getCurrent() ||
96+
preg_replace(self::REGEX_INDEX_URL_PATTERN, '', $this->getUrl($this->getPath()))
97+
== preg_replace(self::REGEX_INDEX_URL_PATTERN, '', $this->getUrl($this->getMca()));
9198
}
9299

93100
/**

0 commit comments

Comments
 (0)