From c44a29a9b3dd7a9ca401c49c20e244ebc67323e7 Mon Sep 17 00:00:00 2001
From: Maja Grubic <maja.grubic@elastic.co>
Date: Tue, 9 Nov 2021 09:27:59 +0100
Subject: [PATCH 1/3] [Discover] Add error boundary to cath errors in
 functionals

---
 .../application/main/discover_main_app.tsx    | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/plugins/discover/public/application/main/discover_main_app.tsx b/src/plugins/discover/public/application/main/discover_main_app.tsx
index ea3f852a5290a..dbed2b104a01c 100644
--- a/src/plugins/discover/public/application/main/discover_main_app.tsx
+++ b/src/plugins/discover/public/application/main/discover_main_app.tsx
@@ -7,6 +7,7 @@
  */
 import React, { useCallback, useEffect } from 'react';
 import { History } from 'history';
+import { EuiErrorBoundary } from '@elastic/eui/src/components/error_boundary';
 import { DiscoverLayout } from './components/layout';
 import { setBreadcrumbsTitle } from '../../utils/breadcrumbs';
 import { addHelpMenuToAppChrome } from '../../components/help_menu/help_menu_util';
@@ -96,21 +97,23 @@ export function DiscoverMainApp(props: DiscoverMainProps) {
   }, [resetSavedSearch, savedSearch]);
 
   return (
-    <DiscoverLayoutMemoized
-      indexPattern={indexPattern}
-      indexPatternList={indexPatternList}
-      inspectorAdapters={inspectorAdapters}
-      onChangeIndexPattern={onChangeIndexPattern}
-      onUpdateQuery={onUpdateQuery}
-      resetSavedSearch={resetCurrentSavedSearch}
-      navigateTo={navigateTo}
-      savedSearch={savedSearch}
-      savedSearchData$={data$}
-      savedSearchRefetch$={refetch$}
-      searchSource={searchSource}
-      services={services}
-      state={state}
-      stateContainer={stateContainer}
-    />
+    <EuiErrorBoundary>
+      <DiscoverLayoutMemoized
+        indexPattern={indexPattern}
+        indexPatternList={indexPatternList}
+        inspectorAdapters={inspectorAdapters}
+        onChangeIndexPattern={onChangeIndexPattern}
+        onUpdateQuery={onUpdateQuery}
+        resetSavedSearch={resetCurrentSavedSearch}
+        navigateTo={navigateTo}
+        savedSearch={savedSearch}
+        savedSearchData$={data$}
+        savedSearchRefetch$={refetch$}
+        searchSource={searchSource}
+        services={services}
+        state={state}
+        stateContainer={stateContainer}
+      />
+    </EuiErrorBoundary>
   );
 }

From f40a50630a50d053fc6cd37d5b69760983eacd4a Mon Sep 17 00:00:00 2001
From: Maja Grubic <maja.grubic@elastic.co>
Date: Tue, 9 Nov 2021 10:26:41 +0100
Subject: [PATCH 2/3] Fix invalid import

---
 .../discover/public/application/main/discover_main_app.tsx      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/discover/public/application/main/discover_main_app.tsx b/src/plugins/discover/public/application/main/discover_main_app.tsx
index dbed2b104a01c..0f47e9f9b3de7 100644
--- a/src/plugins/discover/public/application/main/discover_main_app.tsx
+++ b/src/plugins/discover/public/application/main/discover_main_app.tsx
@@ -7,7 +7,7 @@
  */
 import React, { useCallback, useEffect } from 'react';
 import { History } from 'history';
-import { EuiErrorBoundary } from '@elastic/eui/src/components/error_boundary';
+import { EuiErrorBoundary } from '@elastic/eui';
 import { DiscoverLayout } from './components/layout';
 import { setBreadcrumbsTitle } from '../../utils/breadcrumbs';
 import { addHelpMenuToAppChrome } from '../../components/help_menu/help_menu_util';

From fbf7cdf46a71a5b4402e7e0b6a815efb681642bb Mon Sep 17 00:00:00 2001
From: Maja Grubic <maja.grubic@elastic.co>
Date: Mon, 15 Nov 2021 09:28:34 +0100
Subject: [PATCH 3/3] Move <EuiErrorBoundary> to router

---
 .../public/application/discover_router.tsx    | 49 ++++++++++---------
 .../application/main/discover_main_app.tsx    | 35 ++++++-------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/plugins/discover/public/application/discover_router.tsx b/src/plugins/discover/public/application/discover_router.tsx
index 6f88c28b52bf9..66ad0cccd03c7 100644
--- a/src/plugins/discover/public/application/discover_router.tsx
+++ b/src/plugins/discover/public/application/discover_router.tsx
@@ -9,6 +9,7 @@
 import { Redirect, Route, Router, Switch } from 'react-router-dom';
 import React from 'react';
 import { History } from 'history';
+import { EuiErrorBoundary } from '@elastic/eui';
 import { KibanaContextProvider } from '../../../kibana_react/public';
 import { ContextAppRoute } from './context';
 import { SingleDocRoute } from './doc';
@@ -25,29 +26,31 @@ export const discoverRouter = (services: DiscoverServices, history: History) =>
 
   return (
     <KibanaContextProvider services={services}>
-      <Router history={history} data-test-subj="discover-react-router">
-        <Switch>
-          <Route
-            path="/context/:indexPatternId/:id"
-            children={<ContextAppRoute services={services} />}
-          />
-          <Route
-            path="/doc/:indexPattern/:index/:type"
-            render={(props) => (
-              <Redirect
-                to={`/doc/${props.match.params.indexPattern}/${props.match.params.index}`}
-              />
-            )}
-          />
-          <Route
-            path="/doc/:indexPatternId/:index"
-            children={<SingleDocRoute services={services} />}
-          />
-          <Route path="/view/:id" children={<DiscoverMainRoute {...mainRouteProps} />} />
-          <Route path="/" exact children={<DiscoverMainRoute {...mainRouteProps} />} />
-          <NotFoundRoute services={services} />
-        </Switch>
-      </Router>
+      <EuiErrorBoundary>
+        <Router history={history} data-test-subj="discover-react-router">
+          <Switch>
+            <Route
+              path="/context/:indexPatternId/:id"
+              children={<ContextAppRoute services={services} />}
+            />
+            <Route
+              path="/doc/:indexPattern/:index/:type"
+              render={(props) => (
+                <Redirect
+                  to={`/doc/${props.match.params.indexPattern}/${props.match.params.index}`}
+                />
+              )}
+            />
+            <Route
+              path="/doc/:indexPatternId/:index"
+              children={<SingleDocRoute services={services} />}
+            />
+            <Route path="/view/:id" children={<DiscoverMainRoute {...mainRouteProps} />} />
+            <Route path="/" exact children={<DiscoverMainRoute {...mainRouteProps} />} />
+            <NotFoundRoute services={services} />
+          </Switch>
+        </Router>
+      </EuiErrorBoundary>
     </KibanaContextProvider>
   );
 };
diff --git a/src/plugins/discover/public/application/main/discover_main_app.tsx b/src/plugins/discover/public/application/main/discover_main_app.tsx
index 0f47e9f9b3de7..ea3f852a5290a 100644
--- a/src/plugins/discover/public/application/main/discover_main_app.tsx
+++ b/src/plugins/discover/public/application/main/discover_main_app.tsx
@@ -7,7 +7,6 @@
  */
 import React, { useCallback, useEffect } from 'react';
 import { History } from 'history';
-import { EuiErrorBoundary } from '@elastic/eui';
 import { DiscoverLayout } from './components/layout';
 import { setBreadcrumbsTitle } from '../../utils/breadcrumbs';
 import { addHelpMenuToAppChrome } from '../../components/help_menu/help_menu_util';
@@ -97,23 +96,21 @@ export function DiscoverMainApp(props: DiscoverMainProps) {
   }, [resetSavedSearch, savedSearch]);
 
   return (
-    <EuiErrorBoundary>
-      <DiscoverLayoutMemoized
-        indexPattern={indexPattern}
-        indexPatternList={indexPatternList}
-        inspectorAdapters={inspectorAdapters}
-        onChangeIndexPattern={onChangeIndexPattern}
-        onUpdateQuery={onUpdateQuery}
-        resetSavedSearch={resetCurrentSavedSearch}
-        navigateTo={navigateTo}
-        savedSearch={savedSearch}
-        savedSearchData$={data$}
-        savedSearchRefetch$={refetch$}
-        searchSource={searchSource}
-        services={services}
-        state={state}
-        stateContainer={stateContainer}
-      />
-    </EuiErrorBoundary>
+    <DiscoverLayoutMemoized
+      indexPattern={indexPattern}
+      indexPatternList={indexPatternList}
+      inspectorAdapters={inspectorAdapters}
+      onChangeIndexPattern={onChangeIndexPattern}
+      onUpdateQuery={onUpdateQuery}
+      resetSavedSearch={resetCurrentSavedSearch}
+      navigateTo={navigateTo}
+      savedSearch={savedSearch}
+      savedSearchData$={data$}
+      savedSearchRefetch$={refetch$}
+      searchSource={searchSource}
+      services={services}
+      state={state}
+      stateContainer={stateContainer}
+    />
   );
 }