Check if default agg type is part of filtered list and if not, change…

… to first agg type in list
elastic · Jul 5, 2018 · 360d2a2 · 360d2a2
1 parent 09d0b4c
commit 360d2a2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/ui/public/vis/editors/default/agg.html b/src/ui/public/vis/editors/default/agg.html
@@ -24,7 +24,7 @@
   </span>
 
   <!-- error -->
-  <span ng-if="!editorOpen && aggForm.$invalid" class="vis-editor-agg-header-description danger" title="{{aggForm.describeErrors()}}">
+  <span ng-if="!editorOpen && aggForm.$invalid && aggForm.softErrorCount()" class="vis-editor-agg-header-description danger" title="{{aggForm.describeErrors()}}">
     {{ aggForm.describeErrors() }}
   </span>
 

diff --git a/src/ui/public/vis/editors/default/agg_params.js b/src/ui/public/vis/editors/default/agg_params.js
@@ -44,7 +44,12 @@ uiModules
 
         const aggTypeSubscription = aggTypeFilters
           .filter$(aggTypes.byType[$scope.groupName], $scope.indexPattern, $scope.agg)
-          .subscribe(aggTypes => $scope.aggTypeOptions = aggTypes);
+          .subscribe(aggTypes => {
+            if(!aggTypes.includes($scope.agg.type) && aggTypes && aggTypes.length) {
+              $scope.agg.type = aggTypes[0];
+            }
+            $scope.aggTypeOptions = aggTypes;
+          });
 
         $scope.$on('$destroy', () => {
           aggTypeSubscription.unsubscribe();