Changes settings to management

src/plugins/kibana/index.js

@@ -19,14 +19,13 @@ module.exports = function (kibana) {
         title: 'Kibana',
         listed: false,
         description: 'the kibana you know and love',
-        //icon: 'plugins/kibana/settings/sections/about/barcode.svg',
         main: 'plugins/kibana/kibana',
         uses: [
           'visTypes',
           'spyModes',
           'fieldFormats',
           'navbarExtensions',
-          'settingsSections',
+          'managementSections',
           'docViews'
         ],
 
@@ -62,11 +61,12 @@ module.exports = function (kibana) {
           icon: 'plugins/kibana/assets/dashboard.svg',
         },
         {
-          title: 'Settings',
+          title: 'Management',
           order: 1000,
-          url: '/app/kibana#/settings',
+          url: '/app/kibana#/management',
           description: 'define index patterns, change config, and more',
           icon: 'plugins/kibana/assets/settings.svg',
+          linkToLastSubUrl: false
         }
       ],
       injectDefaultVars(server, options) {

src/plugins/kibana/public/dashboard/components/panel/panel.js

@@ -15,7 +15,7 @@ uiModules
   const filterManager = Private(FilterManagerProvider);
   const notify = new Notifier();
 
-  const services = require('plugins/kibana/settings/saved_object_registry').all().map(function (serviceObj) {
+  const services = require('plugins/kibana/management/saved_object_registry').all().map(function (serviceObj) {
     const service = $injector.get(serviceObj.service);
     return {
       type: service.type,
@@ -79,7 +79,7 @@ uiModules
           const service = _.find(services, { type: type });
           if (!service) return;
 
-          $scope.editUrl = '#settings/objects/' + service.name + '/' + id + '?notFound=' + e.savedObjectType;
+          $scope.editUrl = '#management/kibana/objects/' + service.name + '/' + id + '?notFound=' + e.savedObjectType;
         });
 
       });

src/plugins/kibana/public/dashboard/services/saved_dashboards.js

@@ -9,7 +9,7 @@ const module = uiModules.get('app/dashboard');
 
 // Register this service with the saved object registry so it can be
 // edited by the object editor.
-require('plugins/kibana/settings/saved_object_registry').register({
+require('plugins/kibana/management/saved_object_registry').register({
   service: 'savedDashboards',
   title: 'dashboards'
 });

src/plugins/kibana/public/discover/controllers/discover.js

@@ -65,7 +65,7 @@ uiRoutes
       return savedSearches.get($route.current.params.id)
       .catch(courier.redirectWhenMissing({
         'search': '/discover',
-        'index-pattern': '/settings/objects/savedSearches/' + $route.current.params.id
+        'index-pattern': '/management/kibana/objects/savedSearches/' + $route.current.params.id
       }));
     }
   }

src/plugins/kibana/public/discover/saved_searches/saved_searches.js

@@ -11,7 +11,7 @@ const module = uiModules.get('discover/saved_searches', [
 
 // Register this service with the saved object registry so it can be
 // edited by the object editor.
-require('plugins/kibana/settings/saved_object_registry').register({
+require('plugins/kibana/management/saved_object_registry').register({
   service: 'savedSearches',
   title: 'searches'
 });

src/plugins/kibana/public/kibana.js

@@ -11,7 +11,7 @@ import 'ui/autoload/all';
 import 'plugins/kibana/discover/index';
 import 'plugins/kibana/visualize/index';
 import 'plugins/kibana/dashboard/index';
-import 'plugins/kibana/settings/index';
+import 'plugins/kibana/management/index';
 import 'plugins/kibana/doc';
 import 'ui/vislib';
 import 'ui/agg_response';

src/plugins/kibana/public/management/app.html

@@ -0,0 +1,23 @@
+<div class="app-container">
+  <nav class="navbar navbar-default navbar-static-top subnav" data-test-subj="managementNav">
+    <bread-crumbs omit-current-page="true"></bread-crumbs>
+
+    <ul class="nav navbar-nav">
+      <li class="current-page" ng-hide="sectionName">
+        {{::section.display}}
+      </li>
+
+      <li
+        ng-if="sectionName"
+        ng-repeat="item in section.items.inOrder"
+        ng-class="item.class">
+
+        <a class="navbar-link" kbn-href="{{::item.url}}" data-test-subj="{{::item.name}}">
+          {{::item.display}}
+        </a>
+      </li>
+    </ul>
+  </nav>
+
+  <div role="main" class="management-container" ng-transclude></div>
+</div>

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

@@ -0,0 +1,64 @@
+import _ from 'lodash';
+
+import 'plugins/kibana/management/sections';
+import 'plugins/kibana/management/styles/main.less';
+import 'ui/filters/start_from';
+import 'ui/field_editor';
+import 'plugins/kibana/management/sections/indices/_indexed_fields';
+import 'plugins/kibana/management/sections/indices/_scripted_fields';
+import 'ui/directives/bread_crumbs';
+import uiRoutes from 'ui/routes';
+import uiModules from 'ui/modules';
+import appTemplate from 'plugins/kibana/management/app.html';
+import landingTemplate from 'plugins/kibana/management/landing.html';
+import chrome from 'ui/chrome/chrome';
+import management from 'ui/management';
+
+uiRoutes
+.when('/management', {
+  template: landingTemplate
+});
+
+require('ui/index_patterns/route_setup/load_default')({
+  notRequiredRe: /^\/management\/data\//,
+  whenMissingRedirectTo: '/management/data/index'
+});
+
+uiModules
+.get('apps/management')
+.directive('kbnManagementApp', function (Private, $route, $location, timefilter, buildNum, buildSha) {
+  return {
+    restrict: 'E',
+    template: appTemplate,
+    transclude: true,
+    scope: {
+      sectionName: '@section'
+    },
+
+    link: function ($scope) {
+      timefilter.enabled = false;
+      $scope.sections = management.items.inOrder;
+      $scope.section = management.getSection($scope.sectionName) || management;
+
+      if ($scope.section) {
+        $scope.section.items.forEach(item => {
+          item.class = `#${$location.path()}`.indexOf(item.url) > -1 ? 'active' : undefined;
+        });
+      }
+
+      management.getSection('kibana').info = `Build ${buildNum}, Commit SHA ${buildSha.substr(0, 8)}`;
+    }
+  };
+});
+
+uiModules
+.get('apps/management')
+.directive('kbnManagementLanding', function (kbnVersion) {
+  return {
+    restrict: 'E',
+    link: function ($scope) {
+      $scope.sections = management.items.inOrder;
+      $scope.kbnVersion = kbnVersion;
+    }
+  };
+});

src/plugins/kibana/public/management/landing.html

@@ -0,0 +1,45 @@
+<kbn-management-app>
+  <kbn-management-landing>
+    <div class="product-overview">
+      <span class="kibana-version">Version: {{::kbnVersion}}</span>
+    </div>
+    <div class="management-sections">
+      <div
+        ng-if="section.items.length > 0"
+        ng-repeat="section in sections"
+        ng-class="{ 'management-section-info-expanded': section.showInfo }"
+        class="col-xs-12 management-section management-section-{{::section.id}}">
+
+        <div class="panel panel-product management-panel-product">
+          <div class="panel-heading panel-heading-{{::section.id}}">
+            {{::section.display}}
+
+            <i
+              class="fa fa-info-circle pull-right panel-heading-icon"
+              ng-click="section.showInfo = !!!section.showInfo"
+              ng-if="section.info">
+            </i>
+          </div>
+
+          <div class="panel-body">
+            <div class="row">
+              <ul class="management-section-items list-unstyled">
+                <li
+                  class="col-xs-4 col-md-3"
+                  ng-repeat="item in section.items.inOrder">
+
+                  <a class="management-link" kbn-href="{{::item.url}}">
+                    {{::item.display}}
+                  </a>
+                </li>
+              </ul>
+            </div>
+            <div class="management-section-info">
+              {{::section.info}}
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </kbn-management-landing>
+</kbn-management-app>

src/plugins/kibana/public/management/sections/index.js

@@ -0,0 +1,3 @@
+import 'plugins/kibana/management/sections/settings';
+import 'plugins/kibana/management/sections/objects';
+import 'plugins/kibana/management/sections/indices';

src/plugins/kibana/public/settings/sections/indices/_create.html → src/plugins/kibana/public/management/sections/indices/_create.html

@@ -1,6 +1,6 @@
-<kbn-settings-app section="indices">
-  <kbn-settings-indices>
-    <div ng-controller="settingsIndicesCreate" class="kbn-settings-indices-create">
+<kbn-management-app section="data">
+  <kbn-management-indices>
+    <div ng-controller="managementIndicesCreate" class="kbn-management-indices-create">
       <div class="page-header">
         <h1>Configure an index pattern</h1>
         In order to use Kibana you must configure at least one index pattern. Index patterns are
@@ -177,5 +177,5 @@ <h4>Time-interval based index patterns are deprecated!</h4>
         </form>
       </div>
     </div>
-  </kbn-settings-indices>
-</kbn-settings-app>
+  </kbn-management-indices>
+</kbn-management-app>

src/plugins/kibana/public/settings/sections/indices/_create.js → src/plugins/kibana/public/management/sections/indices/_create.js

@@ -3,21 +3,20 @@ import moment from 'moment';
 import { IndexPatternMissingIndices } from 'ui/errors';
 import 'ui/directives/validate_index_name';
 import 'ui/directives/auto_select_if_only_one';
-import PluginsKibanaSettingsSectionsIndicesRefreshKibanaIndexProvider from 'plugins/kibana/settings/sections/indices/_refresh_kibana_index';
+import RefreshKibanaIndex from 'plugins/kibana/management/sections/indices/_refresh_kibana_index';
 import uiRoutes from 'ui/routes';
 import uiModules from 'ui/modules';
-import createTemplate from 'plugins/kibana/settings/sections/indices/_create.html';
-
+import createTemplate from 'plugins/kibana/management/sections/indices/_create.html';
 
 uiRoutes
-.when('/settings/indices/', {
+.when('/management/data/index/', {
   template: createTemplate
 });
 
-uiModules.get('apps/settings')
-.controller('settingsIndicesCreate', function ($scope, kbnUrl, Private, Notifier, indexPatterns, es, config, Promise) {
+uiModules.get('apps/management')
+.controller('managementIndicesCreate', function ($scope, kbnUrl, Private, Notifier, indexPatterns, es, config, Promise) {
   const notify = new Notifier();
-  const refreshKibanaIndex = Private(PluginsKibanaSettingsSectionsIndicesRefreshKibanaIndexProvider);
+  const refreshKibanaIndex = Private(RefreshKibanaIndex);
   const intervals = indexPatterns.intervals;
   let samplePromise;
 
@@ -73,7 +72,7 @@ uiModules.get('apps/settings')
               config.set('defaultIndex', indexPattern.id);
             }
             indexPatterns.cache.clear(indexPattern.id);
-            kbnUrl.change('/settings/indices/' + indexPattern.id);
+            kbnUrl.change('/management/kibana/indices/' + indexPattern.id);
           });
         }
       });

src/plugins/kibana/public/settings/sections/indices/_edit.html → src/plugins/kibana/public/management/sections/indices/_edit.html

@@ -1,13 +1,13 @@
-<kbn-settings-app section="indices">
-  <kbn-settings-indices>
-    <div ng-controller="settingsIndicesEdit">
+<kbn-management-app section="kibana">
+  <kbn-management-indices>
+    <div ng-controller="managementIndicesEdit">
       <div class="page-header">
-        <kbn-settings-index-header
+        <kbn-management-index-header
           index-pattern="indexPattern"
           set-default="setDefaultPattern()"
           refresh-fields="indexPattern.refreshFields()"
           delete="removePattern()">
-        </kbn-settings-index-header>
+        </kbn-management-index-header>
 
         <p>
           This page lists every field in the <strong>{{::indexPattern.id}}</strong>
@@ -38,7 +38,7 @@
       <br />
 
       <ul class="nav nav-tabs">
-        <li class="kbn-settings-tab" ng-class="{ active: state.tab === fieldType.index }" ng-repeat="fieldType in fieldTypes">
+        <li class="kbn-management-tab" ng-class="{ active: state.tab === fieldType.index }" ng-repeat="fieldType in fieldTypes">
           <a ng-click="changeTab(fieldType)">
             {{ fieldType.title }}
             <small>({{ fieldType.count }})</small>
@@ -50,5 +50,5 @@
       <scripted-fields ng-show="state.tab == 'scriptedFields'" class="fields scripted-fields"></scripted-fields>
 
     </div>
-  </kbn-settings-indices>
-</kbn-settings-app>
+  </kbn-management-indices>
+</kbn-management-app>

src/plugins/kibana/public/settings/sections/indices/_edit.js → src/plugins/kibana/public/management/sections/indices/_edit.js

@@ -1,38 +1,44 @@
 import _ from 'lodash';
-import 'plugins/kibana/settings/sections/indices/_indexed_fields';
-import 'plugins/kibana/settings/sections/indices/_scripted_fields';
-import 'plugins/kibana/settings/sections/indices/_index_header';
-import PluginsKibanaSettingsSectionsIndicesRefreshKibanaIndexProvider from 'plugins/kibana/settings/sections/indices/_refresh_kibana_index';
+import 'plugins/kibana/management/sections/indices/_indexed_fields';
+import 'plugins/kibana/management/sections/indices/_scripted_fields';
+import 'plugins/kibana/management/sections/indices/_index_header';
+import RefreshKibanaIndex from 'plugins/kibana/management/sections/indices/_refresh_kibana_index';
 import UrlProvider from 'ui/url';
-import PluginsKibanaSettingsSectionsIndicesFieldTypesProvider from 'plugins/kibana/settings/sections/indices/_field_types';
+import IndicesFieldTypesProvider from 'plugins/kibana/management/sections/indices/_field_types';
 import uiRoutes from 'ui/routes';
 import uiModules from 'ui/modules';
-import editTemplate from 'plugins/kibana/settings/sections/indices/_edit.html';
+import editTemplate from 'plugins/kibana/management/sections/indices/_edit.html';
 
 uiRoutes
-.when('/settings/indices/:indexPatternId', {
+.when('/management/kibana/indices/:indexPatternId?', {
   template: editTemplate,
   resolve: {
-    indexPattern: function ($route, courier) {
-      return courier.indexPatterns.get($route.current.params.indexPatternId)
-      .catch(courier.redirectWhenMissing('/settings/indices'));
+    indexPattern: function ($route, config, courier) {
+      const params = $route.current.params;
+
+      if (typeof params.indexPatternId === 'undefined') {
+        params.indexPatternId = config.get('defaultIndex');
+      }
+
+      return courier.indexPatterns.get(params.indexPatternId)
+      .catch(courier.redirectWhenMissing('/management/data/index'));
     }
   }
 });
 
-uiModules.get('apps/settings')
-.controller('settingsIndicesEdit', function ($scope, $location, $route, config, courier, Notifier, Private, AppState, docTitle) {
+uiModules.get('apps/management')
+.controller('managementIndicesEdit', function ($scope, $location, $route, config, courier, Notifier, Private, AppState, docTitle) {
 
   const notify = new Notifier();
   const $state = $scope.state = new AppState();
-  const refreshKibanaIndex = Private(PluginsKibanaSettingsSectionsIndicesRefreshKibanaIndexProvider);
+  const refreshKibanaIndex = Private(RefreshKibanaIndex);
 
   $scope.kbnUrl = Private(UrlProvider);
   $scope.indexPattern = $route.current.locals.indexPattern;
   docTitle.change($scope.indexPattern.id);
   const otherIds = _.without($route.current.locals.indexPatternIds, $scope.indexPattern.id);
 
-  const fieldTypes = Private(PluginsKibanaSettingsSectionsIndicesFieldTypesProvider);
+  const fieldTypes = Private(IndicesFieldTypesProvider);
   $scope.$watch('indexPattern.fields', function () {
     $scope.fieldTypes = fieldTypes($scope.indexPattern);
   });
@@ -65,7 +71,7 @@ uiModules.get('apps/settings')
     courier.indexPatterns.delete($scope.indexPattern)
     .then(refreshKibanaIndex)
     .then(function () {
-      $location.url('/settings/indices');
+      $location.url('/management/data/index');
     })
     .catch(notify.fatal);
   };