From 00b2c4a0127a3fbb2cf7c4a1129f9b90f2d2faf0 Mon Sep 17 00:00:00 2001 From: Spencer Alger Date: Wed, 20 Aug 2014 13:33:36 -0700 Subject: [PATCH] [app/visualize] moved back into visualize directory --- src/config.js | 2 +- .../editor/add_bucket_agg.js | 0 .../{new_visualize => visualize}/editor/agg.html | 0 .../apps/{new_visualize => visualize}/editor/agg.js | 0 .../editor/agg_group.html | 0 .../{new_visualize => visualize}/editor/agg_group.js | 0 .../{new_visualize => visualize}/editor/agg_param.js | 0 .../{new_visualize => visualize}/editor/editor.html | 0 .../{new_visualize => visualize}/editor/editor.js | 12 ++++++------ .../{new_visualize => visualize}/editor/editor.less | 0 .../editor/nesting_indicator.js | 0 .../editor/panels/load.html | 0 .../editor/panels/save.html | 0 .../editor/panels/share.html | 0 .../{new_visualize => visualize}/editor/sidebar.html | 0 .../{new_visualize => visualize}/editor/sidebar.js | 2 +- .../apps/{new_visualize => visualize}/index.js | 4 ++-- .../saved_visualizations/_saved_vis.js | 0 .../saved_visualizations/saved_visualizations.js | 2 +- .../{new_visualize => visualize}/styles/main.less | 0 .../{new_visualize => visualize}/wizard/step_1.html | 0 .../{new_visualize => visualize}/wizard/step_2.html | 0 .../{new_visualize => visualize}/wizard/wizard.js | 10 +++++----- src/kibana/require.config.js | 2 -- tasks/config/less.js | 2 +- 25 files changed, 17 insertions(+), 19 deletions(-) rename src/kibana/apps/{new_visualize => visualize}/editor/add_bucket_agg.js (100%) rename src/kibana/apps/{new_visualize => visualize}/editor/agg.html (100%) rename src/kibana/apps/{new_visualize => visualize}/editor/agg.js (100%) rename src/kibana/apps/{new_visualize => visualize}/editor/agg_group.html (100%) rename src/kibana/apps/{new_visualize => visualize}/editor/agg_group.js (100%) rename src/kibana/apps/{new_visualize => visualize}/editor/agg_param.js (100%) rename src/kibana/apps/{new_visualize => visualize}/editor/editor.html (100%) rename src/kibana/apps/{new_visualize => visualize}/editor/editor.js (96%) rename src/kibana/apps/{new_visualize => visualize}/editor/editor.less (100%) rename src/kibana/apps/{new_visualize => visualize}/editor/nesting_indicator.js (100%) rename src/kibana/apps/{new_visualize => visualize}/editor/panels/load.html (100%) rename src/kibana/apps/{new_visualize => visualize}/editor/panels/save.html (100%) rename src/kibana/apps/{new_visualize => visualize}/editor/panels/share.html (100%) rename src/kibana/apps/{new_visualize => visualize}/editor/sidebar.html (100%) rename src/kibana/apps/{new_visualize => visualize}/editor/sidebar.js (83%) rename src/kibana/apps/{new_visualize => visualize}/index.js (74%) rename src/kibana/apps/{new_visualize => visualize}/saved_visualizations/_saved_vis.js (100%) rename src/kibana/apps/{new_visualize => visualize}/saved_visualizations/saved_visualizations.js (97%) rename src/kibana/apps/{new_visualize => visualize}/styles/main.less (100%) rename src/kibana/apps/{new_visualize => visualize}/wizard/step_1.html (100%) rename src/kibana/apps/{new_visualize => visualize}/wizard/step_2.html (100%) rename src/kibana/apps/{new_visualize => visualize}/wizard/wizard.js (84%) diff --git a/src/config.js b/src/config.js index 159637f157a9..9dbfb3df69d0 100644 --- a/src/config.js +++ b/src/config.js @@ -35,7 +35,7 @@ define(function () { */ apps: [ { id: 'discover', name: 'Discover' }, - { id: 'new_visualize', name: 'Visualize' }, + { id: 'visualize', name: 'Visualize' }, { id: 'dashboard', name: 'Dashboard' }, { id: 'settings', name: 'Settings' } ], diff --git a/src/kibana/apps/new_visualize/editor/add_bucket_agg.js b/src/kibana/apps/visualize/editor/add_bucket_agg.js similarity index 100% rename from src/kibana/apps/new_visualize/editor/add_bucket_agg.js rename to src/kibana/apps/visualize/editor/add_bucket_agg.js diff --git a/src/kibana/apps/new_visualize/editor/agg.html b/src/kibana/apps/visualize/editor/agg.html similarity index 100% rename from src/kibana/apps/new_visualize/editor/agg.html rename to src/kibana/apps/visualize/editor/agg.html diff --git a/src/kibana/apps/new_visualize/editor/agg.js b/src/kibana/apps/visualize/editor/agg.js similarity index 100% rename from src/kibana/apps/new_visualize/editor/agg.js rename to src/kibana/apps/visualize/editor/agg.js diff --git a/src/kibana/apps/new_visualize/editor/agg_group.html b/src/kibana/apps/visualize/editor/agg_group.html similarity index 100% rename from src/kibana/apps/new_visualize/editor/agg_group.html rename to src/kibana/apps/visualize/editor/agg_group.html diff --git a/src/kibana/apps/new_visualize/editor/agg_group.js b/src/kibana/apps/visualize/editor/agg_group.js similarity index 100% rename from src/kibana/apps/new_visualize/editor/agg_group.js rename to src/kibana/apps/visualize/editor/agg_group.js diff --git a/src/kibana/apps/new_visualize/editor/agg_param.js b/src/kibana/apps/visualize/editor/agg_param.js similarity index 100% rename from src/kibana/apps/new_visualize/editor/agg_param.js rename to src/kibana/apps/visualize/editor/agg_param.js diff --git a/src/kibana/apps/new_visualize/editor/editor.html b/src/kibana/apps/visualize/editor/editor.html similarity index 100% rename from src/kibana/apps/new_visualize/editor/editor.html rename to src/kibana/apps/visualize/editor/editor.html diff --git a/src/kibana/apps/new_visualize/editor/editor.js b/src/kibana/apps/visualize/editor/editor.js similarity index 96% rename from src/kibana/apps/new_visualize/editor/editor.js rename to src/kibana/apps/visualize/editor/editor.js index 6da29b2ce192..19f172f38fb5 100644 --- a/src/kibana/apps/new_visualize/editor/editor.js +++ b/src/kibana/apps/visualize/editor/editor.js @@ -7,7 +7,7 @@ define(function (require) { require('filters/uriescape'); require('routes') - .when('/new_visualize/create', { + .when('/visualize/create', { template: require('text!apps/visualize/editor/editor.html'), resolve: { savedVis: function (savedVisualizations, courier, $route) { @@ -18,19 +18,19 @@ define(function (require) { return savedVisualizations.get($route.current.params) .catch(courier.redirectWhenMissing({ //'index-pattern': '/visualize', - '*': '/new_visualize' + '*': '/visualize' })); } } }) - .when('/new_visualize/edit/:id', { + .when('/visualize/edit/:id', { template: require('text!apps/visualize/editor/editor.html'), resolve: { savedVis: function (savedVisualizations, courier, $route) { return savedVisualizations.get($route.current.params.id) .catch(courier.redirectWhenMissing({ 'index-pattern': '/settings', - '*': '/new_visualize' + '*': '/visualize' })); } } @@ -141,7 +141,7 @@ define(function (require) { }; $scope.startOver = function () { - $location.url('/new_visualize'); + $location.url('/visualize'); }; $scope.doSave = function () { @@ -157,7 +157,7 @@ define(function (require) { $location.url( globalState.writeToUrl( - '/new_visualize/edit/' + encodeURIComponent(savedVis.id) + '/visualize/edit/' + encodeURIComponent(savedVis.id) ) ); }, notify.fatal); diff --git a/src/kibana/apps/new_visualize/editor/editor.less b/src/kibana/apps/visualize/editor/editor.less similarity index 100% rename from src/kibana/apps/new_visualize/editor/editor.less rename to src/kibana/apps/visualize/editor/editor.less diff --git a/src/kibana/apps/new_visualize/editor/nesting_indicator.js b/src/kibana/apps/visualize/editor/nesting_indicator.js similarity index 100% rename from src/kibana/apps/new_visualize/editor/nesting_indicator.js rename to src/kibana/apps/visualize/editor/nesting_indicator.js diff --git a/src/kibana/apps/new_visualize/editor/panels/load.html b/src/kibana/apps/visualize/editor/panels/load.html similarity index 100% rename from src/kibana/apps/new_visualize/editor/panels/load.html rename to src/kibana/apps/visualize/editor/panels/load.html diff --git a/src/kibana/apps/new_visualize/editor/panels/save.html b/src/kibana/apps/visualize/editor/panels/save.html similarity index 100% rename from src/kibana/apps/new_visualize/editor/panels/save.html rename to src/kibana/apps/visualize/editor/panels/save.html diff --git a/src/kibana/apps/new_visualize/editor/panels/share.html b/src/kibana/apps/visualize/editor/panels/share.html similarity index 100% rename from src/kibana/apps/new_visualize/editor/panels/share.html rename to src/kibana/apps/visualize/editor/panels/share.html diff --git a/src/kibana/apps/new_visualize/editor/sidebar.html b/src/kibana/apps/visualize/editor/sidebar.html similarity index 100% rename from src/kibana/apps/new_visualize/editor/sidebar.html rename to src/kibana/apps/visualize/editor/sidebar.html diff --git a/src/kibana/apps/new_visualize/editor/sidebar.js b/src/kibana/apps/visualize/editor/sidebar.js similarity index 83% rename from src/kibana/apps/new_visualize/editor/sidebar.js rename to src/kibana/apps/visualize/editor/sidebar.js index cddcb01a7f21..091101168957 100644 --- a/src/kibana/apps/new_visualize/editor/sidebar.js +++ b/src/kibana/apps/visualize/editor/sidebar.js @@ -8,7 +8,7 @@ define(function (require) { return { restrict: 'E', - template: require('text!apps/new_visualize/editor/sidebar.html'), + template: require('text!apps/visualize/editor/sidebar.html'), replace: true, scope: { vis: '=', diff --git a/src/kibana/apps/new_visualize/index.js b/src/kibana/apps/visualize/index.js similarity index 74% rename from src/kibana/apps/new_visualize/index.js rename to src/kibana/apps/visualize/index.js index 603e6bd442fe..4edfdad9412b 100644 --- a/src/kibana/apps/new_visualize/index.js +++ b/src/kibana/apps/visualize/index.js @@ -5,7 +5,7 @@ define(function (require) { require('apps/visualize/wizard/wizard'); require('routes') - .when('/new_visualize', { - redirectTo: '/new_visualize/step/1' + .when('/visualize', { + redirectTo: '/visualize/step/1' }); }); \ No newline at end of file diff --git a/src/kibana/apps/new_visualize/saved_visualizations/_saved_vis.js b/src/kibana/apps/visualize/saved_visualizations/_saved_vis.js similarity index 100% rename from src/kibana/apps/new_visualize/saved_visualizations/_saved_vis.js rename to src/kibana/apps/visualize/saved_visualizations/_saved_vis.js diff --git a/src/kibana/apps/new_visualize/saved_visualizations/saved_visualizations.js b/src/kibana/apps/visualize/saved_visualizations/saved_visualizations.js similarity index 97% rename from src/kibana/apps/new_visualize/saved_visualizations/saved_visualizations.js rename to src/kibana/apps/visualize/saved_visualizations/saved_visualizations.js index da1ce42a76ec..ad9f427da88a 100644 --- a/src/kibana/apps/new_visualize/saved_visualizations/saved_visualizations.js +++ b/src/kibana/apps/visualize/saved_visualizations/saved_visualizations.js @@ -22,7 +22,7 @@ define(function (require) { }; this.urlFor = function (id) { - return '#/new_visualize/edit/' + encodeURIComponent(id); + return '#/visualize/edit/' + encodeURIComponent(id); }; this.delete = function (ids) { diff --git a/src/kibana/apps/new_visualize/styles/main.less b/src/kibana/apps/visualize/styles/main.less similarity index 100% rename from src/kibana/apps/new_visualize/styles/main.less rename to src/kibana/apps/visualize/styles/main.less diff --git a/src/kibana/apps/new_visualize/wizard/step_1.html b/src/kibana/apps/visualize/wizard/step_1.html similarity index 100% rename from src/kibana/apps/new_visualize/wizard/step_1.html rename to src/kibana/apps/visualize/wizard/step_1.html diff --git a/src/kibana/apps/new_visualize/wizard/step_2.html b/src/kibana/apps/visualize/wizard/step_2.html similarity index 100% rename from src/kibana/apps/new_visualize/wizard/step_2.html rename to src/kibana/apps/visualize/wizard/step_2.html diff --git a/src/kibana/apps/new_visualize/wizard/wizard.js b/src/kibana/apps/visualize/wizard/wizard.js similarity index 84% rename from src/kibana/apps/new_visualize/wizard/wizard.js rename to src/kibana/apps/visualize/wizard/wizard.js index 2833f77c6a3d..32f2df633df1 100644 --- a/src/kibana/apps/new_visualize/wizard/wizard.js +++ b/src/kibana/apps/visualize/wizard/wizard.js @@ -15,7 +15,7 @@ define(function (require) { /******** /** Wizard Step 1 /********/ - routes.when('/new_visualize/step/1', { + routes.when('/visualize/step/1', { template: templateStep(1, require('text!apps/visualize/wizard/step_1.html')), resolve: { indexPatternIds: function (courier) { @@ -26,7 +26,7 @@ define(function (require) { module.controller('VisualizeWizardStep1', function ($route, $scope, $location, timefilter) { $scope.step2WithSearchUrl = function (hit) { - return '#/new_visualize/step/2?savedSearchId=' + encodeURIComponent(hit.id); + return '#/visualize/step/2?savedSearchId=' + encodeURIComponent(hit.id); }; timefilter.enabled = false; @@ -38,14 +38,14 @@ define(function (require) { $scope.$watch('indexPattern.selection', function (pattern) { if (!pattern) return; - $location.url('/new_visualize/step/2?indexPattern=' + encodeURIComponent(pattern)); + $location.url('/visualize/step/2?indexPattern=' + encodeURIComponent(pattern)); }); }); /******** /** Wizard Step 2 /********/ - routes.when('/new_visualize/step/2', { + routes.when('/visualize/step/2', { template: templateStep(2, require('text!apps/visualize/wizard/step_2.html')) }); @@ -60,7 +60,7 @@ define(function (require) { type: visType.name }, existing); - return '#/new_visualize/create?' + _.map(query, function (val, key) { + return '#/visualize/create?' + _.map(query, function (val, key) { return encodeURIComponent(key) + '=' + encodeURIComponent(val); }).join('&'); }; diff --git a/src/kibana/require.config.js b/src/kibana/require.config.js index ab1dcee0c51a..42c4137d90df 100644 --- a/src/kibana/require.config.js +++ b/src/kibana/require.config.js @@ -10,8 +10,6 @@ require.config({ modules: 'utils/modules', lodash: 'utils/_mixins', - 'apps/visualize': 'apps/new_visualize', - // bower_components angular: '../bower_components/angular/angular', 'angular-route': '../bower_components/angular-route/angular-route', diff --git a/tasks/config/less.js b/tasks/config/less.js index a6b9c2ece93a..842b973f2877 100644 --- a/tasks/config/less.js +++ b/tasks/config/less.js @@ -9,7 +9,7 @@ module.exports = { '<%= src %>/kibana/apps/settings/styles/main.less', '<%= src %>/kibana/apps/visualize/styles/main.less', '<%= src %>/kibana/apps/visualize/styles/visualization.less', - '<%= src %>/kibana/apps/new_visualize/styles/main.less', + '<%= src %>/kibana/apps/visualize/styles/main.less', '<%= src %>/kibana/styles/main.less', '<%= src %>/kibana/components/**/*.less' ],