Merge pull request #7588 from tylersmalley/7563-default-index

Handle indexes with no default
elastic · Jun 29, 2016 · a97184d · a97184d
2 parents 61dd6e1 + 5f5a7be
commit a97184d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/src/plugins/kibana/public/management/sections/indices/_edit.js b/src/plugins/kibana/public/management/sections/indices/_edit.js
@@ -11,18 +11,29 @@ import editTemplate from 'plugins/kibana/management/sections/indices/_edit.html'
 import IngestProvider from 'ui/ingest';
 
 uiRoutes
-.when('/management/kibana/indices/:indexPatternId?', {
+.when('/management/kibana/indices/:indexPatternId', {
   template: editTemplate,
   resolve: {
-    indexPattern: function ($route, config, courier) {
-      const params = $route.current.params;
+    indexPattern: function ($route, courier) {
+      return courier.indexPatterns
+        .get($route.current.params.indexPatternId)
+        .catch(courier.redirectWhenMissing('/management/data/index'));
+    }
+  }
+});
+
+uiRoutes
+.when('/management/kibana/indices', {
+  resolve: {
+    redirect: function ($location, config) {
+      const defaultIndex = config.get('defaultIndex');
+      let path = '/management/data/index';
 
-      if (typeof params.indexPatternId === 'undefined') {
-        params.indexPatternId = config.get('defaultIndex');
+      if (defaultIndex) {
+        path = `/management/kibana/indices/${defaultIndex}`;
       }
 
-      return courier.indexPatterns.get(params.indexPatternId)
-      .catch(courier.redirectWhenMissing('/management/data/index'));
+      $location.path(path).replace();
     }
   }
 });

diff --git a/src/plugins/kibana/public/management/sections/indices/index.js b/src/plugins/kibana/public/management/sections/indices/index.js
@@ -16,8 +16,7 @@ const indexPatternsResolutions = {
 // add a dependency to all of the subsection routes
 uiRoutes
 .defaults(/management\/kibana\/indices/, {
-  resolve: indexPatternsResolutions,
-  requireDefaultIndex: true
+  resolve: indexPatternsResolutions
 });
 
 uiRoutes