From 6b2d91980582dd7a342db03fb3f04cb23f397f42 Mon Sep 17 00:00:00 2001
From: Melissa Alvarez <melissa.alvarez@elastic.co>
Date: Tue, 31 Mar 2020 13:32:07 -0400
Subject: [PATCH] ensure pageIndex is set correclty in analytics list

---
 .../components/analytics_list/analytics_list.tsx          | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx
index 7b386e25e1bac..d2e5f582d23f6 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx
+++ b/x-pack/plugins/ml/public/application/data_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);
   };