Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Settings sections registry #6077

Merged
merged 8 commits into from
Feb 4, 2016
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/plugins/kibana/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ module.exports = function (kibana) {
'visTypes',
'spyModes',
'fieldFormats',
'navbarExtensions'
'navbarExtensions',
'settingsSections'
],

injectVars: function (server, options) {
Expand Down
1 change: 0 additions & 1 deletion src/plugins/kibana/public/kibana.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ require('plugins/kibana/discover/index');
require('plugins/kibana/visualize/index');
require('plugins/kibana/dashboard/index');
require('plugins/kibana/settings/index');
require('plugins/kibana/settings/sections');
require('plugins/kibana/doc');
require('ui/vislib');
require('ui/agg_response');
Expand Down
9 changes: 7 additions & 2 deletions src/plugins/kibana/public/settings/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
define(function (require, module, exports) {
const _ = require('lodash');

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');

Expand All @@ -18,6 +22,7 @@ define(function (require, module, exports) {
require('ui/modules')
.get('apps/settings')
.directive('kbnSettingsApp', function (Private, $route, timefilter) {
const sections = Private(require('ui/registry/settings_sections'));
return {
restrict: 'E',
template: require('plugins/kibana/settings/app.html'),
Expand All @@ -27,7 +32,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) {
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/kibana/public/settings/sections/about/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
define(function (require) {
const _ = require('lodash');
const registry = require('ui/registry/settings_sections');

require('ui/routes')
.when('/settings/about', {
Expand All @@ -13,10 +13,10 @@ define(function (require) {
$scope.buildSha = buildSha;
});

return {
registry.register(() => ({
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not a fan of this syntax. I personally think it's a lot more readable as:

() => {
  return {
    // ...
  };
}

order: Infinity,
name: 'about',
display: 'About',
url: '#/settings/about'
};
}));
});
6 changes: 3 additions & 3 deletions src/plugins/kibana/public/settings/sections/advanced/index.js
Original file line number Diff line number Diff line change
@@ -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')
Expand Down Expand Up @@ -52,10 +52,10 @@ define(function (require) {
};
});

return {
registry.register(() => ({
order: 2,
name: 'advanced',
display: 'Advanced',
url: '#/settings/advanced'
};
}));
});
11 changes: 0 additions & 11 deletions src/plugins/kibana/public/settings/sections/index.js

This file was deleted.

6 changes: 4 additions & 2 deletions src/plugins/kibana/public/settings/sections/indices/index.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down Expand Up @@ -43,9 +44,10 @@ define(function (require) {
};
});

return {
registry.register(() => ({
order: 1,
name: 'indices',
display: 'Indices',
url: '#/settings/indices',
};
}));
});
7 changes: 5 additions & 2 deletions src/plugins/kibana/public/settings/sections/objects/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
define(function (require) {
const registry = require('ui/registry/settings_sections');

require('plugins/kibana/settings/sections/objects/_view');
require('plugins/kibana/settings/sections/objects/_objects');

Expand All @@ -8,9 +10,10 @@ define(function (require) {
// add the module deps to this module
require('ui/modules').get('apps/settings');

return {
registry.register(() => ({
order: 3,
name: 'objects',
display: 'Objects',
url: '#/settings/objects'
};
}));
});
8 changes: 4 additions & 4 deletions src/plugins/kibana/public/settings/sections/status/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
define(function (require) {
const _ = require('lodash');
const registry = require('ui/registry/settings_sections');

return {
order: 3,
registry.register(() => ({
order: 1000,
name: 'status',
display: 'Status',
url: '/status'
};
}));
});
6 changes: 6 additions & 0 deletions src/ui/public/registry/settings_sections.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
define(function (require) {
return require('ui/registry/_registry')({
name: 'settingsSections',
order: ['order']
});
});
1 change: 1 addition & 0 deletions src/ui/ui_exports.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ class UiExports {
case 'spyModes':
case 'chromeNavControls':
case 'navbarExtensions':
case 'settingsSections':
return (plugin, spec) => {
this.aliases[type] = _.union(this.aliases[type] || [], spec);
};
Expand Down