From 936b964f4c721d122ae63b6c6c046ed1a60a0716 Mon Sep 17 00:00:00 2001
From: Justin Kambic <justin.kambic@elastic.co>
Date: Wed, 17 Oct 2018 10:37:09 -0400
Subject: [PATCH] Add unfilteredBeats field to beat list state to prevent
 inappropriate redirect.

---
 .../beats_management/public/pages/main/index.tsx     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/beats_management/public/pages/main/index.tsx b/x-pack/plugins/beats_management/public/pages/main/index.tsx
index 3b935a191062b..ae016f8f4b73a 100644
--- a/x-pack/plugins/beats_management/public/pages/main/index.tsx
+++ b/x-pack/plugins/beats_management/public/pages/main/index.tsx
@@ -39,6 +39,7 @@ interface MainPagesState {
     enrollmentToken: string;
   } | null;
   beats: CMPopulatedBeat[];
+  unfilteredBeats: CMPopulatedBeat[];
   loadedBeatsAtLeastOnce: boolean;
 }
 
@@ -50,6 +51,7 @@ class MainPagesComponent extends React.PureComponent<MainPagesProps, MainPagesSt
     this.state = {
       loadedBeatsAtLeastOnce: false,
       beats: [],
+      unfilteredBeats: [],
     };
   }
   public onSelectedTabChanged = (id: string) => {
@@ -68,7 +70,7 @@ class MainPagesComponent extends React.PureComponent<MainPagesProps, MainPagesSt
   public render() {
     if (
       this.state.loadedBeatsAtLeastOnce &&
-      this.state.beats.length === 0 &&
+      this.state.unfilteredBeats.length === 0 &&
       !this.props.location.pathname.includes('/overview/initial')
     ) {
       return <Redirect to="/overview/initial/help" />;
@@ -231,15 +233,21 @@ class MainPagesComponent extends React.PureComponent<MainPagesProps, MainPagesSt
     }
 
     let beats: CMPopulatedBeat[];
+    let unfilteredBeats: CMPopulatedBeat[];
     try {
-      beats = await this.props.libs.beats.getAll(query);
+      [beats, unfilteredBeats] = await Promise.all([
+        this.props.libs.beats.getAll(query),
+        this.props.libs.beats.getAll(),
+      ]);
     } catch (e) {
       beats = [];
+      unfilteredBeats = [];
     }
     if (this.mounted) {
       this.setState({
         loadedBeatsAtLeastOnce: true,
         beats,
+        unfilteredBeats,
       });
     }
   };