[app/visualize] moved back into visualize directory

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' }
     ],

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

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: '=',

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

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) {

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('&');
     };

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',

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'
     ],