Skip to content

Commit 0c3561c

Browse files
committed
MC-38787: Admin Product Grid Page indicator issue
1 parent f756a57 commit 0c3561c

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ define([
3737
totalSelected: '${ $.selectProvider }:totalSelected',
3838
totalRecords: '${ $.provider }:data.totalRecords',
3939
filters: '${ $.provider }:params.filters',
40-
search: '${ $.provider }:params.search'
40+
keywordUpdated: '${ $.provider }:params.keywordUpdated'
4141
},
4242

4343
exports: {
@@ -60,7 +60,7 @@ define([
6060
'pageSize': 'onPageSizeChange',
6161
'totalRecords': 'updateCounter',
6262
'${ $.provider }:params.filters': 'goFirst',
63-
'search': 'goFirst'
63+
'keywordUpdated': 'goFirst'
6464
},
6565

6666
modules: {
@@ -186,7 +186,7 @@ define([
186186
* @returns {Paging} Chainable.
187187
*/
188188
goFirst: function () {
189-
if (!_.isUndefined(this.filters)) {
189+
if ((!_.isUndefined(this.filters) && _.keys(this.filters) > 1) || this.keywordUpdated) {
190190
this.current = 1;
191191
}
192192

app/code/Magento/Ui/view/base/web/js/grid/search/search.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ define([
2222
placeholder: $t('Search by keyword'),
2323
label: $t('Keyword'),
2424
value: '',
25+
keywordUpdated: false,
2526
previews: [],
2627
chipsProvider: 'componentType = filtersChips, ns = ${ $.ns }',
2728
statefull: {
@@ -31,15 +32,17 @@ define([
3132
value: true,
3233
previews: true,
3334
inputValue: true,
34-
focused: true
35+
focused: true,
36+
keywordUpdated: true
3537
},
3638
imports: {
3739
inputValue: 'value',
3840
updatePreview: 'value',
3941
focused: false
4042
},
4143
exports: {
42-
value: '${ $.provider }:params.search'
44+
value: '${ $.provider }:params.search',
45+
keywordUpdated: '${ $.provider }:params.keywordUpdated'
4346
},
4447
modules: {
4548
chips: '${ $.chipsProvider }'
@@ -124,6 +127,7 @@ define([
124127
apply: function (value) {
125128
value = value || this.inputValue;
126129

130+
this.keywordUpdated = this.value !== this.inputValue;
127131
this.value = this.inputValue = value.trim();
128132

129133
return this;

0 commit comments

Comments
 (0)