fix(ui): ui should show the same page number as in API (argoproj#38)

alexmt · Oct 28, 2024 · c1cd823 · c1cd823
1 parent 13338bb
commit c1cd823
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ui/src/app/applications/components/applications-list/applications-list.tsx b/ui/src/app/applications/components/applications-list/applications-list.tsx
@@ -548,6 +548,7 @@ export const ApplicationsList = (props: RouteComponentProps<{}>) => {
                                                                         showHeader={healthBarPrefs.showHealthStatusBar}
                                                                         preferencesKey='applications-list'
                                                                         page={pref.page}
+                                                                        defaultPageSize={5}
                                                                         emptyState={() => (
                                                                             <EmptyState icon='fa fa-search'>
                                                                                 <h4>No matching applications found</h4>

diff --git a/ui/src/app/shared/components/paginate/paginate.tsx b/ui/src/app/shared/components/paginate/paginate.tsx
@@ -22,15 +22,16 @@ export interface PaginateProps<T> {
     header?: React.ReactNode;
     showHeader?: boolean;
     sortOptions?: SortOption<T>[];
+    defaultPageSize?: number;
 }
 
-export function Paginate<T>({page, onPageChange, children, data, emptyState, preferencesKey, header, showHeader, sortOptions, total}: PaginateProps<T>) {
+export function Paginate<T>({page, onPageChange, children, data, emptyState, preferencesKey, header, showHeader, sortOptions, total, defaultPageSize}: PaginateProps<T>) {
     const totalItems = total || data.length;
     return (
         <DataLoader load={() => services.viewPreferences.getPreferences()}>
             {pref => {
                 preferencesKey = preferencesKey || 'default';
-                const pageSize = pref.pageSizes[preferencesKey] || 10;
+                const pageSize = pref.pageSizes[preferencesKey] || defaultPageSize || 10;
                 const sortOption = sortOptions ? (pref.sortOptions && pref.sortOptions[preferencesKey]) || sortOptions[0].title : '';
                 const pageCount = pageSize === -1 ? 1 : Math.ceil(totalItems / pageSize);
                 if (pageCount <= page) {