Merge remote-tracking branch 'origin/ACP2E-4202' into PR_2025_09_25_muntianu

Author: katmoon

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

@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 /**
@@ -383,20 +383,20 @@ define([
                 relevant        = true;
 
             switch (actionId) {
-                case 'selectPage':
-                    relevant = multiplePages && !this.isPageSelected(true);
-                    break;
+            case 'selectPage':
+                relevant = multiplePages && !this.isPageSelected(true);
+                break;
 
-                case 'deselectPage':
-                    relevant =  multiplePages && this.isPageSelected();
-                    break;
+            case 'deselectPage':
+                relevant =  multiplePages && this.isPageSelected();
+                break;
 
-                case 'selectAll':
-                    relevant = !this.allSelected();
-                    break;
+            case 'selectAll':
+                relevant = !this.allSelected();
+                break;
 
-                case 'deselectAll':
-                    relevant = this.totalSelected() > 0;
+            case 'deselectAll':
+                relevant = this.totalSelected() > 0;
             }
 
             return relevant;
@@ -438,8 +438,7 @@ define([
          * @returns {Multiselect} Chainable.
          */
         updateState: function () {
-            var selected        = this.selected().length,
-                excluded        = this.excluded().length,
+            var excluded        = this.excluded().length,
                 totalSelected   = this.totalSelected(),
                 totalRecords    = this.totalRecords(),
                 allSelected     = totalRecords && totalSelected === totalRecords;
@@ -448,8 +447,6 @@ define([
                 if (excluded === totalRecords && !this.preserveSelectionsOnFilter) {
                     this.deselectAll();
                 }
-            } else if (totalRecords && selected === totalRecords && !this.preserveSelectionsOnFilter) {
-                this.selectAll();
             }
 
             this.allSelected(allSelected);

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js

@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 define([
@@ -172,5 +172,17 @@ define([
                 expect(multiSelect.excluded().toString()).toEqual('3,4');
                 expect(multiSelect.selected().toString()).toEqual('5,6');
             });
+
+        it('updateState does not call selectAll when all items are selected', function () {
+            multiSelect.rows([{ id: 1 }, { id: 2 }]);
+            multiSelect.totalRecords(2);
+            multiSelect.excludeMode(false);
+            multiSelect.selected([1, 2]);
+            multiSelect.preserveSelectionsOnFilter = false;
+            spyOn(multiSelect, 'selectAll').and.callThrough();
+            multiSelect.updateState();
+
+            expect(multiSelect.selectAll).not.toHaveBeenCalled();
+        });
     });
 });