From 7617563b42e56b8311677a9ec07cdba64aadd1a5 Mon Sep 17 00:00:00 2001
From: Tim Roes <tim.roes@elastic.co>
Date: Fri, 15 Jun 2018 17:31:16 +0200
Subject: [PATCH] Add link to missing vis variable

---
 .../agg_types/__tests__/buckets/date_histogram/_editor.js     | 3 ++-
 src/ui/public/agg_types/controls/order_agg.html               | 1 +
 src/ui/public/agg_types/controls/sub_agg.html                 | 1 +
 src/ui/public/agg_types/controls/sub_metric.html              | 1 +
 src/ui/public/agg_types/filter/agg_type_filters.ts            | 4 ++--
 src/ui/public/vis/editors/default/__tests__/agg_params.js     | 3 ++-
 src/ui/public/vis/editors/default/agg.html                    | 1 +
 src/ui/public/vis/editors/default/agg_params.js               | 1 +
 8 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js
index 2fd398a879cde24..f6ec04589485db0 100644
--- a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js
+++ b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js
@@ -58,11 +58,12 @@ describe('editor', function () {
         ]
       });
 
-      const $el = $('<vis-editor-agg-params agg="agg" group-name="groupName"></vis-editor-agg-params>');
+      const $el = $('<vis-editor-agg-params agg="agg" vis="vis" group-name="groupName"></vis-editor-agg-params>');
       const $parentScope = $injector.get('$rootScope').$new();
 
       agg = $parentScope.agg = vis.aggs.bySchemaName.segment[0];
       $parentScope.groupName = 'buckets';
+      $parentScope.vis = vis;
 
       $compile($el)($parentScope);
       $scope = $el.scope();
diff --git a/src/ui/public/agg_types/controls/order_agg.html b/src/ui/public/agg_types/controls/order_agg.html
index 8066dc91da176b5..4f2e071100dfd3b 100644
--- a/src/ui/public/agg_types/controls/order_agg.html
+++ b/src/ui/public/agg_types/controls/order_agg.html
@@ -24,6 +24,7 @@
   </div>
   <div ng-show="agg.params.orderAgg" class="vis-editor-agg-order-agg">
     <vis-editor-agg-params
+      vis="vis"
       agg="agg.params.orderAgg"
       ng-if="agg.params.orderAgg"
       group-name="'metrics'">
diff --git a/src/ui/public/agg_types/controls/sub_agg.html b/src/ui/public/agg_types/controls/sub_agg.html
index 5b99d2de4c75225..1e1be22028d3966 100644
--- a/src/ui/public/agg_types/controls/sub_agg.html
+++ b/src/ui/public/agg_types/controls/sub_agg.html
@@ -25,6 +25,7 @@
   <div ng-if="agg.params.metricAgg === 'custom'" class="vis-editor-agg-order-agg">
     <ng-form name="customMetricForm">
       <vis-editor-agg-params
+        vis="vis"
         agg="agg.params.customMetric"
         group-name="'metrics'">
       </vis-editor-agg-params>
diff --git a/src/ui/public/agg_types/controls/sub_metric.html b/src/ui/public/agg_types/controls/sub_metric.html
index 88011451676be05..343ca331a96cb0f 100644
--- a/src/ui/public/agg_types/controls/sub_metric.html
+++ b/src/ui/public/agg_types/controls/sub_metric.html
@@ -5,6 +5,7 @@
       <ng-form name="{{aggType}}Form">
         <vis-editor-agg-params
           agg="agg.params[aggType]"
+          vis="vis"
           group-name="'{{aggGroup}}'">
         </vis-editor-agg-params>
       </ng-form>
diff --git a/src/ui/public/agg_types/filter/agg_type_filters.ts b/src/ui/public/agg_types/filter/agg_type_filters.ts
index fe3bbf9b4ab60c1..6b859e889188211 100644
--- a/src/ui/public/agg_types/filter/agg_type_filters.ts
+++ b/src/ui/public/agg_types/filter/agg_type_filters.ts
@@ -51,10 +51,10 @@ class AggTypeFilters {
    * A new filtered list will always be emitted when the {@link AggTypeFilter}
    * registered with this registry will change.
    *
-   * @param aggTypes  A list of aggTypes that will be filtered down by this registry.
+   * @param aggTypes A list of aggTypes that will be filtered down by this registry.
    * @param vis The vis for which this list should be filtered down.
    * @param aggConfig The aggConfig for which the returning list will be used.
-   * @return  A filtered list of the passed aggTypes.
+   * @return A filtered list of the passed aggTypes.
    */
   public filter$(aggTypes: AggType[], vis: Vis, aggConfig: AggConfig) {
     return this.subject.map(filters => {
diff --git a/src/ui/public/vis/editors/default/__tests__/agg_params.js b/src/ui/public/vis/editors/default/__tests__/agg_params.js
index 3497db7cec6bea5..502cfa87c12bd7c 100644
--- a/src/ui/public/vis/editors/default/__tests__/agg_params.js
+++ b/src/ui/public/vis/editors/default/__tests__/agg_params.js
@@ -77,10 +77,11 @@ describe('Vis-Editor-Agg-Params plugin directive', function () {
     });
 
     $parentScope.agg = new AggConfig(vis, state);
+    $parentScope.vis = vis;
 
     // make the element
     $elem = angular.element(
-      `<vis-editor-agg-params agg="agg" group-name="groupName"></vis-editor-agg-params>`
+      `<vis-editor-agg-params vis="vis" agg="agg" group-name="groupName"></vis-editor-agg-params>`
     );
 
     // compile the html
diff --git a/src/ui/public/vis/editors/default/agg.html b/src/ui/public/vis/editors/default/agg.html
index 0d2970076be47bb..b49e875e8413efe 100644
--- a/src/ui/public/vis/editors/default/agg.html
+++ b/src/ui/public/vis/editors/default/agg.html
@@ -93,6 +93,7 @@
   agg="agg"
   group-name="groupName"
   ng-show="editorOpen"
+  vis="vis"
   class="vis-editor-agg-editor">
 </vis-editor-agg-params>
 
diff --git a/src/ui/public/vis/editors/default/agg_params.js b/src/ui/public/vis/editors/default/agg_params.js
index 97f1423bcffceef..a357d4b771c288a 100644
--- a/src/ui/public/vis/editors/default/agg_params.js
+++ b/src/ui/public/vis/editors/default/agg_params.js
@@ -40,6 +40,7 @@ uiModules
       link: function ($scope, $el, attr) {
         $scope.$bind('agg', attr.agg);
         $scope.$bind('groupName', attr.groupName);
+        $scope.$bind('vis', attr.vis);
 
         const aggTypeSubscription = aggTypeFilters
           .filter$(aggTypes.byType[$scope.groupName], $scope.vis, $scope.agg)