some updates to visualize loader

src/ui/public/filter_manager/filter_manager.js

@@ -7,7 +7,7 @@ export function FilterManagerProvider(Private) {
   const queryFilter = Private(FilterBarQueryFilterProvider);
   const filterManager = {};
 
-  filterManager.add = function (field, values, operation, index) {
+  filterManager.generate = (field, values, operation, index) => {
     values = _.isArray(values) ? values : [values];
     const fieldName = _.isObject(field) ? field.name : field;
     const filters = _.flatten([queryFilter.getAppFilters()]);
@@ -68,6 +68,11 @@ export function FilterManagerProvider(Private) {
       newFilters.push(filter);
     });
 
+    return newFilters;
+  };
+
+  filterManager.add = function (field, values, operation, index) {
+    const newFilters = this.generate(field, values, operation, index);
     return queryFilter.addFilters(newFilters);
   };
 

src/ui/public/vis/vis.js

@@ -21,6 +21,7 @@ import { queryManagerFactory } from '../query_manager';
 import * as kueryAPI from 'ui/kuery';
 import { SearchSourceProvider } from 'ui/courier/data_source/search_source';
 import { SavedObjectsClientProvider } from 'ui/saved_objects';
+import { FilterManagerProvider } from 'ui/filter_manager';
 
 export function VisProvider(Private, indexPatterns, timefilter, getAppState) {
   const visTypes = Private(VisTypesRegistryProvider);
@@ -30,6 +31,7 @@ export function VisProvider(Private, indexPatterns, timefilter, getAppState) {
   const filterBarClickHandler = Private(FilterBarClickHandlerProvider);
   const SearchSource = Private(SearchSourceProvider);
   const savedObjectsClient = Private(SavedObjectsClientProvider);
+  const filterManager = Private(FilterManagerProvider);
 
   class Vis extends EventEmitter {
     constructor(indexPattern, visState, uiState) {
@@ -60,6 +62,7 @@ export function VisProvider(Private, indexPatterns, timefilter, getAppState) {
         SearchSource: SearchSource,
         indexPatterns: indexPatterns,
         timeFilter: timefilter,
+        filterManager: filterManager,
         queryFilter: queryFilter,
         queryManager: queryManagerFactory(getAppState),
         kuery: kueryAPI,

src/ui/public/visualize/loader.js

@@ -1,6 +1,7 @@
 import $ from 'jquery';
+import uiRoutes from 'ui/routes';
 
-export function VisualizeLoaderProvider($compile, $rootScope, savedVisualizations) {
+const VisualizeLoaderProvider = ($compile, $rootScope, savedVisualizations) => {
   const renderVis = (el, savedObj, params) => {
     const scope = $rootScope.$new();
     scope.savedObj = savedObj;
@@ -9,6 +10,9 @@ export function VisualizeLoaderProvider($compile, $rootScope, savedVisualization
     scope.timeRange = params.timeRange;
     scope.showSpyPanel = params.showSpyPanel;
     scope.editorMode = params.editorMode;
+    scope.$on('ready:vis', $event => {
+      $event.stopPropagation();
+    });
 
     const container = el instanceof $ ? el : $(el);
 
@@ -17,20 +21,53 @@ export function VisualizeLoaderProvider($compile, $rootScope, savedVisualization
       'time-range="timeRange" editor-mode="editorMode" show-spy-panel="showSpyPanel"></visualize>');
     const visHtml = $compile(visEl)(scope);
     container.html(visHtml);
-    return visEl;
+
+    const handler = { destroy: scope.$destroy };
+
+    return new Promise((resolve) => {
+      visEl.on('renderComplete', () => {
+        resolve(handler);
+      });
+    });
+
   };
 
   return {
     embedVisualizationWithId: async (el, savedVisualizationId, params) => {
       return new Promise((resolve) => {
         savedVisualizations.get(savedVisualizationId).then(savedObj => {
-          const element = renderVis(el, savedObj, params);
-          resolve(element);
+          renderVis(el, savedObj, params).then(handler => {
+            resolve(handler);
+          });
         });
       });
     },
     embedVisualizationWithSavedObject: (el, savedObj, params) => {
       return renderVis(el, savedObj, params);
     }
   };
+};
+
+
+let visualizeLoader = null;
+let pendingPromise = null;
+let pendingResolve = null;
+uiRoutes.addSetupWork(function (Private) {
+  visualizeLoader = Private(VisualizeLoaderProvider);
+  if (pendingResolve) {
+    pendingResolve(visualizeLoader);
+  }
+});
+
+async function getVisualizeLoader() {
+  if (!pendingResolve) {
+    pendingPromise = new Promise((resolve)=> {
+      pendingResolve = resolve;
+      if (visualizeLoader) resolve(visualizeLoader);
+    });
+  }
+  return pendingPromise;
 }
+
+
+export { getVisualizeLoader, VisualizeLoaderProvider };

src/ui/public/visualize/visualize.js

@@ -187,7 +187,7 @@ uiModules
         $scope.$watch('vis.initialized', $scope.fetch);
 
         $scope.fetch();
-        $scope.$root.$broadcast('ready:vis');
+        $scope.$emit('ready:vis');
       }
     };
   });