From 644e485a978b4549e88f2c6e2dc42546c7ff5bd0 Mon Sep 17 00:00:00 2001
From: Khalah Jones-Golden <khasan222@gmail.com>
Date: Wed, 21 Oct 2015 16:56:59 -0400
Subject: [PATCH 1/3] [Embed] Moved the chrome.getVisible up one level for
 sidebar in visualize closes #5165. Added a chrome.getVisible to spy panel
 closes #3820

---
 src/plugins/kibana/public/visualize/editor/editor.html | 4 ++--
 src/ui/public/visualize/visualize.html                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/kibana/public/visualize/editor/editor.html b/src/plugins/kibana/public/visualize/editor/editor.html
index 1f9bd00591ae0..69a8ea8cb3f28 100644
--- a/src/plugins/kibana/public/visualize/editor/editor.html
+++ b/src/plugins/kibana/public/visualize/editor/editor.html
@@ -126,8 +126,8 @@
 
   <div class="vis-editor-content">
 
-    <div class="collapsible-sidebar">
-        <vis-editor-sidebar class="vis-editor-sidebar" ng-if="chrome.getVisible()"></vis-editor-sidebar>
+    <div class="collapsible-sidebar" ng-if="chrome.getVisible()">
+        <vis-editor-sidebar class="vis-editor-sidebar"></vis-editor-sidebar>
     </div>
 
     <div class="vis-editor-canvas" ng-class="{ embedded: !chrome.getVisible() }">
diff --git a/src/ui/public/visualize/visualize.html b/src/ui/public/visualize/visualize.html
index 4b04f4b739a82..12a25f342a573 100644
--- a/src/ui/public/visualize/visualize.html
+++ b/src/ui/public/visualize/visualize.html
@@ -11,4 +11,4 @@ <h4>No results found</h4>
   ng-class="{ loading: vis.type.requiresSearch && searchSource.activeFetchCount > 0 }"
   class="visualize-chart"></div>
 <!-- <pre>{{chartData | json}}</pre> -->
-<visualize-spy ng-if="vis.type.requiresSearch"></visualize-spy>
\ No newline at end of file
+<visualize-spy ng-if="vis.type.requiresSearch && chrome.getVisible()"></visualize-spy>

From bec02019057ef60b0eca751263b80d9d4df9585f Mon Sep 17 00:00:00 2001
From: Khalah Jones-Golden <khasan222@gmail.com>
Date: Tue, 27 Oct 2015 14:38:12 -0400
Subject: [PATCH 2/3] [Visualize] Changed the vizualize directive to also
 accept the chrome module

---
 src/plugins/kibana/public/dashboard/components/panel/panel.html | 1 +
 src/plugins/kibana/public/discover/index.html                   | 2 +-
 src/plugins/kibana/public/visualize/editor/editor.html          | 2 +-
 src/ui/public/visualize/visualize.js                            | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plugins/kibana/public/dashboard/components/panel/panel.html b/src/plugins/kibana/public/dashboard/components/panel/panel.html
index 586324b421609..692e0171a9371 100644
--- a/src/plugins/kibana/public/dashboard/components/panel/panel.html
+++ b/src/plugins/kibana/public/dashboard/components/panel/panel.html
@@ -28,6 +28,7 @@
   <visualize ng-switch-when="visualization"
     vis="savedObj.vis"
     search-source="savedObj.searchSource"
+    chrome="chrome"
     class="panel-content">
   </visualize>
 
diff --git a/src/plugins/kibana/public/discover/index.html b/src/plugins/kibana/public/discover/index.html
index ae64f37439ae2..96c69dd678293 100644
--- a/src/plugins/kibana/public/discover/index.html
+++ b/src/plugins/kibana/public/discover/index.html
@@ -176,7 +176,7 @@ <h2>Searching</h2>
 
               </header>
 
-              <visualize ng-if="vis && rows.length != 0" vis="vis" es-resp="mergedEsResp" search-source="searchSource"></visualize>
+              <visualize ng-if="vis && rows.length != 0" chrome="chrome" vis="vis" es-resp="mergedEsResp" search-source="searchSource"></visualize>
             </div>
 
             <div class="discover-table" fixed-scroll>
diff --git a/src/plugins/kibana/public/visualize/editor/editor.html b/src/plugins/kibana/public/visualize/editor/editor.html
index 69a8ea8cb3f28..8eee6e6a186c2 100644
--- a/src/plugins/kibana/public/visualize/editor/editor.html
+++ b/src/plugins/kibana/public/visualize/editor/editor.html
@@ -138,7 +138,7 @@
         </div>
       </div>
 
-      <visualize vis="vis" editable-vis="editableVis"  search-source="savedVis.searchSource"></visualize>
+      <visualize chrome="chrome" vis="vis" editable-vis="editableVis"  search-source="savedVis.searchSource"></visualize>
     </div>
   </div>
 
diff --git a/src/ui/public/visualize/visualize.js b/src/ui/public/visualize/visualize.js
index af36b581a8918..1b7dbe77fb5d4 100644
--- a/src/ui/public/visualize/visualize.js
+++ b/src/ui/public/visualize/visualize.js
@@ -16,6 +16,7 @@ define(function (require) {
     return {
       restrict: 'E',
       scope : {
+        chrome: '=',
         vis: '=',
         editableVis: '=?',
         esResp: '=?',

From 3979f0f76c5525a2e2039f2d8278c4bf9dde9ef6 Mon Sep 17 00:00:00 2001
From: Khalah Jones-Golden <khasan222@gmail.com>
Date: Fri, 30 Oct 2015 14:51:20 -0400
Subject: [PATCH 3/3] [SpyPanel] reduced scope of new parameter on visualize,
 added a default if no option is passed in for show-spy-panel Removed
 conditional on  from discover

---
 .../kibana/public/dashboard/components/panel/panel.html     | 2 +-
 src/plugins/kibana/public/discover/index.html               | 2 +-
 src/plugins/kibana/public/visualize/editor/editor.html      | 2 +-
 src/ui/public/visualize/visualize.html                      | 2 +-
 src/ui/public/visualize/visualize.js                        | 6 +++++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/plugins/kibana/public/dashboard/components/panel/panel.html b/src/plugins/kibana/public/dashboard/components/panel/panel.html
index 692e0171a9371..b23b4aea78c0c 100644
--- a/src/plugins/kibana/public/dashboard/components/panel/panel.html
+++ b/src/plugins/kibana/public/dashboard/components/panel/panel.html
@@ -28,7 +28,7 @@
   <visualize ng-switch-when="visualization"
     vis="savedObj.vis"
     search-source="savedObj.searchSource"
-    chrome="chrome"
+    show-spy-panel="chrome.getVisible()"
     class="panel-content">
   </visualize>
 
diff --git a/src/plugins/kibana/public/discover/index.html b/src/plugins/kibana/public/discover/index.html
index 96c69dd678293..ae64f37439ae2 100644
--- a/src/plugins/kibana/public/discover/index.html
+++ b/src/plugins/kibana/public/discover/index.html
@@ -176,7 +176,7 @@ <h2>Searching</h2>
 
               </header>
 
-              <visualize ng-if="vis && rows.length != 0" chrome="chrome" vis="vis" es-resp="mergedEsResp" search-source="searchSource"></visualize>
+              <visualize ng-if="vis && rows.length != 0" vis="vis" es-resp="mergedEsResp" search-source="searchSource"></visualize>
             </div>
 
             <div class="discover-table" fixed-scroll>
diff --git a/src/plugins/kibana/public/visualize/editor/editor.html b/src/plugins/kibana/public/visualize/editor/editor.html
index 8eee6e6a186c2..6b9d551b30a28 100644
--- a/src/plugins/kibana/public/visualize/editor/editor.html
+++ b/src/plugins/kibana/public/visualize/editor/editor.html
@@ -138,7 +138,7 @@
         </div>
       </div>
 
-      <visualize chrome="chrome" vis="vis" editable-vis="editableVis"  search-source="savedVis.searchSource"></visualize>
+      <visualize show-spy-panel="chrome.getVisible()" vis="vis" editable-vis="editableVis"  search-source="savedVis.searchSource"></visualize>
     </div>
   </div>
 
diff --git a/src/ui/public/visualize/visualize.html b/src/ui/public/visualize/visualize.html
index 12a25f342a573..15b5047244996 100644
--- a/src/ui/public/visualize/visualize.html
+++ b/src/ui/public/visualize/visualize.html
@@ -11,4 +11,4 @@ <h4>No results found</h4>
   ng-class="{ loading: vis.type.requiresSearch && searchSource.activeFetchCount > 0 }"
   class="visualize-chart"></div>
 <!-- <pre>{{chartData | json}}</pre> -->
-<visualize-spy ng-if="vis.type.requiresSearch && chrome.getVisible()"></visualize-spy>
+<visualize-spy ng-if="vis.type.requiresSearch && showSpyPanel"></visualize-spy>
diff --git a/src/ui/public/visualize/visualize.js b/src/ui/public/visualize/visualize.js
index 1b7dbe77fb5d4..9d8bec05af23e 100644
--- a/src/ui/public/visualize/visualize.js
+++ b/src/ui/public/visualize/visualize.js
@@ -16,7 +16,7 @@ define(function (require) {
     return {
       restrict: 'E',
       scope : {
-        chrome: '=',
+        showSpyPanel: '=?',
         vis: '=',
         editableVis: '=?',
         esResp: '=?',
@@ -27,6 +27,10 @@ define(function (require) {
         var chart; // set in "vis" watcher
         var minVisChartHeight = 180;
 
+        if (_.isUndefined($scope.showSpyPanel)) {
+          $scope.showSpyPanel = true;
+        }
+
         function getter(selector) {
           return function () {
             var $sel = $el.find(selector);