Skip to content

Commit 084f689

Browse files
committed
Correctly apply filters from url-applier do avoid dropping other filters
1 parent 9fd19aa commit 084f689

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55

66
define([
77
'uiComponent',
8-
'underscore'
9-
], function (Component, _) {
8+
'underscore',
9+
'jquery'
10+
], function (Component, _, $) {
1011
'use strict';
1112

1213
return Component.extend({
@@ -36,7 +37,9 @@ define([
3637
* Apply filter
3738
*/
3839
apply: function () {
39-
var urlFilter = this.getFilterParam(this.searchString);
40+
var urlFilter = this.getFilterParam(this.searchString),
41+
applied,
42+
filters = {};
4043

4144
if (_.isUndefined(this.filterComponent())) {
4245
setTimeout(function () {
@@ -47,8 +50,9 @@ define([
4750
}
4851

4952
if (Object.keys(urlFilter).length) {
50-
this.filterComponent().setData(urlFilter, false);
51-
this.filterComponent().apply();
53+
applied = this.filterComponent().get('applied');
54+
filters = $.extend(true, urlFilter, applied);
55+
this.filterComponent().set('applied', filters);
5256
}
5357
},
5458

0 commit comments

Comments
 (0)