filter out incompatble aggregate options and auto select the option i…

…f there is only one
scampi · Dec 28, 2016 · 1bd4727 · 1bd4727
1 parent 66d3b31
commit 1bd4727
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/ui/public/agg_types/controls/top_aggregate_and_size.html b/src/ui/public/agg_types/controls/top_aggregate_and_size.html
@@ -12,7 +12,7 @@
       required
       name="aggregate"
       ng-model="agg.params.aggregate"
-      ng-options="opt as opt.display disable when opt.disabled for opt in options| orderBy: 'display' track by opt.val"
+      ng-options="opt as opt.display for opt in options| orderBy: 'display' track by opt.val"
       class="form-control"
     ></select>
   </div>

diff --git a/src/ui/public/agg_types/metrics/top_hit.js b/src/ui/public/agg_types/metrics/top_hit.js
@@ -98,12 +98,15 @@ export default function AggTypeMetricTopProvider(Private) {
           }
         ],
         controller: function ($scope) {
-          $scope.options = _.cloneDeep($scope.aggParam.options);
+          $scope.options = [];
           $scope.$watchGroup([ 'agg.vis.type.name', 'agg.params.field.type' ], function ([ visName, fieldType ]) {
             if (fieldType && visName) {
-              _.each($scope.options, option => {
-                option.disabled = !option.isCompatibleVis(visName) || !option.isCompatibleType(fieldType);
+              $scope.options = _.filter($scope.aggParam.options, option => {
+                return option.isCompatibleVis(visName) && option.isCompatibleType(fieldType);
               });
+              if ($scope.options.length === 1) {
+                $scope.agg.params.aggregate = $scope.options[0];
+              }
             }
           });
         },