Consider condition when the configured defaultIndex is wrong

elastic · Oct 11, 2019 · aff471d · aff471d
1 parent 60e3557
commit aff471d
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/legacy/core_plugins/kibana/public/discover/controllers/discover.js b/src/legacy/core_plugins/kibana/public/discover/controllers/discover.js
@@ -134,18 +134,21 @@ uiRoutes
            *  @type {State}
            */
           const state = new State('_a', {});
+          const findIndexById = (id) => savedObjects.find(o => o.id === id);
+
           /**
            * returns the id of the default index, if none is configured
            * the value of the first available indexpattern/saved object is used
            */
           const getDefaultIndexId = () => {
-            if(config.get('defaultIndex')) {
-              return config.get('defaultIndex');
+            const defaultIndex = config.get('defaultIndex');
+            if(defaultIndex && findIndexById(defaultIndex)) {
+              return defaultIndex;
             }
             return !savedObjects.length ? '' : savedObjects[0].id;
           };
 
-          const exists = _.findIndex(savedObjects, o => o.id === state.index) > -1;
+          const exists = state.index && findIndexById(state.index);
           const id = exists ? state.index : getDefaultIndexId();
           state.destroy();