@@ -294,6 +294,12 @@ const AppList = ({ isArgoInstalled }: AppListPropType) => {
294
294
/>
295
295
)
296
296
297
+ const removePageNumber = ( search : string ) => {
298
+ const searchParams = new URLSearchParams ( search )
299
+ searchParams . delete ( 'pageNumber' )
300
+ return searchParams . toString ( ) ? `?${ searchParams . toString ( ) } ` : ''
301
+ }
302
+
297
303
const tabs : TabProps [ ] = [
298
304
...( serverMode === SERVER_MODE . FULL
299
305
? [
@@ -304,7 +310,7 @@ const AppList = ({ isArgoInstalled }: AppListPropType) => {
304
310
props : {
305
311
to : {
306
312
pathname : getChangeAppTabURL ( AppListConstants . AppTabs . DEVTRON_APPS ) ,
307
- search : location . search ,
313
+ search : removePageNumber ( location . search ) ,
308
314
} ,
309
315
'data-testid' : 'devtron-app-list-button' ,
310
316
} ,
@@ -318,7 +324,7 @@ const AppList = ({ isArgoInstalled }: AppListPropType) => {
318
324
props : {
319
325
to : {
320
326
pathname : getChangeAppTabURL ( AppListConstants . AppTabs . HELM_APPS ) ,
321
- search : location . search ,
327
+ search : removePageNumber ( location . search ) ,
322
328
} ,
323
329
'data-testid' : 'helm-app-list-button' ,
324
330
} ,
@@ -332,7 +338,7 @@ const AppList = ({ isArgoInstalled }: AppListPropType) => {
332
338
props : {
333
339
to : {
334
340
pathname : getChangeAppTabURL ( AppListConstants . AppTabs . ARGO_APPS ) ,
335
- search : location . search ,
341
+ search : removePageNumber ( location . search ) ,
336
342
} ,
337
343
'data-testid' : 'argo-app-list-button' ,
338
344
} ,
@@ -348,7 +354,7 @@ const AppList = ({ isArgoInstalled }: AppListPropType) => {
348
354
props : {
349
355
to : {
350
356
pathname : getChangeAppTabURL ( AppListConstants . AppTabs . FLUX_APPS ) ,
351
- search : location . search ,
357
+ search : removePageNumber ( location . search ) ,
352
358
} ,
353
359
'data-testid' : 'flux-app-list-button' ,
354
360
} ,
0 commit comments