File tree Expand file tree Collapse file tree 2 files changed +17
-10
lines changed
packages/core/admin/hooks Expand file tree Collapse file tree 2 files changed +17
-10
lines changed Original file line number Diff line number Diff line change 1+ ---
2+ " strapi-plugin-webtools " : patch
3+ ---
4+
5+ fix: issue with pagination when simulteously using the filter options
Original file line number Diff line number Diff line change @@ -9,22 +9,24 @@ const useQueryParams = () => {
99 const searchParams = new URLSearchParams ( location . search ) ;
1010 const page = searchParams . get ( 'page' ) ;
1111 const pageSize = searchParams . get ( 'pageSize' ) ;
12+ searchParams . delete ( 'page' ) ;
13+ searchParams . delete ( 'pageSize' ) ;
1214
13- if ( page || pageSize ) {
14- if ( page ) {
15- searchParams . delete ( 'page' ) ;
16- searchParams . append ( 'pagination[page]' , page ) ;
17- }
1815
19- if ( pageSize ) {
20- searchParams . delete ( 'pageSize ') ;
21- searchParams . append ( 'pagination[pageSize]' , pageSize ) ;
22- }
16+ if ( ! page && ! pageSize ) {
17+ searchParams . append ( 'pagination[page]' , '1 ') ;
18+ searchParams . append ( 'pagination[pageSize]' , '10' ) ;
19+ }
2320
24- setParams ( searchParams . toString ( ) ) ;
21+ if ( page && pageSize ) {
22+ searchParams . append ( 'pagination[page]' , page ) ;
23+ searchParams . append ( 'pagination[pageSize]' , pageSize ) ;
2524 }
25+
26+ setParams ( searchParams . toString ( ) ) ;
2627 } , [ location ] ) ;
2728
29+
2830 return params ;
2931} ;
3032
You can’t perform that action at this time.
0 commit comments