From 04a9f44e2e000d180a2d02bef81768df660812e6 Mon Sep 17 00:00:00 2001 From: Nazar Klovanych Date: Tue, 1 Sep 2020 21:54:04 +0300 Subject: [PATCH] Fix issue with saving filters from url-applier to default view of bookmark --- .../Ui/view/base/web/js/grid/url-filter-applier.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js b/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js index be9044143c5a4..3c5e72d4d66ed 100644 --- a/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js +++ b/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js @@ -13,10 +13,12 @@ define([ return Component.extend({ defaults: { listingNamespace: null, + bookmarkProvider: 'componentType = bookmark, ns = ${ $.listingNamespace }', filterProvider: 'componentType = filters, ns = ${ $.listingNamespace }', filterKey: 'filters', searchString: location.search, modules: { + bookmarks: '${ $.bookmarkProvider }', filterComponent: '${ $.filterProvider }' } }, @@ -49,6 +51,16 @@ define([ return; } + if (!_.isUndefined(this.bookmarks())) { + if (!_.size(this.bookmarks().getViewData(this.bookmarks().defaultIndex))) { + setTimeout(function () { + this.apply(); + }.bind(this), 500); + + return; + } + } + if (Object.keys(urlFilter).length) { applied = this.filterComponent().get('applied'); filters = $.extend({}, applied, urlFilter);