From 241c247cfc20b3e6e1fc55dc54341fe2a6b7d795 Mon Sep 17 00:00:00 2001
From: Liza K <liza.katz@elastic.co>
Date: Tue, 10 Mar 2020 11:33:09 +0200
Subject: [PATCH] oss strategy error handling

---
 .../kibana/public/discover/np_ready/angular/discover.js       | 2 +-
 .../data/server/search/es_search/es_search_strategy.ts        | 2 +-
 src/plugins/data/server/search/routes.ts                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
index 22218282902d4..5ccee2b92ce33 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
@@ -804,7 +804,7 @@ function discoverController(
             title: i18n.translate('kbn.discover.errorLoadingData', {
               defaultMessage: 'Error loading data',
             }),
-            toastMessage: error.shortMessage,
+            toastMessage: error.shortMessage || error.body?.message,
           });
         }
       });
diff --git a/src/plugins/data/server/search/es_search/es_search_strategy.ts b/src/plugins/data/server/search/es_search/es_search_strategy.ts
index 610bf62da17d3..326685eb3883b 100644
--- a/src/plugins/data/server/search/es_search/es_search_strategy.ts
+++ b/src/plugins/data/server/search/es_search/es_search_strategy.ts
@@ -36,7 +36,7 @@ export const esSearchStrategyProvider: TSearchStrategyProvider<typeof ES_SEARCH_
 
       // Only default index pattern type is supported here.
       // See data_enhanced for other type support.
-      if (!type) {
+      if (!!type) {
         throw new Error(`Unsupported index pattern type ${type}`);
       }
 
diff --git a/src/plugins/data/server/search/routes.ts b/src/plugins/data/server/search/routes.ts
index 2b8c4b95ee022..e618f99084aed 100644
--- a/src/plugins/data/server/search/routes.ts
+++ b/src/plugins/data/server/search/routes.ts
@@ -43,11 +43,11 @@ export function registerSearchRoute(router: IRouter): void {
         return res.ok({ body: response });
       } catch (err) {
         return res.customError({
-          statusCode: err.statusCode,
+          statusCode: err.statusCode || 500,
           body: {
             message: err.message,
             attributes: {
-              error: err.body.error,
+              error: err.body?.error || err.message,
             },
           },
         });