fix(ui): ListWatch should not _both_ set and depend on nextOffset (…

…#12672) Signed-off-by: Anton Gilgur <agilgur5@gmail.com>
argoproj · Feb 17, 2024 · 030d581 · 030d581
1 parent 8ebf433
commit 030d581
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ui/src/app/shared/components/pagination-panel.tsx b/ui/src/app/shared/components/pagination-panel.tsx
@@ -39,7 +39,7 @@ export function PaginationPanel(props: {pagination: Pagination; onChange: (pagin
                         // we should not skip any by setting an offset.
                         // The offset must be initialized whenever the pagination limit is changed.
                         if (limit) {
-                            newValue.offset = '';
+                            newValue.offset = undefined;
                         }
 
                         props.onChange(newValue);

diff --git a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx
@@ -54,9 +54,9 @@ export function WorkflowsList({match, location, history}: RouteComponentProps<an
 
     const [namespace, setNamespace] = useState(Utils.getNamespace(match.params.namespace) || '');
     const [pagination, setPagination] = useState<Pagination>(() => {
-        const savedPaginationLimit = storage.getItem('options', {}).paginationLimit || 0;
+        const savedPaginationLimit = storage.getItem('options', {}).paginationLimit || undefined;
         return {
-            offset: queryParams.get('name'),
+            offset: queryParams.get('offset') || undefined,
             limit: parseLimit(queryParams.get('limit')) || savedPaginationLimit || 50
         };
     });
@@ -155,7 +155,7 @@ export function WorkflowsList({match, location, history}: RouteComponentProps<an
             clearSelectedWorkflows();
             listWatch.stop();
         };
-    }, [namespace, phases.toString(), labels.toString(), pagination.limit, pagination.offset, pagination.nextOffset]); // referential equality, so use values, not refs
+    }, [namespace, phases.toString(), labels.toString(), pagination.limit, pagination.offset]); // referential equality, so use values, not refs
 
     useCollectEvent('openedWorkflowList');