ensure pageIndex is set correclty in analytics list (#62041)

elastic · Apr 1, 2020 · 4ecddeb · 4ecddeb
1 parent 710615b
commit 4ecddeb
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/...a_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx b/...a_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx
@@ -189,6 +189,14 @@ export const DataFrameAnalyticsList: FC<Props> = ({
       .filter(m => (m && m.count) >= clauses.length)
       .map(m => m.analytics);
 
+    let pageStart = pageIndex * pageSize;
+    if (pageStart >= filtered.length && filtered.length !== 0) {
+      // if the page start is larger than the number of items due to
+      // filters being applied, calculate a new page start
+      pageStart = Math.floor((filtered.length - 1) / pageSize) * pageSize;
+      setPageIndex(pageStart / pageSize);
+    }
+
     setFilteredAnalytics(filtered);
     setIsLoading(false);
   };