Skip to content

Commit 51188d9

Browse files
committed
Add ablility to ovveride same filter woth url applier, fix unstable
mftf test
1 parent a572253 commit 51188d9

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@
3131
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
3232
</after>
3333

34-
<amOnPage url="{{AdminProductIndexPage.url}}?filters[name]=$createSimpleProduct.name$" stepKey="navigateToProductGridWithFilters"/>
34+
<amOnPage url="{{AdminProductIndexPage.url}}?filters[sku]=$createSimpleProduct.sku$" stepKey="navigateToProductGridWithFilters"/>
3535
<waitForPageLoad stepKey="waitForProductGrid"/>
36+
<see selector="{{AdminProductGridSection.productGridNameProduct($createSimpleProduct.name$)}}" userInput="$createSimpleProduct.name$" stepKey="seeProduct"/>
3637
<waitForElementVisible selector="{{AdminProductGridFilterSection.enabledFilters}}" stepKey="waitForEnabledFilters"/>
3738
<seeElement selector="{{AdminProductGridFilterSection.enabledFilters}}" stepKey="seeEnabledFilters"/>
38-
<see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="Name: $createSimpleProduct.name$" stepKey="seeProductNameFilter"/>
39+
<see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="SKU: $createSimpleProduct.sku$" stepKey="seeProductNameFilter"/>
3940
</test>
4041
</tests>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ define([
3939
apply: function () {
4040
var urlFilter = this.getFilterParam(this.searchString),
4141
applied,
42-
filters = {};
42+
filters;
4343

4444
if (_.isUndefined(this.filterComponent())) {
4545
setTimeout(function () {
@@ -51,7 +51,7 @@ define([
5151

5252
if (Object.keys(urlFilter).length) {
5353
applied = this.filterComponent().get('applied');
54-
filters = $.extend(true, urlFilter, applied);
54+
filters = $.extend({}, applied, urlFilter);
5555
this.filterComponent().set('applied', filters);
5656
}
5757
},

0 commit comments

Comments
 (0)