MAGETWO-47285: Admin Panel, Categories: Reset of product assignments occurs after filter is applied

Author: rganin

app/code/Magento/Ui/view/base/web/js/grid/columns/onoff.js

@@ -41,14 +41,38 @@ define([
          */
         setDefaultSelections: function () {
             var positionCacheValid = registry.get('position_cache_valid'),
+                selectedFromCache = registry.get('selected_cache'),
                 key,
                 i;
 
-            registry.set('position_cache_valid', true);
+            if (positionCacheValid && this.selected().length === 0) {
+                // Check selected data
+                selectedFromCache = JSON.parse(selectedFromCache);
+
+                for (i = 0; i < selectedFromCache.length; i++) {
+                    this.selected.push(selectedFromCache[i]);
+                }
+
+                registry.set('position_cache_valid', true);
+                registry.set('selected_cache', JSON.stringify(this.selected()));
 
-            if (this.selectedData.length === 0 || positionCacheValid) {
                 return;
             }
+
+            if (positionCacheValid && this.selected().length > 0) {
+                registry.set('position_cache_valid', true);
+                registry.set('selected_cache', JSON.stringify(this.selected()));
+
+                return;
+            }
+
+            if (this.selectedData.length === 0) {
+                registry.set('position_cache_valid', true);
+                registry.set('selected_cache', JSON.stringify([]));
+
+                return;
+            }
+
             // Check selected data
             for (key in this.selectedData) {
                 if (this.selectedData.hasOwnProperty(key) && this.selected().indexOf(key) === -1) {
@@ -61,6 +85,8 @@ define([
                 this.selectedData.hasOwnProperty(key) || this.selected.splice(this.selected().indexOf(key), 1);
                 this.selectedData.hasOwnProperty(key) || i--;
             }
+            registry.set('position_cache_valid', true);
+            registry.set('selected_cache', JSON.stringify(this.selected()));
         },
 
         /**
@@ -91,12 +117,18 @@ define([
          * @returns {Object} Chainable.
          */
         updateState: function () {
-            var totalRecords    = this.totalRecords(),
+            var positionCacheValid = registry.get('position_cache_valid'),
+                totalRecords    = this.totalRecords(),
                 selected        = this.selected().length,
                 excluded        = this.excluded().length,
                 totalSelected   = this.totalSelected(),
                 allSelected;
 
+            if (positionCacheValid && this.selected().length > 0) {
+                registry.set('position_cache_valid', true);
+                registry.set('selected_cache', JSON.stringify(this.selected()));
+            }
+
             // When filters are enabled then totalRecords is unknown
             if (this.getFiltering()) {
                 if (this.getFiltering().search !== '') {