From 02bef3078363375e256682557be5e105bdca3e0a Mon Sep 17 00:00:00 2001
From: Shelby Sturgis <shelbyjsturgis@gmail.com>
Date: Mon, 28 Mar 2016 14:46:09 -0700
Subject: [PATCH] reworking the pr based on new design spec. see pr comments

---
 src/plugins/kibana/public/visualize/editor/agg_add.html   | 4 ++--
 src/plugins/kibana/public/visualize/editor/agg_group.js   | 6 ++----
 .../kibana/public/visualize/editor/agg_params.html        | 8 +++++++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/plugins/kibana/public/visualize/editor/agg_add.html b/src/plugins/kibana/public/visualize/editor/agg_add.html
index ba7135f6daa8..0ce5acbfb9fa 100644
--- a/src/plugins/kibana/public/visualize/editor/agg_add.html
+++ b/src/plugins/kibana/public/visualize/editor/agg_add.html
@@ -19,10 +19,10 @@
   class="vis-editor-agg-wide-btn">
 
   <div ng-if="!add.form">
-    <div class="btn btn-sm btn-primary" ng-if="groupName !== 'buckets' || !stats.count">
+    <div class="btn btn-sm btn-primary" ng-if="groupName !== 'buckets' || !stats.count && !stats.deprecate">
       Add {{ groupName }}
     </div>
-    <div class="btn btn-sm btn-primary" ng-if="groupName === 'buckets' && stats.count - stats.numDeprecated > 0">
+    <div class="btn btn-sm btn-primary" ng-if="groupName === 'buckets' && stats.count > 0 && !stats.deprecate">
       Add sub-{{ groupName }}
     </div>
   </div>
diff --git a/src/plugins/kibana/public/visualize/editor/agg_group.js b/src/plugins/kibana/public/visualize/editor/agg_group.js
index d0223fa90ef0..1718d80c1b58 100644
--- a/src/plugins/kibana/public/visualize/editor/agg_group.js
+++ b/src/plugins/kibana/public/visualize/editor/agg_group.js
@@ -25,10 +25,7 @@ uiModules
         const stats = $scope.stats = {
           min: 0,
           max: 0,
-          count: $scope.group ? $scope.group.length : 0,
-          numDeprecated: $scope.schemas.raw.filter(function (o) {
-            return o.deprecate;
-          }).length
+          count: $scope.group ? $scope.group.length : 0
         };
 
         if (!$scope.schemas) return;
@@ -36,6 +33,7 @@ uiModules
         $scope.schemas.forEach(function (schema) {
           stats.min += schema.min;
           stats.max += schema.max;
+          stats.deprecate = schema.deprecate;
         });
 
         $scope.availableSchema = $scope.schemas.filter(function (schema) {
diff --git a/src/plugins/kibana/public/visualize/editor/agg_params.html b/src/plugins/kibana/public/visualize/editor/agg_params.html
index e4473e73a8b2..6a3c8c7cf387 100644
--- a/src/plugins/kibana/public/visualize/editor/agg_params.html
+++ b/src/plugins/kibana/public/visualize/editor/agg_params.html
@@ -10,4 +10,10 @@
     style="display: none;">
 </div>
 
-<!-- schema editors get added down here: aggSelect.html, agg_types/controls/*.html -->
\ No newline at end of file
+<div ng-if="agg.schema.deprecate" class="form-group">
+  <p class="vis-editor-agg-error">
+    "{{ agg.schema.title }}" has been deprecated.
+  </p>
+</div>
+
+<!-- schema editors get added down here: aggSelect.html, agg_types/controls/*.html -->