Merge pull request #6306 from spalger/fix/autoSelectOptions

[vis/editor] auto select the options when appropriate
elastic · Feb 29, 2016 · 6aa765c · 6aa765c
2 parents eb9927d + f9fd042
commit 6aa765c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/plugins/kibana/public/visualize/editor/sidebar.html b/src/plugins/kibana/public/visualize/editor/sidebar.html
@@ -13,7 +13,7 @@
 
         <!-- tabs -->
         <ul class="nav navbar-nav">
-          <li ng-class="{active: sidebar.section == 'data'}" ng-show="vis.type.schemas.metrics">
+          <li ng-class="{active: sidebar.section == 'data'}" ng-show="sidebar.showData">
             <a class="navbar-link active" ng-click="sidebar.section='data'">Data</a>
           </li>
           <li ng-class="{active: sidebar.section == 'options'}">
@@ -66,4 +66,3 @@
 
   </form>
 </div>
-
diff --git a/src/plugins/kibana/public/visualize/editor/sidebar.js b/src/plugins/kibana/public/visualize/editor/sidebar.js
@@ -16,7 +16,12 @@ uiModules
     controller: function ($scope) {
       $scope.$bind('vis', 'editableVis');
       $scope.$bind('outputVis', 'vis');
-      this.section = _.get($scope, 'vis.type.requiresSearch') ? 'data' : 'options';
+      $scope.$watch('vis.type', (visType) => {
+        if (visType) {
+          this.showData = visType.schemas.buckets || visType.schemas.metrics;
+          this.section = this.section || (this.showData ? 'data' : 'options');
+        }
+      });
     }
   };
 });