[discover] hide popular fields title when needed, fixes #331

elastic · Sep 19, 2014 · 1c8ca3e · 1c8ca3e
1 parent 733b0b4
commit 1c8ca3e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/src/kibana/apps/discover/directives/field_chooser.js b/src/kibana/apps/discover/directives/field_chooser.js
@@ -59,7 +59,7 @@ define(function (require) {
             ;
           },
           popularity: function (field) {
-            return field.count;
+            return field.count > 0;
           },
           getActive: function () {
             return _.some(filter.props, function (prop) {
@@ -78,12 +78,15 @@ define(function (require) {
         $scope.$watch('fields', function (newFields) {
 
           // Find the top N most popular fields
-          $scope.popularFields = _.sortBy(_.filter(
-            _.sortBy(newFields, 'count')
-            .reverse()
-            .slice(0, config.get('fields:popularLimit')), function (field) {
-            return (field.count > 0);
-          }), 'name');
+          $scope.popularFields = _(newFields)
+          .where(function (field) {
+            return field.count > 0;
+          })
+          .sortBy('count')
+          .reverse()
+          .slice(0, config.get('fields:popularLimit'))
+          .sortBy('name')
+          .value();
 
           // Find the top N most popular fields
           $scope.unpopularFields = _.sortBy(_.sortBy(newFields, 'count')

diff --git a/src/kibana/apps/discover/partials/field_chooser.html b/src/kibana/apps/discover/partials/field_chooser.html
@@ -83,19 +83,19 @@ <h5>Fields
   </div>
 
   <ul bindonce
-    ng-show="(fields | filter:filter.popularity).length > 0"
+    ng-show="popularFieldChoices.length > 0"
     class="list-unstyled sidebar-well" ng-class="{ 'hidden-sm': !showFields, 'hidden-xs': !showFields }">
     <li class="sidebar-item sidebar-list-header"><h6>Popular fields</h6></li>
     <discover-field
-      ng-repeat="field in popularFields | filter:filter.isFieldFiltered"
+      ng-repeat="field in popularFieldChoices = (popularFields | filter:filter.isFieldFiltered)"
       field="field"
       data="data">
     </discover-field>
   </ul>
 
   <ul bindonce class="list-unstyled" ng-class="{ 'hidden-sm': !showFields, 'hidden-xs': !showFields  }">
     <discover-field
-      ng-repeat="field in unpopularFields | filter:filter.isFieldFiltered"
+      ng-repeat="field in unpopularFieldChoices = (unpopularFields | filter:filter.isFieldFiltered)"
       field="field"
       data="data">
     </discover-field>