From ef3c49aae5aa072d309af51157d8cb84335b5162 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Fri, 17 Jun 2016 15:13:50 -0400
Subject: [PATCH] A few cleanup items:

* Switched data/upload url to data/csv for better future proofing
* Removed old unnecessary css rule
* Fixed issue with management tab link removing the wizard's app state
---
 .../sections/indices/upload/directives/upload_wizard.js     | 6 ++++++
 .../public/management/sections/indices/upload/index.js      | 6 +++---
 src/plugins/kibana/public/management/styles/main.less       | 4 ----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/plugins/kibana/public/management/sections/indices/upload/directives/upload_wizard.js b/src/plugins/kibana/public/management/sections/indices/upload/directives/upload_wizard.js
index 5c7cfac627b67f..ec455e8eb2dff2 100644
--- a/src/plugins/kibana/public/management/sections/indices/upload/directives/upload_wizard.js
+++ b/src/plugins/kibana/public/management/sections/indices/upload/directives/upload_wizard.js
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import modules from 'ui/modules';
 import template from 'plugins/kibana/management/sections/indices/upload/directives/upload_wizard.html';
 import IngestProvider from 'ui/ingest';
@@ -62,6 +63,11 @@ modules.get('apps/management')
         };
 
         $scope.$watch('wizard.state.currentStep', (newValue, oldValue) => {
+          if (_.isUndefined(newValue)) {
+            $state.currentStep = oldValue;
+            $state.save();
+            return;
+          }
           if (this.complete) {
             $state.currentStep = totalSteps - 1;
             $state.save();
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 d68270852c775b..2a01be59ec2294 100644
--- a/src/plugins/kibana/public/management/sections/indices/upload/index.js
+++ b/src/plugins/kibana/public/management/sections/indices/upload/index.js
@@ -3,13 +3,13 @@ import routes from 'ui/routes';
 import template from 'plugins/kibana/management/sections/indices/upload/index.html';
 import './directives/upload_wizard';
 
-routes.when('/management/data/upload/', {
+routes.when('/management/data/csv/', {
   template: template
 });
 
-management.getSection('data').register('upload', {
+management.getSection('data').register('csv', {
   display: 'Upload CSV',
   order: 10,
-  path: 'data/upload/'
+  path: 'data/csv/'
 });
 
diff --git a/src/plugins/kibana/public/management/styles/main.less b/src/plugins/kibana/public/management/styles/main.less
index 081418644e40d1..8f7937b93066c2 100644
--- a/src/plugins/kibana/public/management/styles/main.less
+++ b/src/plugins/kibana/public/management/styles/main.less
@@ -234,10 +234,6 @@ kbn-management-indices {
   }
 }
 
-.nav-buttons {
-  float:right;
-}
-
 .kbn-settings-indices-create {
   .time-and-pattern > div {}
 }