fixing based on UI review

elastic · Mar 1, 2017 · 8af734c · 8af734c
1 parent 7602ee1
commit 8af734c
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 6 deletions.
diff --git a/src/core_plugins/kibana/public/visualize/editor/agg_select.html b/src/core_plugins/kibana/public/visualize/editor/agg_select.html
@@ -7,6 +7,6 @@
     ng-model="agg.type"
     required
     auto-select-if-only-one="aggTypeOptions | aggFilter:agg.schema.aggFilter"
-    ng-options="agg as agg.title for agg in aggTypeOptions | aggFilter:agg.schema.aggFilter">
+    ng-options="agg as agg.title group by agg.group for agg in aggTypeOptions | aggFilter:agg.schema.aggFilter">
   </select>
 </div>
diff --git a/src/ui/public/agg_types/metrics/bucket_avg.js b/src/ui/public/agg_types/metrics/bucket_avg.js
@@ -8,8 +8,9 @@ export default function AggTypeMetricDerivativeProvider(Private) {
 
   return new MetricAggType({
     name: 'avg_bucket',
-    title: 'Bucket Average',
+    title: 'Average Bucket',
     makeLabel: agg => makeNestedLabel(agg, 'overall average'),
+    group: 'Pipeline Aggregations',
     params: [
       ...siblingPipelineHelper.params()
     ]

diff --git a/src/ui/public/agg_types/metrics/bucket_max.js b/src/ui/public/agg_types/metrics/bucket_max.js
@@ -8,8 +8,9 @@ export default function AggTypeMetricDerivativeProvider(Private) {
 
   return new MetricAggType({
     name: 'max_bucket',
-    title: 'Bucket Max',
+    title: 'Max Bucket',
     makeLabel: agg => makeNestedLabel(agg, 'overall max'),
+    group: 'Pipeline Aggregations',
     params: [
       ...siblingPipelineHelper.params()
     ]

diff --git a/src/ui/public/agg_types/metrics/bucket_min.js b/src/ui/public/agg_types/metrics/bucket_min.js
@@ -8,8 +8,9 @@ export default function AggTypeMetricDerivativeProvider(Private) {
 
   return new MetricAggType({
     name: 'min_bucket',
-    title: 'Bucket Min',
+    title: 'Min Bucket',
     makeLabel: agg => makeNestedLabel(agg, 'overall min'),
+    group: 'Pipeline Aggregations',
     params: [
       ...siblingPipelineHelper.params()
     ]

diff --git a/src/ui/public/agg_types/metrics/bucket_sum.js b/src/ui/public/agg_types/metrics/bucket_sum.js
@@ -9,8 +9,9 @@ export default function AggTypeMetricDerivativeProvider(Private) {
 
   return new MetricAggType({
     name: 'sum_bucket',
-    title: 'Bucket Sum',
+    title: 'Sum Bucket',
     makeLabel: agg => makeNestedLabel(agg, 'overall sum'),
+    group: 'Pipeline Aggregations',
     params: [
       ...siblingPipelineHelper.params()
     ]

diff --git a/src/ui/public/agg_types/metrics/derivative.js b/src/ui/public/agg_types/metrics/derivative.js
@@ -9,6 +9,7 @@ export default function AggTypeMetricDerivativeProvider(Private) {
   return new MetricAggType({
     name: 'derivative',
     title: 'Derivative',
+    group: 'Pipeline Aggregations',
     makeLabel: agg => makeNestedLabel(agg, 'derivative'),
     params: [
       ...parentPipelineAggHelper.params()

diff --git a/src/ui/public/agg_types/metrics/lib/sibling_pipeline_agg_helper.js b/src/ui/public/agg_types/metrics/lib/sibling_pipeline_agg_helper.js
@@ -11,7 +11,9 @@ const SiblingPipelineAggHelperProvider = function (Private) {
   const AggConfig = Private(VisAggConfigProvider);
   const Schemas = Private(VisSchemasProvider);
 
-  const metricAggFilter = ['!top_hits', '!percentiles', '!percentile_ranks', '!median', '!std_dev'];
+  const metricAggFilter = ['!top_hits', '!percentiles', '!percentile_ranks', '!median', '!std_dev',
+    '!sum_bucket', '!avg_bucket', '!min_bucket', '!max_bucket'];
+
   const metricAggSchema = (new Schemas([
     {
       group: 'none',

diff --git a/src/ui/public/agg_types/metrics/metric_agg_type.js b/src/ui/public/agg_types/metrics/metric_agg_type.js
@@ -17,6 +17,7 @@ export default function MetricAggTypeProvider(Private) {
     }, this);
   }
 
+  MetricAggType.prototype.group = 'Basic Aggregations';
   /**
    * Read the values for this metric from the
    * @param  {[type]} bucket [description]