Fixed grid multiselect issue magento#24400

mahesh-rajawat · Jan 22, 2020 · bcd0ec9 · bcd0ec9
1 parent 420a8b6
commit bcd0ec9
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/multiselect.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/multiselect.js
@@ -235,6 +235,12 @@ define([
         * @returns {Multiselect} Chainable.
         */
         togglePage: function () {
+            var total = this.getIds().length,
+                selected = this.getPageSelections().length;
+
+            if (this.isPageSelected() && selected !== total) {
+                return this.selectPage();
+            }
             return this.isPageSelected() ? this.deselectPage() : this.selectPage();
         },
 
@@ -438,7 +444,9 @@ define([
                 excluded        = this.excluded().length,
                 totalSelected   = this.totalSelected(),
                 totalRecords    = this.totalRecords(),
-                allSelected     = totalRecords && totalSelected === totalRecords;
+                allSelected     = totalRecords && totalSelected === totalRecords,
+                pageTotal       = this.getIds().length,
+                pageSelected    = this.getPageSelections().length;
 
             if (this.excludeMode()) {
                 if (excluded === totalRecords && !this.preserveSelectionsOnFilter) {
@@ -451,6 +459,12 @@ define([
             this.allSelected(allSelected);
             this.indetermine(totalSelected && !allSelected);
 
+            if (pageTotal !== pageSelected) {
+                this.allSelected(false);
+            } else if (pageTotal === pageSelected) {
+                this.allSelected(true);
+            }
+
             return this;
         },
 
@@ -486,6 +500,9 @@ define([
                 newSelections = _.union(this.getIds(true), this.selected());
 
                 this.selected(newSelections);
+            } else {
+                this.countSelected()
+                    .updateState();
             }
         },