Merge pull request #5131 from Bargs/issues/4458

Fixes the test failures caused by 4458's fix

src/plugins/kibana/public/discover/components/field_chooser/field_chooser.js

@@ -1,6 +1,7 @@
 define(function (require) {
   var app = require('ui/modules').get('apps/discover');
 
+
   require('ui/directives/css_truncate');
   require('ui/directives/field_name');
   require('ui/filters/unique');
@@ -8,6 +9,7 @@ define(function (require) {
 
   app.directive('discFieldChooser', function ($location, globalState, config, $route, Private) {
     var _ = require('lodash');
+    var $ = require('jquery');
     var rison = require('ui/utils/rison');
     var fieldCalculator = require('plugins/kibana/discover/components/field_chooser/lib/field_calculator');
     var FieldList = Private(require('ui/index_patterns/_field_list'));
@@ -151,7 +153,9 @@ define(function (require) {
           $scope.indexPattern.popularizeField(fieldName, 1);
         };
 
-        $scope.runAgg = function (field) {
+        $scope.vizLocation = function (field) {
+          if (!$scope.state) {return '';}
+
           var agg = {};
           var isGeoPoint = field.type === 'geo_point';
           var type = isGeoPoint ? 'tile_map' : 'histogram';
@@ -188,7 +192,7 @@ define(function (require) {
             };
           }
 
-          $location.path('/visualize/create').search({
+          return '#/visualize/create?' + $.param(_.assign($location.search(), {
             indexPattern: $scope.state.index,
             type: type,
             _a: rison.encode({
@@ -202,7 +206,7 @@ define(function (require) {
                 ]
               }
             })
-          });
+          }));
         };
 
         $scope.details = function (field, recompute) {

src/plugins/kibana/public/discover/components/field_chooser/lib/detail_views/string.html

@@ -35,14 +35,14 @@
         </div>
       </div>
 
-      <div ng-show="field.indexed || field.scripted"
-        ng-click="runAgg(field)"
+      <a ng-show="field.indexed || field.scripted"
+        ng-href="{{vizLocation(field)}}"
         class="sidebar-item-button primary">
           Visualize
           <span class="discover-field-vis-warning" ng-show="warnings.length" tooltip="{{warnings.join(' ')}}">
           ( {{warnings.length}} <ng-pluralize count="warnings.length" when="{'1':'warning', 'other':'warnings'}"></ng-pluralize> <i aria-hidden="true" class="fa fa-warning"></i> )
           </span>
-      </div>
+      </a>
 
       <div ng-show="!field.indexed && !field.scripted"
           disabled="disabled"

src/ui/public/styles/sidebar.less

@@ -31,7 +31,7 @@
       border-top-color: @sidebar-border;
       font-size: @sidebar-item-font-size;
 
-      a {
+      a:not(.sidebar-item-button) {
         color: @sidebar-item-color;
 
         &:hover {
@@ -73,6 +73,7 @@
 
       &-button {
         font-size: inherit;
+        display: block;
 
         &[disabled] {
           opacity: 0.65;