Handle missing index pattern

elastic · Jun 6, 2018 · 789d6cb · 789d6cb
1 parent a342b31
commit 789d6cb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/ui/public/index_patterns/static_utils/index.js b/src/ui/public/index_patterns/static_utils/index.js
@@ -28,6 +28,10 @@ export function isFilterable(field) {
 }
 
 export function getFromSavedObject(savedObject) {
+  if (!savedObject) {
+    return null;
+  }
+
   return {
     fields: JSON.parse(savedObject.attributes.fields),
     title: savedObject.attributes.title,

diff --git a/x-pack/plugins/apm/public/components/shared/KueryBar/view.js b/x-pack/plugins/apm/public/components/shared/KueryBar/view.js
@@ -78,6 +78,10 @@ class KueryBarView extends Component {
   };
 
   render() {
+    if (!this.state.indexPattern) {
+      return null;
+    }
+
     return (
       <Container>
         <Typeahead

diff --git a/x-pack/plugins/apm/public/services/rest.js b/x-pack/plugins/apm/public/services/rest.js
@@ -7,7 +7,7 @@
 import 'isomorphic-fetch';
 import { camelizeKeys } from 'humps';
 import { kfetch } from 'ui/kfetch';
-import { memoize, isEmpty, first, startsWith } from 'lodash';
+import { memoize, first, startsWith } from 'lodash';
 import chrome from 'ui/chrome';
 import { convertKueryToEsQuery } from './kuery';
 import { getFromSavedObject } from 'ui/index_patterns/static_utils';
@@ -49,10 +49,6 @@ export const getAPMIndexPattern = memoize(async () => {
     }
   });
 
-  if (isEmpty(res.savedObjects)) {
-    return {};
-  }
-
   const apmIndexPattern = chrome.getInjected('apmIndexPattern');
   const apmSavedObject = first(
     res.savedObjects.filter(