diff --git a/src/core_plugins/kibana/public/dashboard/index.js b/src/core_plugins/kibana/public/dashboard/index.js index 5016556de0a5c..1bbac19e4659d 100644 --- a/src/core_plugins/kibana/public/dashboard/index.js +++ b/src/core_plugins/kibana/public/dashboard/index.js @@ -1,5 +1,4 @@ import _ from 'lodash'; -import $ from 'jquery'; import angular from 'angular'; import chrome from 'ui/chrome'; import 'ui/courier'; @@ -29,34 +28,75 @@ const app = uiModules.get('app/dashboard', [ ]); uiRoutes -.defaults(/dashboard/, { - requireDefaultIndex: true -}) -.when('/dashboard', { - template: indexTemplate, - resolve: { - dash: function (savedDashboards, config) { - return savedDashboards.get(); + .defaults(/dashboard/, { + requireDefaultIndex: true + }) + .when('/dashboard', { + template: function ($location) { + if ($location.new === true) { + return indexTemplate; + } + + return false; + }, + resolve: { + dash: function (savedDashboards, config, kbnUrl, Notifier, $location, $route) { + let defaultDashboard = config.get('dashboard:defaultDashboard', ''); + + let notify = new Notifier({ + location: 'Dashboard' + }); + + if ($location.search().new === true) { + return savedDashboards.get(); + } + + function forceNew() { + $location.search('new', true); + $route.reload(); + } + + if (defaultDashboard !== '' && typeof defaultDashboard !== 'undefined') { + return savedDashboards.get(defaultDashboard) + .then(function (result) { + let dashboardUrl = savedDashboards.urlFor(result.id).substring(1); + kbnUrl.change(dashboardUrl); + }) + .catch(function (error) { + notify.error(error); + + forceNew(); + }); + } + + forceNew(); + } } - } -}) -.when('/dashboard/:id', { - template: indexTemplate, - resolve: { - dash: function (savedDashboards, Notifier, $route, $location, courier) { - return savedDashboards.get($route.current.params.id) - .catch(courier.redirectWhenMissing({ - 'dashboard' : '/dashboard' - })); + }) + .when('/dashboard/:id', { + template: indexTemplate, + resolve: { + dash: function (savedDashboards, Notifier, $route, $location, courier, kbnUrl) { + if ($location.search().new === true) { + kbnUrl.change('/dashboard'); + $location.search('new', true); + } + + return savedDashboards.get($route.current.params.id) + .catch(courier.redirectWhenMissing({ + 'dashboard': '/dashboard' + })); + } } - } -}); + }); app.directive('dashboardApp', function (Notifier, courier, AppState, timefilter, kbnUrl) { return { - controller: function ($scope, $rootScope, $route, $routeParams, $location, Private, getAppState) { + controller: function ($scope, $rootScope, $route, $routeParams, $location, Private, getAppState, config, uiSettings) { const queryFilter = Private(FilterBarQueryFilterProvider); + const configDefaults = uiSettings.defaults; + const configDefaultDashboard = config.get('dashboard:defaultDashboard', ''); const notify = new Notifier({ location: 'Dashboard' @@ -99,11 +139,12 @@ app.directive('dashboardApp', function (Notifier, courier, AppState, timefilter, if (!angular.equals(newVal, oldVal)) $state.save(); }); $scope.$watch('state.options.darkTheme', setDarkTheme); + $scope.$watch('opts.isDefaultDashboard', toggleDefaultDashboard); $scope.topNavMenu = [{ key: 'new', description: 'New Dashboard', - run: function () { kbnUrl.change('/dashboard', {}); }, + run: newDashboard }, { key: 'add', description: 'Add a panel to the dashboard', @@ -183,6 +224,33 @@ app.directive('dashboardApp', function (Notifier, courier, AppState, timefilter, chrome.addApplicationClass(theme); } + // Returns whether this dashboard is now default + function toggleDefaultDashboard(isChecked) { + if (isChecked) { + setDefaultDashboard(dash.id); + return true; + } + + if (dash.id === configDefaultDashboard) { + /* If the default option is turned off and the previous default + dashboard was this dashboard set no default dashboard */ + setDefaultDashboard(configDefaults['dashboard:defaultDashboard'].value); + return false; + } + + setDefaultDashboard(configDefaultDashboard); + return false; + } + + function setDefaultDashboard(id) { + config.set('dashboard:defaultDashboard', id); + } + + function newDashboard() { + $location.search('new', true); + $route.reload(); + } + // update root source when filters update $scope.$listen(queryFilter, 'update', function () { updateQueryOnRootSource(); @@ -192,10 +260,6 @@ app.directive('dashboardApp', function (Notifier, courier, AppState, timefilter, // update data when filters fire fetch event $scope.$listen(queryFilter, 'fetch', $scope.refresh); - $scope.newDashboard = function () { - kbnUrl.change('/dashboard', {}); - }; - $scope.filterResults = function () { updateQueryOnRootSource(); $state.save(); @@ -215,16 +279,16 @@ app.directive('dashboardApp', function (Notifier, courier, AppState, timefilter, dash.optionsJSON = angular.toJson($state.options); dash.save() - .then(function (id) { - $scope.kbnTopNav.close('save'); - if (id) { - notify.info('Saved Dashboard as "' + dash.title + '"'); - if (dash.id !== $routeParams.id) { - kbnUrl.change('/dashboard/{{id}}', {id: dash.id}); + .then(function (id) { + $scope.kbnTopNav.close('save'); + if (id) { + notify.info('Saved Dashboard as "' + dash.title + '"'); + if (dash.id !== $routeParams.id) { + kbnUrl.change('/dashboard/{{id}}', {id: dash.id}); + } } - } - }) - .catch(notify.fatal); + }) + .catch(notify.fatal); }; let pendingVis = _.size($state.panels); @@ -245,17 +309,19 @@ app.directive('dashboardApp', function (Notifier, courier, AppState, timefilter, // called by the saved-object-finder when a user clicks a vis $scope.addVis = function (hit) { pendingVis++; - $state.panels.push({ id: hit.id, type: 'visualization', panelIndex: getMaxPanelIndex() }); + $state.panels.push({id: hit.id, type: 'visualization', panelIndex: getMaxPanelIndex()}); }; $scope.addSearch = function (hit) { pendingVis++; - $state.panels.push({ id: hit.id, type: 'search', panelIndex: getMaxPanelIndex() }); + $state.panels.push({id: hit.id, type: 'search', panelIndex: getMaxPanelIndex()}); }; // Setup configurable values for config directive, after objects are initialized $scope.opts = { dashboard: dash, + isDefaultDashboard: configDefaultDashboard === dash.id && dash.id !== '', + isNewDashboard: $location.search().new === true, ui: $state.options, save: $scope.save, addVis: $scope.addVis, diff --git a/src/core_plugins/kibana/public/dashboard/partials/options.html b/src/core_plugins/kibana/public/dashboard/partials/options.html index 00216a0d02197..99a4e75821cd6 100644 --- a/src/core_plugins/kibana/public/dashboard/partials/options.html +++ b/src/core_plugins/kibana/public/dashboard/partials/options.html @@ -1,10 +1,23 @@
-

-

+
-

+ +
  • + +
    • +
    diff --git a/src/core_plugins/kibana/public/dashboard/styles/main.less b/src/core_plugins/kibana/public/dashboard/styles/main.less index a0cccdd1e6ddc..0df68f6d146b5 100644 --- a/src/core_plugins/kibana/public/dashboard/styles/main.less +++ b/src/core_plugins/kibana/public/dashboard/styles/main.less @@ -156,3 +156,21 @@ dashboard-grid { .dashboard-panel-picker > .list-group-item { border-top: 0; } + +.dashboard-container { + .config { + .options { + padding: 10px 0; + + ul.input-list { + list-style-type: none; + margin-bottom: 0; + + label span { + display: inline-block; + vertical-align: top; + } + } + } + } +}