Skip to content

Commit 3114959

Browse files
committed
[EAM-1022] Reset pageIndex when manual search or sorting
1 parent e7e0ff1 commit 3114959

File tree

2 files changed

+27
-8
lines changed

2 files changed

+27
-8
lines changed

dist/ui/components/grids/eam/EAMGridContext.js

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,15 @@ var EAMGridContextProvider = function EAMGridContextProvider(props) {
246246
});
247247
}, [fetchDataCancelToken, setFetchDataCancelToken]);
248248
var handleOnSearch = (0, _react.useCallback)(function () {
249+
setPageIndex(0);
250+
251+
var newGridRequest = _objectSpread({}, gridRequest, {
252+
cursorPosition: 0
253+
});
254+
255+
setGridRequest(newGridRequest);
249256
tableInstance.toggleAllRowsSelected(false);
250-
fetchData(gridRequest);
257+
fetchData(newGridRequest);
251258
}, [tableInstance, fetchData, gridRequest]);
252259
var handleExportToCSV = (0, _react.useCallback)(function () {
253260
setLoadingExportToCSV(true);
@@ -268,10 +275,11 @@ var EAMGridContextProvider = function EAMGridContextProvider(props) {
268275
if (JSON.stringify(newGridFilters) === JSON.stringify(gridRequest.gridFilter)) return;
269276
setGridRequest(_objectSpread({}, gridRequest, {
270277
gridFilter: newGridFilters,
271-
includeMetadata: false
278+
includeMetadata: false,
279+
cursorPosition: 1
272280
}));
273281
onChangeFilters && onChangeFilters(newGridFilters);
274-
}, [filters, gridRequest, onChangeFilters]);
282+
}, [filters, gridRequest, onChangeFilters, tableInstance]);
275283
(0, _react.useEffect)(function () {
276284
var newGridSort = sortBy.map(function (sort) {
277285
return {
@@ -283,13 +291,15 @@ var EAMGridContextProvider = function EAMGridContextProvider(props) {
283291

284292
var newGridRequest = _objectSpread({}, gridRequest, {
285293
gridSort: newGridSort,
286-
includeMetadata: false
294+
includeMetadata: false,
295+
cursorPosition: 0
287296
});
288297

298+
setPageIndex(0);
289299
setGridRequest(newGridRequest);
290300
fetchData(newGridRequest);
291301
onChangeSortBy && onChangeSortBy(sortBy);
292-
}, [sortBy, gridRequest, onChangeSortBy, fetchData]);
302+
}, [sortBy, gridRequest, onChangeSortBy, fetchData, tableInstance]);
293303
var handleChangePage = (0, _react.useCallback)(function (page) {
294304
setPageIndex(page);
295305
var newCursorPosition = page * rowsPerPage + 1;

src/ui/components/grids/eam/EAMGridContext.js

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,14 @@ export const EAMGridContextProvider = (props) => {
151151

152152
const handleOnSearch = useCallback(
153153
() => {
154+
setPageIndex(0);
155+
const newGridRequest = {
156+
...gridRequest,
157+
cursorPosition: 0,
158+
};
159+
setGridRequest(newGridRequest);
154160
tableInstance.toggleAllRowsSelected(false);
155-
fetchData(gridRequest);
161+
fetchData(newGridRequest);
156162
},
157163
[tableInstance, fetchData, gridRequest]
158164
);
@@ -183,10 +189,11 @@ export const EAMGridContextProvider = (props) => {
183189
...gridRequest,
184190
gridFilter: newGridFilters,
185191
includeMetadata: false,
192+
cursorPosition: 1,
186193
});
187194
onChangeFilters && onChangeFilters(newGridFilters);
188195
},
189-
[filters, gridRequest, onChangeFilters]
196+
[filters, gridRequest, onChangeFilters, tableInstance]
190197
);
191198

192199
useEffect(
@@ -197,12 +204,14 @@ export const EAMGridContextProvider = (props) => {
197204
...gridRequest,
198205
gridSort: newGridSort,
199206
includeMetadata: false,
207+
cursorPosition: 0,
200208
};
209+
setPageIndex(0);
201210
setGridRequest(newGridRequest);
202211
fetchData(newGridRequest);
203212
onChangeSortBy && onChangeSortBy(sortBy);
204213
},
205-
[sortBy, gridRequest, onChangeSortBy, fetchData]
214+
[sortBy, gridRequest, onChangeSortBy, fetchData, tableInstance]
206215
);
207216

208217
const handleChangePage = useCallback(

0 commit comments

Comments
 (0)