Merge pull request #10 from sirensolutions/issue9

mark search source as inactive when destroying timeline #9
sirensolutions · Mar 8, 2016 · 8f8ee8d · 8f8ee8d
2 parents 8b9e5cf + bef5b4e
commit 8f8ee8d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/public/kibi_timeline.js b/public/kibi_timeline.js
@@ -7,6 +7,7 @@ define(function (require) {
   require('ui/modules').get('kibana').directive('kibiTimeline', function (Private, createNotifier, courier) {
 
     var filterManager = Private(require('ui/filter_manager/filter_manager'));
+    var requestQueue = Private(require('./lib/courier/_request_queue_wrapped'));
     var notify = createNotifier({
       location: 'Kibi Timeline'
     });
@@ -235,6 +236,9 @@ define(function (require) {
 
 
       $element.on('$destroy', function () {
+        _.each($scope.groups, (group) => {
+          requestQueue.markAllRequestsWithSourceIdAsInactive(group.searchSource._id);
+        });
         if (timeline) {
           timeline.off('select', onSelect);
         }

diff --git a/public/kibi_timeline_vis_controller.js b/public/kibi_timeline_vis_controller.js
@@ -108,7 +108,7 @@ define(function (require) {
         initOptions($scope.savedVis);
       });
 
-      $scope.$watch('vis', function () {
+      $scope.$watch('savedVis', function () {
         if ($scope.savedVis) {
           initOptions($scope.savedVis);
           initSearchSources($scope.savedVis);