fixing render complete issue and doulbe rendering with maps

elastic · Jun 29, 2017 · cd213d3 · cd213d3
1 parent d51983b
commit cd213d3
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 28 deletions.
diff --git a/src/core_plugins/table_vis/public/table_vis.js b/src/core_plugins/table_vis/public/table_vis.js
@@ -76,7 +76,6 @@ function TableVisTypeProvider(Private) {
         }
       ])
     },
-    implementsRenderComplete: true,
     hierarchicalData: function (vis) {
       return Boolean(vis.params.showPartialRows || vis.params.showMeticsAtAllLevels);
     }

diff --git a/src/core_plugins/tile_map/public/maps_visualization.js b/src/core_plugins/tile_map/public/maps_visualization.js
@@ -40,21 +40,23 @@ export function MapsVisualizationProvider(Private, serviceSettings, Notifier, co
 
     async render(esResponse) {
 
-      if (esResponse && typeof esResponse.geohashGridAgg === 'undefined') {
-        this._updateParams();
-        return;
-      }
+      return new Promise((resolve) => {
+        if (esResponse && typeof esResponse.geohashGridAgg === 'undefined') {
+          this._updateParams();
+          return resolve();
+        }
 
-      //todo: do render complete!
-      this._dataDirty = true;
-      this._kibanaMapReady.then(() => {
-        this._chartData = esResponse;
-        this._geohashGeoJson = this._chartData.geoJson;
-        this._recreateGeohashLayer();
-        this._kibanaMap.useUiStateFromVisualization(this.vis);
-        this._kibanaMap.resize();
-        this._dataDirty = false;
-        this._doRenderComplete();
+        //todo: do render complete!
+        this._dataDirty = true;
+        this._kibanaMapReady.then(() => {
+          this._chartData = esResponse;
+          this._geohashGeoJson = this._chartData.geoJson;
+          this._recreateGeohashLayer();
+          this._kibanaMap.useUiStateFromVisualization(this.vis);
+          this._kibanaMap.resize();
+          this._dataDirty = false;
+          this._doRenderComplete(resolve);
+        });
       });
     }
 
@@ -114,7 +116,6 @@ export function MapsVisualizationProvider(Private, serviceSettings, Notifier, co
         } else {
           this._recreateGeohashLayer();
           this._dataDirty = false;
-          this._doRenderComplete();
         }
       });
 
@@ -127,7 +128,6 @@ export function MapsVisualizationProvider(Private, serviceSettings, Notifier, co
       });
       this._kibanaMap.on('baseLayer:loaded', () => {
         this._baseLayerDirty = false;
-        this._doRenderComplete();
       });
       this._kibanaMap.on('baseLayer:loading', () => {
         this._baseLayerDirty = true;
@@ -236,10 +236,7 @@ export function MapsVisualizationProvider(Private, serviceSettings, Notifier, co
       };
     }
 
-    _doRenderComplete() {
-
-      //todo
-      return;
+    _doRenderComplete(resolve) {
 
       if (this._paramsDirty || this._dataDirty || this._baseLayerDirty) {
         const mapParams = this._getMapsParams();
@@ -256,7 +253,7 @@ export function MapsVisualizationProvider(Private, serviceSettings, Notifier, co
 
         return;
       }
-      this.$el.trigger('renderComplete');
+      resolve('renderComplete');
     }
 
   }

diff --git a/src/ui/public/vis/editors/default/default.js b/src/ui/public/vis/editors/default/default.js
@@ -30,6 +30,7 @@ const defaultEditor = function ($rootScope, $compile) {
         $scope.visData = visData;
         $scope.uiState = this.vis.getUiState();
         $scope.searchSource = searchSource;
+        $scope.$apply();
       };
 
       return new Promise(resolve => {

diff --git a/src/ui/public/vis/vis_types/vislib_vis_type.js b/src/ui/public/vis/vis_types/vislib_vis_type.js
@@ -39,7 +39,7 @@ export function VislibVisTypeProvider(Private) {
     }
 
     resize() {
-      this.render(this._response);
+      return this.render(this._response);
     }
 
     destroy() {

diff --git a/src/ui/public/visualize/visualization.js b/src/ui/public/visualize/visualization.js
@@ -131,11 +131,6 @@ uiModules
 
       resizeChecker.on('resize',  resizeFunction);
 
-      $scope.$watch('visData', () => {
-        $scope.$broadcast('render');
-      });
-
-
       function jQueryGetter(selector) {
         return function () {
           const $sel = $el.find(selector);