From 78279deea09f28d678fdcd187e4299c6c0fd3b84 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Mon, 20 Jun 2016 20:48:59 -0700 Subject: [PATCH 1/5] Adds route option for requireDefaultIndex Signed-off-by: Tyler Smalley --- src/plugins/kibana/public/management/index.js | 1 - .../public/management/sections/indices/index.js | 6 ++++-- .../management/sections/indices/upload/index.js | 3 ++- .../index_patterns/route_setup/load_default.js | 6 ++---- src/ui/public/routes/__tests__/_route_manager.js | 12 ++++++++++++ src/ui/public/routes/route_manager.js | 4 ++++ 6 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/plugins/kibana/public/management/index.js b/src/plugins/kibana/public/management/index.js index 03e3884df165a..7b33fb4af0aed 100644 --- a/src/plugins/kibana/public/management/index.js +++ b/src/plugins/kibana/public/management/index.js @@ -20,7 +20,6 @@ uiRoutes }); require('ui/index_patterns/route_setup/load_default')({ - notRequiredRe: /^\/management\/data\//, whenMissingRedirectTo: '/management/data/index' }); diff --git a/src/plugins/kibana/public/management/sections/indices/index.js b/src/plugins/kibana/public/management/sections/indices/index.js index dd4c727506d8d..7f80d13d02b81 100644 --- a/src/plugins/kibana/public/management/sections/indices/index.js +++ b/src/plugins/kibana/public/management/sections/indices/index.js @@ -16,12 +16,14 @@ const indexPatternsResolutions = { // add a dependency to all of the subsection routes uiRoutes .defaults(/management\/kibana\/indices/, { - resolve: indexPatternsResolutions + resolve: indexPatternsResolutions, + requireDefaultIndex: false }); uiRoutes .defaults(/management\/data\/index/, { - resolve: indexPatternsResolutions + resolve: indexPatternsResolutions, + requireDefaultIndex: false }); // wrapper directive, which sets some global stuff up like the left nav diff --git a/src/plugins/kibana/public/management/sections/indices/upload/index.js b/src/plugins/kibana/public/management/sections/indices/upload/index.js index 2a01be59ec229..902a65f48c5ac 100644 --- a/src/plugins/kibana/public/management/sections/indices/upload/index.js +++ b/src/plugins/kibana/public/management/sections/indices/upload/index.js @@ -4,7 +4,8 @@ import template from 'plugins/kibana/management/sections/indices/upload/index.ht import './directives/upload_wizard'; routes.when('/management/data/csv/', { - template: template + template: template, + requireDefaultIndex: false }); management.getSection('data').register('csv', { diff --git a/src/ui/public/index_patterns/route_setup/load_default.js b/src/ui/public/index_patterns/route_setup/load_default.js index 038dfea47eb07..270e163c06c92 100644 --- a/src/ui/public/index_patterns/route_setup/load_default.js +++ b/src/ui/public/index_patterns/route_setup/load_default.js @@ -10,7 +10,6 @@ let notify = new Notifier({ module.exports = function (opts) { opts = opts || {}; - let notRequiredRe = opts.notRequiredRe || null; let whenMissingRedirectTo = opts.whenMissingRedirectTo || null; let defaultRequiredToasts = null; @@ -18,21 +17,20 @@ module.exports = function (opts) { .addSetupWork(function loadDefaultIndexPattern(Private, Promise, $route, config, indexPatterns) { let getIds = Private(GetIdsProvider); let rootSearchSource = Private(CourierDataSourceRootSearchSourceProvider); - let path = _.get($route, 'current.$$route.originalPath'); + let route = _.get($route, 'current.$$route'); return getIds() .then(function (patterns) { let defaultId = config.get('defaultIndex'); let defined = !!defaultId; let exists = _.contains(patterns, defaultId); - let required = !notRequiredRe || !path.match(notRequiredRe); if (defined && !exists) { config.remove('defaultIndex'); defaultId = defined = false; } - if (!defined && required) { + if (!defined && route.requireDefaultIndex) { throw new NoDefaultIndexPattern(); } diff --git a/src/ui/public/routes/__tests__/_route_manager.js b/src/ui/public/routes/__tests__/_route_manager.js index 75685be9b093a..68ff072579f6c 100644 --- a/src/ui/public/routes/__tests__/_route_manager.js +++ b/src/ui/public/routes/__tests__/_route_manager.js @@ -100,5 +100,17 @@ describe('routes/route_manager', function () { expect($rp.when.secondCall.args[1]).to.have.property('reloadOnSearch', false); expect($rp.when.lastCall.args[1]).to.have.property('reloadOnSearch', true); }); + + it('sets route.requireDefaultIndex to true by default', function () { + routes.when('/nothing-set'); + routes.when('/no-index-required', { requireDefaultIndex: false }); + routes.when('/index-required', { requireDefaultIndex: true }); + routes.config($rp); + + expect($rp.when.callCount).to.be(3); + expect($rp.when.firstCall.args[1]).to.have.property('requireDefaultIndex', true); + expect($rp.when.secondCall.args[1]).to.have.property('requireDefaultIndex', false); + expect($rp.when.lastCall.args[1]).to.have.property('requireDefaultIndex', true); + }); }); }); diff --git a/src/ui/public/routes/route_manager.js b/src/ui/public/routes/route_manager.js index 832990ba6de6c..44e8ceb51893f 100644 --- a/src/ui/public/routes/route_manager.js +++ b/src/ui/public/routes/route_manager.js @@ -26,6 +26,10 @@ function RouteManager() { route.reloadOnSearch = false; } + if (route.requireDefaultIndex === void 0) { + route.requireDefaultIndex = true; + } + wrapRouteWithPrep(route, setup); $routeProvider.when(path, route); }); From 70b75f10cb0a21f2f2772753d19df32666b63ecc Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Tue, 21 Jun 2016 09:16:02 -0700 Subject: [PATCH 2/5] Don't require an index for the management landing page Signed-off-by: Tyler Smalley --- src/plugins/kibana/public/management/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/kibana/public/management/index.js b/src/plugins/kibana/public/management/index.js index 7b33fb4af0aed..a2dbc1fffe369 100644 --- a/src/plugins/kibana/public/management/index.js +++ b/src/plugins/kibana/public/management/index.js @@ -16,7 +16,8 @@ import management from 'ui/management'; uiRoutes .when('/management', { - template: landingTemplate + template: landingTemplate, + requireDefaultIndex: false }); require('ui/index_patterns/route_setup/load_default')({ From a5220c0bce6ab9713bece30f7567ae083fabc4dc Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Tue, 21 Jun 2016 09:30:06 -0700 Subject: [PATCH 3/5] Requiring an index pattern for a route is opt-in Signed-off-by: Tyler Smalley --- src/plugins/kibana/public/dashboard/index.js | 1 + src/plugins/kibana/public/discover/controllers/discover.js | 1 + src/plugins/kibana/public/management/index.js | 3 +-- .../kibana/public/management/sections/indices/index.js | 5 ++--- .../public/management/sections/indices/upload/index.js | 3 +-- src/plugins/kibana/public/visualize/editor/editor.js | 1 + src/plugins/kibana/public/visualize/index.js | 3 ++- src/plugins/kibana/public/visualize/wizard/wizard.js | 4 +++- src/ui/public/routes/__tests__/_route_manager.js | 4 ++-- src/ui/public/routes/route_manager.js | 2 +- 10 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/plugins/kibana/public/dashboard/index.js b/src/plugins/kibana/public/dashboard/index.js index e8322ea212c16..4a1aac707f928 100644 --- a/src/plugins/kibana/public/dashboard/index.js +++ b/src/plugins/kibana/public/dashboard/index.js @@ -35,6 +35,7 @@ const app = uiModules.get('app/dashboard', [ uiRoutes .when('/dashboard', { template: indexTemplate, + requireDefaultIndex: true, resolve: { dash: function (savedDashboards, config) { return savedDashboards.get(); diff --git a/src/plugins/kibana/public/discover/controllers/discover.js b/src/plugins/kibana/public/discover/controllers/discover.js index 87ce5f4f74e0b..2d4b690af3308 100644 --- a/src/plugins/kibana/public/discover/controllers/discover.js +++ b/src/plugins/kibana/public/discover/controllers/discover.js @@ -39,6 +39,7 @@ uiRoutes .when('/discover/:id?', { template: indexTemplate, reloadOnSearch: false, + requireDefaultIndex: true, resolve: { ip: function (Promise, courier, config, $location) { return courier.indexPatterns.getIds() diff --git a/src/plugins/kibana/public/management/index.js b/src/plugins/kibana/public/management/index.js index a2dbc1fffe369..7b33fb4af0aed 100644 --- a/src/plugins/kibana/public/management/index.js +++ b/src/plugins/kibana/public/management/index.js @@ -16,8 +16,7 @@ import management from 'ui/management'; uiRoutes .when('/management', { - template: landingTemplate, - requireDefaultIndex: false + template: landingTemplate }); require('ui/index_patterns/route_setup/load_default')({ diff --git a/src/plugins/kibana/public/management/sections/indices/index.js b/src/plugins/kibana/public/management/sections/indices/index.js index 7f80d13d02b81..bd68680435f9c 100644 --- a/src/plugins/kibana/public/management/sections/indices/index.js +++ b/src/plugins/kibana/public/management/sections/indices/index.js @@ -17,13 +17,12 @@ const indexPatternsResolutions = { uiRoutes .defaults(/management\/kibana\/indices/, { resolve: indexPatternsResolutions, - requireDefaultIndex: false + requireDefaultIndex: true }); uiRoutes .defaults(/management\/data\/index/, { - resolve: indexPatternsResolutions, - requireDefaultIndex: false + resolve: indexPatternsResolutions }); // wrapper directive, which sets some global stuff up like the left nav diff --git a/src/plugins/kibana/public/management/sections/indices/upload/index.js b/src/plugins/kibana/public/management/sections/indices/upload/index.js index 902a65f48c5ac..2a01be59ec229 100644 --- a/src/plugins/kibana/public/management/sections/indices/upload/index.js +++ b/src/plugins/kibana/public/management/sections/indices/upload/index.js @@ -4,8 +4,7 @@ import template from 'plugins/kibana/management/sections/indices/upload/index.ht import './directives/upload_wizard'; routes.when('/management/data/csv/', { - template: template, - requireDefaultIndex: false + template: template }); management.getSection('data').register('csv', { diff --git a/src/plugins/kibana/public/visualize/editor/editor.js b/src/plugins/kibana/public/visualize/editor/editor.js index 580bbb0aec632..1506650533142 100644 --- a/src/plugins/kibana/public/visualize/editor/editor.js +++ b/src/plugins/kibana/public/visualize/editor/editor.js @@ -21,6 +21,7 @@ import editorTemplate from 'plugins/kibana/visualize/editor/editor.html'; uiRoutes .when('/visualize/create', { template: editorTemplate, + requireDefaultIndex: true, resolve: { savedVis: function (savedVisualizations, courier, $route, Private) { const visTypes = Private(RegistryVisTypesProvider); diff --git a/src/plugins/kibana/public/visualize/index.js b/src/plugins/kibana/public/visualize/index.js index 88f684f59ccb9..8942f9b4103e7 100644 --- a/src/plugins/kibana/public/visualize/index.js +++ b/src/plugins/kibana/public/visualize/index.js @@ -21,7 +21,8 @@ import uiRoutes from 'ui/routes'; uiRoutes .when('/visualize', { - redirectTo: '/visualize/step/1' + redirectTo: '/visualize/step/1', + requireDefaultIndex: true }); // preloading diff --git a/src/plugins/kibana/public/visualize/wizard/wizard.js b/src/plugins/kibana/public/visualize/wizard/wizard.js index 64d71203d56bb..d895a3b0963bc 100644 --- a/src/plugins/kibana/public/visualize/wizard/wizard.js +++ b/src/plugins/kibana/public/visualize/wizard/wizard.js @@ -18,7 +18,8 @@ const module = uiModules.get('app/visualize', ['kibana/courier']); /** Wizard Step 1 /********/ routes.when('/visualize/step/1', { - template: templateStep(1, require('plugins/kibana/visualize/wizard/step_1.html')) + template: templateStep(1, require('plugins/kibana/visualize/wizard/step_1.html')), + requireDefaultIndex: true }); module.controller('VisualizeWizardStep1', function ($scope, $route, $location, timefilter, Private) { @@ -36,6 +37,7 @@ module.controller('VisualizeWizardStep1', function ($scope, $route, $location, t /********/ routes.when('/visualize/step/2', { template: templateStep(2, require('plugins/kibana/visualize/wizard/step_2.html')), + requireDefaultIndex: true, resolve: { indexPatternIds: function (courier) { return courier.indexPatterns.getIds(); diff --git a/src/ui/public/routes/__tests__/_route_manager.js b/src/ui/public/routes/__tests__/_route_manager.js index 68ff072579f6c..c854d88325400 100644 --- a/src/ui/public/routes/__tests__/_route_manager.js +++ b/src/ui/public/routes/__tests__/_route_manager.js @@ -101,14 +101,14 @@ describe('routes/route_manager', function () { expect($rp.when.lastCall.args[1]).to.have.property('reloadOnSearch', true); }); - it('sets route.requireDefaultIndex to true by default', function () { + it('sets route.requireDefaultIndex to false by default', function () { routes.when('/nothing-set'); routes.when('/no-index-required', { requireDefaultIndex: false }); routes.when('/index-required', { requireDefaultIndex: true }); routes.config($rp); expect($rp.when.callCount).to.be(3); - expect($rp.when.firstCall.args[1]).to.have.property('requireDefaultIndex', true); + expect($rp.when.firstCall.args[1]).to.have.property('requireDefaultIndex', false); expect($rp.when.secondCall.args[1]).to.have.property('requireDefaultIndex', false); expect($rp.when.lastCall.args[1]).to.have.property('requireDefaultIndex', true); }); diff --git a/src/ui/public/routes/route_manager.js b/src/ui/public/routes/route_manager.js index 44e8ceb51893f..e06c9fc6e55d5 100644 --- a/src/ui/public/routes/route_manager.js +++ b/src/ui/public/routes/route_manager.js @@ -27,7 +27,7 @@ function RouteManager() { } if (route.requireDefaultIndex === void 0) { - route.requireDefaultIndex = true; + route.requireDefaultIndex = false; } wrapRouteWithPrep(route, setup); From 14ef79717c40b34944ec69d1fa93c66b34a90a11 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Tue, 21 Jun 2016 23:36:35 -0700 Subject: [PATCH 4/5] Resolves tests for management redirect changes Signed-off-by: Tyler Smalley --- .../management/sections/settings/index.html | 6 +++--- .../kibana/public/management/styles/main.less | 8 ++++++-- .../apps/management/_creation_form_changes.js | 3 +++ .../management/_index_pattern_create_delete.js | 3 +++ .../management/_index_pattern_results_sort.js | 5 ++++- test/functional/apps/management/_initial_state.js | 3 +++ .../apps/management/_kibana_settings.js | 6 ++++++ test/support/pages/settings_page.js | 15 +++++++++++---- 8 files changed, 39 insertions(+), 10 deletions(-) diff --git a/src/plugins/kibana/public/management/sections/settings/index.html b/src/plugins/kibana/public/management/sections/settings/index.html index 08402cca6b9cd..6dbf8f335cdfa 100644 --- a/src/plugins/kibana/public/management/sections/settings/index.html +++ b/src/plugins/kibana/public/management/sections/settings/index.html @@ -15,9 +15,9 @@

Caution: You can break stuff here

- - - + + + diff --git a/src/plugins/kibana/public/management/styles/main.less b/src/plugins/kibana/public/management/styles/main.less index e01266211b569..9e4dafbec228e 100644 --- a/src/plugins/kibana/public/management/styles/main.less +++ b/src/plugins/kibana/public/management/styles/main.less @@ -144,8 +144,12 @@ kbn-management-objects { kbn-management-advanced { // super specific rule to override bootstrap's equally specific rule // https://github.com/twbs/bootstrap/blob/1f329f8f17aa989eabc6e94bdcab93e69ef0e463/less/tables.less#L35 - .table > tbody > tr > td { - vertical-align: middle; + .table { + table-layout: fixed; + + tbody > tr > td { + vertical-align: middle; + } } } diff --git a/test/functional/apps/management/_creation_form_changes.js b/test/functional/apps/management/_creation_form_changes.js index fb3b8bf497fea..11c70be753e16 100644 --- a/test/functional/apps/management/_creation_form_changes.js +++ b/test/functional/apps/management/_creation_form_changes.js @@ -14,6 +14,9 @@ bdd.describe('user input reactions', function () { return esClient.deleteAndUpdateConfigDoc() .then(function () { return settingsPage.navigateTo(); + }) + .then(function () { + return settingsPage.clickExistingData(); }); }); diff --git a/test/functional/apps/management/_index_pattern_create_delete.js b/test/functional/apps/management/_index_pattern_create_delete.js index 1ad16594f7b3f..6d9972794a995 100644 --- a/test/functional/apps/management/_index_pattern_create_delete.js +++ b/test/functional/apps/management/_index_pattern_create_delete.js @@ -15,6 +15,9 @@ bdd.describe('creating and deleting default index', function describeIndexTests( return esClient.deleteAndUpdateConfigDoc() .then(function () { return settingsPage.navigateTo(); + }) + .then(function () { + return settingsPage.clickExistingData(); }); }); diff --git a/test/functional/apps/management/_index_pattern_results_sort.js b/test/functional/apps/management/_index_pattern_results_sort.js index 50e1ade1ac2ef..a85943805ea36 100644 --- a/test/functional/apps/management/_index_pattern_results_sort.js +++ b/test/functional/apps/management/_index_pattern_results_sort.js @@ -34,7 +34,10 @@ bdd.describe('index result field sort', function describeIndexTests() { columns.forEach(function (col) { bdd.describe('sort by heading - ' + col.heading, function indexPatternCreation() { bdd.before(function () { - return settingsPage.navigateTo(); + return settingsPage.navigateTo() + .then(function () { + return settingsPage.clickExistingData(); + }); }); bdd.beforeEach(function () { diff --git a/test/functional/apps/management/_initial_state.js b/test/functional/apps/management/_initial_state.js index c5cdc243cba3d..d1a4719b96a04 100644 --- a/test/functional/apps/management/_initial_state.js +++ b/test/functional/apps/management/_initial_state.js @@ -14,6 +14,9 @@ bdd.describe('initial state', function () { return esClient.deleteAndUpdateConfigDoc() .then(function () { return settingsPage.navigateTo(); + }) + .then(function () { + return settingsPage.clickExistingData(); }); }); diff --git a/test/functional/apps/management/_kibana_settings.js b/test/functional/apps/management/_kibana_settings.js index cf6c5da1e858e..eb5042a8e23ed 100644 --- a/test/functional/apps/management/_kibana_settings.js +++ b/test/functional/apps/management/_kibana_settings.js @@ -12,6 +12,12 @@ bdd.describe('creating and deleting default index', function describeIndexTests( bdd.before(function () { // delete .kibana index and then wait for Kibana to re-create it return esClient.deleteAndUpdateConfigDoc() + .then(function () { + return settingsPage.navigateTo(); + }) + .then(function () { + return settingsPage.clickExistingData(); + }) .then(function () { return settingsPage.createIndexPattern(); }) diff --git a/test/support/pages/settings_page.js b/test/support/pages/settings_page.js index 9aeac6be5a55a..fa6610cd1bb61 100644 --- a/test/support/pages/settings_page.js +++ b/test/support/pages/settings_page.js @@ -14,16 +14,20 @@ export default (function () { return this.remote.findDisplayedByCssSelector('.app-link:nth-child(5) a').click(); }, - clickPath: function (path) { - return this.remote.findDisplayedByCssSelector('[kbn-href="#/management/' + path + '"]').click(); + clickLinkText: function (text) { + return this.remote.findDisplayedByLinkText(text).click(); }, clickKibanaSettings: function () { - return this.clickPath('kibana/settings'); + return this.clickLinkText('Advanced Settings'); }, clickKibanaIndicies: function () { - return this.clickPath('kibana/indices'); + return this.clickLinkText('Index Patterns'); + }, + + clickExistingData: function () { + return this.clickLinkText('Existing Data'); }, getAdvancedSettings: function getAdvancedSettings(propertyName) { @@ -315,6 +319,9 @@ export default (function () { return common.try(function () { return self.navigateTo() + .then(function () { + return self.clickExistingData(); + }) .then(function () { return self.selectTimeFieldOption('@timestamp'); }) From af84452b6fdee4a55d3866fad4165509baa92f1c Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Wed, 22 Jun 2016 13:50:22 -0700 Subject: [PATCH 5/5] Require index for all routes under {discover,visualize,dashboard} Signed-off-by: Tyler Smalley --- src/plugins/kibana/public/dashboard/index.js | 7 +++---- src/plugins/kibana/public/discover/controllers/discover.js | 4 +++- src/plugins/kibana/public/visualize/editor/editor.js | 1 - src/plugins/kibana/public/visualize/index.js | 7 ++++--- src/plugins/kibana/public/visualize/wizard/wizard.js | 4 +--- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/plugins/kibana/public/dashboard/index.js b/src/plugins/kibana/public/dashboard/index.js index 4a1aac707f928..bd8953eeaa0cd 100644 --- a/src/plugins/kibana/public/dashboard/index.js +++ b/src/plugins/kibana/public/dashboard/index.js @@ -18,11 +18,8 @@ import uiRoutes from 'ui/routes'; import uiModules from 'ui/modules'; import indexTemplate from 'plugins/kibana/dashboard/index.html'; - - require('ui/saved_objects/saved_object_registry').register(require('plugins/kibana/dashboard/services/saved_dashboard_register')); - const app = uiModules.get('app/dashboard', [ 'elasticsearch', 'ngRoute', @@ -33,9 +30,11 @@ const app = uiModules.get('app/dashboard', [ ]); uiRoutes +.defaults(/dashboard/, { + requireDefaultIndex: true +}) .when('/dashboard', { template: indexTemplate, - requireDefaultIndex: true, resolve: { dash: function (savedDashboards, config) { return savedDashboards.get(); diff --git a/src/plugins/kibana/public/discover/controllers/discover.js b/src/plugins/kibana/public/discover/controllers/discover.js index 2d4b690af3308..053e13766eaf8 100644 --- a/src/plugins/kibana/public/discover/controllers/discover.js +++ b/src/plugins/kibana/public/discover/controllers/discover.js @@ -36,10 +36,12 @@ const app = uiModules.get('apps/discover', [ ]); uiRoutes +.defaults(/discover/, { + requireDefaultIndex: true +}) .when('/discover/:id?', { template: indexTemplate, reloadOnSearch: false, - requireDefaultIndex: true, resolve: { ip: function (Promise, courier, config, $location) { return courier.indexPatterns.getIds() diff --git a/src/plugins/kibana/public/visualize/editor/editor.js b/src/plugins/kibana/public/visualize/editor/editor.js index 1506650533142..580bbb0aec632 100644 --- a/src/plugins/kibana/public/visualize/editor/editor.js +++ b/src/plugins/kibana/public/visualize/editor/editor.js @@ -21,7 +21,6 @@ import editorTemplate from 'plugins/kibana/visualize/editor/editor.html'; uiRoutes .when('/visualize/create', { template: editorTemplate, - requireDefaultIndex: true, resolve: { savedVis: function (savedVisualizations, courier, $route, Private) { const visTypes = Private(RegistryVisTypesProvider); diff --git a/src/plugins/kibana/public/visualize/index.js b/src/plugins/kibana/public/visualize/index.js index 8942f9b4103e7..74924db7e2528 100644 --- a/src/plugins/kibana/public/visualize/index.js +++ b/src/plugins/kibana/public/visualize/index.js @@ -20,13 +20,14 @@ import uiRoutes from 'ui/routes'; uiRoutes -.when('/visualize', { - redirectTo: '/visualize/step/1', +.defaults(/visualize/, { requireDefaultIndex: true +}) +.when('/visualize', { + redirectTo: '/visualize/step/1' }); // preloading require('ui/saved_objects/saved_object_registry') .register(require('plugins/kibana/visualize/saved_visualizations/saved_visualization_register')); - diff --git a/src/plugins/kibana/public/visualize/wizard/wizard.js b/src/plugins/kibana/public/visualize/wizard/wizard.js index d895a3b0963bc..64d71203d56bb 100644 --- a/src/plugins/kibana/public/visualize/wizard/wizard.js +++ b/src/plugins/kibana/public/visualize/wizard/wizard.js @@ -18,8 +18,7 @@ const module = uiModules.get('app/visualize', ['kibana/courier']); /** Wizard Step 1 /********/ routes.when('/visualize/step/1', { - template: templateStep(1, require('plugins/kibana/visualize/wizard/step_1.html')), - requireDefaultIndex: true + template: templateStep(1, require('plugins/kibana/visualize/wizard/step_1.html')) }); module.controller('VisualizeWizardStep1', function ($scope, $route, $location, timefilter, Private) { @@ -37,7 +36,6 @@ module.controller('VisualizeWizardStep1', function ($scope, $route, $location, t /********/ routes.when('/visualize/step/2', { template: templateStep(2, require('plugins/kibana/visualize/wizard/step_2.html')), - requireDefaultIndex: true, resolve: { indexPatternIds: function (courier) { return courier.indexPatterns.getIds();
NameValueActions NameValueActions