oss strategy error handling

elastic · Mar 10, 2020 · 241c247 · 241c247
1 parent d5f9f8a
commit 241c247
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 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
@@ -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
@@ -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
@@ -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,
             },
           },
         });