Merge pull request #8560 from elastic/jasper/backport/8559/5.0

[backport] PR #8559 to 5.0 - Remove Connect Data section from Management app

src/core_plugins/kibana/public/management/index.js

@@ -21,7 +21,7 @@ uiRoutes
 });
 
 require('ui/index_patterns/route_setup/load_default')({
-  whenMissingRedirectTo: '/management/data/index'
+  whenMissingRedirectTo: '/management/kibana/index'
 });
 
 uiModules

src/core_plugins/kibana/public/management/sections/indices/_create.html

@@ -1,4 +1,4 @@
-<kbn-management-app section="data">
+<kbn-management-app section="kibana">
   <kbn-management-indices>
     <div ng-controller="managementIndicesCreate" class="kbn-management-indices-create">
       <div class="page-header">

src/core_plugins/kibana/public/management/sections/indices/_create.js

@@ -9,7 +9,7 @@ import uiModules from 'ui/modules';
 import createTemplate from 'plugins/kibana/management/sections/indices/_create.html';
 
 uiRoutes
-.when('/management/data/index/', {
+.when('/management/kibana/index/', {
   template: createTemplate
 });
 

src/core_plugins/kibana/public/management/sections/indices/_edit.js

@@ -17,7 +17,7 @@ uiRoutes
     indexPattern: function ($route, courier) {
       return courier.indexPatterns
         .get($route.current.params.indexPatternId)
-        .catch(courier.redirectWhenMissing('/management/data/index'));
+        .catch(courier.redirectWhenMissing('/management/kibana/index'));
     }
   }
 });
@@ -27,7 +27,7 @@ uiRoutes
   resolve: {
     redirect: function ($location, config) {
       const defaultIndex = config.get('defaultIndex');
-      let path = '/management/data/index';
+      let path = '/management/kibana/index';
 
       if (defaultIndex) {
         path = `/management/kibana/indices/${defaultIndex}`;
@@ -84,7 +84,7 @@ uiModules.get('apps/management')
     courier.indexPatterns.delete($scope.indexPattern)
     .then(refreshKibanaIndex)
     .then(function () {
-      $location.url('/management/data/index');
+      $location.url('/management/kibana/index');
     })
     .catch(notify.fatal);
   };

src/core_plugins/kibana/public/management/sections/indices/index.html

@@ -4,7 +4,7 @@
       <h5>
         <a
           ng-if="editingId"
-          href="#/management/data/index"
+          href="#/management/kibana/index"
           class="btn btn-primary btn-xs"
           aria-label="Add New">
           <span class="sr-only">Add New</span>

src/core_plugins/kibana/public/management/sections/indices/index.js

@@ -19,7 +19,7 @@ uiRoutes
 });
 
 uiRoutes
-.defaults(/management\/data\/index/, {
+.defaults(/management\/kibana\/index/, {
   resolve: indexPatternsResolutions
 });
 
@@ -51,12 +51,6 @@ uiModules.get('apps/management')
   };
 });
 
-management.getSection('data').register('indices', {
-  display: 'Existing Data',
-  order: 0,
-  url: '#/management/data/index/'
-});
-
 management.getSection('kibana').register('indices', {
   display: 'Index Patterns',
   order: 0,

src/ui/public/errors.js

@@ -202,7 +202,7 @@ _.class(errors.NoDefinedIndexPatterns).inherits(KbnError);
 
 
 /**
- * Tried to load a route besides management/data/* but you don't have a default index pattern!
+ * Tried to load a route besides management/kibana/index but you don't have a default index pattern!
  */
 errors.NoDefaultIndexPattern = function NoDefaultIndexPattern(type) {
   KbnError.call(this,

src/ui/public/index_patterns/_ensure_some.js

@@ -6,7 +6,7 @@ export default function EnsureSomeIndexPatternsFn(Private, Notifier, $location,
     return function promiseHandler(patterns) {
       if (!patterns || patterns.length === 0) {
         // notify.warning(new errors.NoDefinedIndexPatterns());
-        kbnUrl.redirectPath('/management/data/index');
+        kbnUrl.redirectPath('/management/kibana/index');
       }
 
       return patterns;

test/functional/apps/management/_creation_form_changes.js

@@ -17,7 +17,7 @@ bdd.describe('user input reactions', function () {
       return PageObjects.settings.navigateTo();
     })
     .then(function () {
-      return PageObjects.settings.clickExistingData();
+      return PageObjects.settings.clickKibanaIndicies();
     });
   });
 

test/functional/apps/management/_index_pattern_create_delete.js

@@ -18,7 +18,7 @@ bdd.describe('creating and deleting default index', function describeIndexTests(
       return PageObjects.settings.navigateTo();
     })
     .then(function () {
-      return PageObjects.settings.clickExistingData();
+      return PageObjects.settings.clickKibanaIndicies();
     });
   });
 

test/functional/apps/management/_index_pattern_results_sort.js

@@ -37,7 +37,7 @@ bdd.describe('index result field sort', function describeIndexTests() {
       bdd.before(function () {
         return PageObjects.settings.navigateTo()
         .then(function () {
-          return PageObjects.settings.clickExistingData();
+          return PageObjects.settings.clickKibanaIndicies();
         });
       });
 

test/functional/apps/management/_initial_state.js

@@ -17,7 +17,7 @@ bdd.describe('initial state', function () {
       return PageObjects.settings.navigateTo();
     })
     .then(function () {
-      return PageObjects.settings.clickExistingData();
+      return PageObjects.settings.clickKibanaIndicies();
     });
   });
 

test/functional/apps/management/_kibana_settings.js

@@ -17,7 +17,7 @@ bdd.describe('creating and deleting default index', function describeIndexTests(
       return PageObjects.settings.navigateTo();
     })
     .then(function () {
-      return PageObjects.settings.clickExistingData();
+      return PageObjects.settings.clickKibanaIndicies();
     })
     .then(function () {
       return PageObjects.settings.createIndexPattern();

test/support/page_objects/settings_page.js

@@ -30,10 +30,6 @@ export default class SettingsPage {
     return this.clickLinkText('Index Patterns');
   }
 
-  clickExistingData() {
-    return this.clickLinkText('Existing Data');
-  }
-
   getAdvancedSettings(propertyName) {
     PageObjects.common.debug('in setAdvancedSettings');
     return PageObjects.common.findTestSubject('advancedSetting&' + propertyName + ' currentValue')
@@ -307,7 +303,7 @@ export default class SettingsPage {
     return PageObjects.common.try(() => {
       return this.navigateTo()
         .then(() => {
-          return this.clickExistingData();
+          return this.clickKibanaIndicies();
         })
         .then(() => {
           return this.selectTimeFieldOption('@timestamp');