Skip to content

Fixed grid multiselect issue #24400 #26488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 21 commits into from
Closed

Fixed grid multiselect issue #24400 #26488

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
bcd0ec9
Fixed grid multiselect issue #24400
mahesh-rajawat Jan 22, 2020
3cd6d79
update to fix unit test
mahesh-rajawat Jan 22, 2020
74872b8
fixed static test
mahesh-rajawat Jan 22, 2020
6928ff9
syntax error fixed
mahesh-rajawat Jan 22, 2020
0614cee
Merge branch '2.4-develop' into fixed-24400
novikor Jan 22, 2020
bc3c22e
Merge branch '2.4-develop' into fixed-24400
novikor Jan 23, 2020
4ef8ca5
Merge branch '2.4-develop' into fixed-24400
slavvka Jan 26, 2020
6cde17f
fixed static test
mahesh-rajawat Feb 20, 2020
2fe4517
local changes reverted
mahesh-rajawat Feb 20, 2020
593334c
Merge branch 'fixed-24400' of github.com:maheshWebkul721/magento2 int…
mahesh-rajawat Feb 20, 2020
5d57321
Fixed some static test issue
mahesh-rajawat Feb 20, 2020
4779372
cover changes with jasmine test
Nazar65 Feb 24, 2020
0de4f63
fixes to resolve manual testing issue.
mahesh-rajawat Feb 25, 2020
0cb70eb
Code optimized
mahesh-rajawat Feb 26, 2020
4590c21
Fixed unit tests fail
mahesh-rajawat Feb 27, 2020
d28d7ea
Merge branch '2.4-develop' into fixed-24400
novikor Mar 2, 2020
2b978d5
Merge branch '2.4-develop' into fixed-24400
tgamanov Sep 4, 2020
dd72d8d
The issue with select all action has been fixed.
engcom-Hotel Sep 7, 2020
0e817ee
Merge branch '2.4-develop' into fixed-24400
engcom-Hotel Sep 7, 2020
bdb6d75
Selected count has been fixed. Test has been updated.
engcom-Hotel Sep 7, 2020
cad8b46
Test has been updated.
engcom-Hotel Sep 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions app/code/Magento/Ui/view/base/web/js/grid/columns/multiselect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,13 @@ 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();
},

Expand Down Expand Up @@ -438,7 +445,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) {
Expand All @@ -448,7 +457,7 @@ define([
this.selectAll();
}

this.allSelected(allSelected);
this.allSelected(pageTotal === pageSelected);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are a lot of jasmine test failures could you please take a look ? i think this may cause an issue

this.indetermine(totalSelected && !allSelected);

return this;
Expand Down Expand Up @@ -486,6 +495,8 @@ define([
newSelections = _.union(this.getIds(true), this.selected());

this.selected(newSelections);
} else {
this.updateState();
}
},

Expand Down
13 changes: 13 additions & 0 deletions dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,19 @@ define([
expect(multiSelect.selected().toString()).toEqual('3,4,1,2');
});

it('Select all rows all over the Grid and deselects all records', function () {
multiSelect.rows([{
id: 1
}, {
id: 2
}]);

multiSelect.selectAll();
multiSelect.deselectAll();
multiSelect.indetermine(2);
expect(multiSelect.togglePage().selected()).toEqual([1, 2]);
});

it('Select all rows all over the Grid without all rows on current page but with specific rows on another page',
function () {
multiSelect.rows([{
Expand Down