Merge pull request #7363 from w33ble/backport/settings-registry

[Backport] PR #6077 to 4.x

src/plugins/kibana/index.js

@@ -18,17 +18,16 @@ module.exports = function (kibana) {
         uses: [
           'visTypes',
           'spyModes',
-          'navbarExtensions'
+          'navbarExtensions',
+          'settingsSections',
         ],
 
         autoload: kibana.autoload.require.concat(
           'plugins/kibana/discover',
           'plugins/kibana/visualize',
           'plugins/kibana/dashboard',
           'plugins/kibana/settings',
-          'plugins/kibana/settings/sections',
           'plugins/kibana/doc',
-          'plugins/kibana/settings/sections',
           'ui/vislib',
           'ui/agg_response',
           'ui/agg_types',

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

@@ -1,7 +1,12 @@
 define(function (require, module, exports) {
   const _ = require('lodash');
+  var registry = require('ui/registry/settings_sections');
 
-  const sections = require('plugins/kibana/settings/sections/index');
+  require('plugins/kibana/settings/sections/indices/index');
+  require('plugins/kibana/settings/sections/advanced/index');
+  require('plugins/kibana/settings/sections/objects/index');
+  require('plugins/kibana/settings/sections/status/index');
+  require('plugins/kibana/settings/sections/about/index');
   require('plugins/kibana/settings/styles/main.less');
   require('ui/filters/start_from');
 
@@ -18,6 +23,7 @@ define(function (require, module, exports) {
   require('ui/modules')
   .get('apps/settings')
   .directive('kbnSettingsApp', function (Private, $route, timefilter) {
+    const sections = Private(registry);
     return {
       restrict: 'E',
       template: require('plugins/kibana/settings/app.html'),
@@ -27,7 +33,7 @@ define(function (require, module, exports) {
       },
       link: function ($scope, $el) {
         timefilter.enabled = false;
-        $scope.sections = sections;
+        $scope.sections = sections.inOrder;
         $scope.section = _.find($scope.sections, { name: $scope.sectionName });
 
         $scope.sections.forEach(function (section) {

src/plugins/kibana/public/settings/sections/about/index.js

@@ -1,5 +1,6 @@
 define(function (require) {
   const _ = require('lodash');
+  const registry = require('ui/registry/settings_sections');
 
   require('ui/routes')
   .when('/settings/about', {
@@ -13,10 +14,10 @@ define(function (require) {
     $scope.buildSha = buildSha;
   });
 
-  return {
-    order: Infinity,
+  registry.register(_.constant({
+    order: 1001,
     name: 'about',
     display: 'About',
     url: '#/settings/about'
-  };
+  }));
 });

src/plugins/kibana/public/settings/sections/advanced/index.js

@@ -1,8 +1,8 @@
 define(function (require) {
   const _ = require('lodash');
+  const registry = require('ui/registry/settings_sections');
   const toEditableConfig = require('plugins/kibana/settings/sections/advanced/lib/to_editable_config');
 
-
   require('plugins/kibana/settings/sections/advanced/advanced_row');
 
   require('ui/routes')
@@ -52,10 +52,10 @@ define(function (require) {
     };
   });
 
-  return {
+  registry.register(_.constant({
     order: 2,
     name: 'advanced',
     display: 'Advanced',
     url: '#/settings/advanced'
-  };
+  }));
 });

src/plugins/kibana/public/settings/sections/indices/index.js

@@ -1,5 +1,6 @@
 define(function (require) {
   const _ = require('lodash');
+  const registry = require('ui/registry/settings_sections');
 
   require('plugins/kibana/settings/sections/indices/_create');
   require('plugins/kibana/settings/sections/indices/_edit');
@@ -43,9 +44,10 @@ define(function (require) {
     };
   });
 
-  return {
+  registry.register(_.constant({
+    order: 1,
     name: 'indices',
     display: 'Indices',
-    url: '#/settings/indices',
-  };
+    url: '#/settings/indices'
+  }));
 });

src/plugins/kibana/public/settings/sections/objects/index.js

@@ -1,4 +1,7 @@
 define(function (require) {
+  const _ = require('lodash');
+  const registry = require('ui/registry/settings_sections');
+
   require('plugins/kibana/settings/sections/objects/_view');
   require('plugins/kibana/settings/sections/objects/_objects');
 
@@ -8,9 +11,10 @@ define(function (require) {
   // add the module deps to this module
   require('ui/modules').get('apps/settings');
 
-  return {
+  registry.register(_.constant({
+    order: 3,
     name: 'objects',
     display: 'Objects',
     url: '#/settings/objects'
-  };
+  }));
 });

src/plugins/kibana/public/settings/sections/status/index.js

@@ -1,10 +1,11 @@
 define(function (require) {
   const _ = require('lodash');
+  const registry = require('ui/registry/settings_sections');
 
-  return {
-    order: 3,
+  registry.register(_.constant({
+    order: 1000,
     name: 'status',
     display: 'Status',
     url: '/status'
-  };
+  }));
 });

src/ui/UiExports.js

@@ -69,6 +69,7 @@ class UiExports {
       case 'spyModes':
       case 'chromeNavControls':
       case 'navbarExtensions':
+      case 'settingsSections':
         return (plugin, spec) => {
           this.aliases[type] = _.union(this.aliases[type] || [], spec);
         };

src/ui/public/registry/settings_sections.js

@@ -0,0 +1,6 @@
+define(function (require) {
+  return require('ui/registry/_registry')({
+    name: 'settingsSections',
+    order: ['order']
+  });
+});