Merge pull request #435 from spenceralger/fix/350

Reset the aggParams on agg change
elastic · Oct 2, 2014 · a20880c · a20880c
2 parents 230e8a7 + b6da975
commit a20880c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/kibana/apps/visualize/editor/agg.js b/src/kibana/apps/visualize/editor/agg.js
@@ -48,7 +48,7 @@ define(function (require) {
 
           var $aggParamEditors;
           var $aggParamEditorsScope;
-          $scope.$watch('agg.type', function updateAggParamEditor() {
+          $scope.$watch('agg.type', function updateAggParamEditor(newType, oldType) {
             if ($aggParamEditors) {
               $aggParamEditors.remove();
               $aggParamEditorsScope.$destroy();
@@ -59,7 +59,12 @@ define(function (require) {
             var type = $scope.agg.type;
 
             if (!agg) return;
-            agg.fillDefaults();
+
+            if (newType !== oldType) {
+              // don't reset on initial load, the
+              // saved params should persist
+              agg.resetParams();
+            }
 
             if (!type) return;
 

diff --git a/src/kibana/components/vis/_agg_config.js b/src/kibana/components/vis/_agg_config.js
@@ -60,6 +60,15 @@ define(function (require) {
       });
     };
 
+    /**
+     * Clear the parameters for this aggConfig
+     *
+     * @return {object} the new params object
+     */
+    AggConfig.prototype.resetParams = function () {
+      return this.fillDefaults({});
+    };
+
     AggConfig.prototype.write = function () {
       return this.type.params.write(this);
     };