fixing refresh and auto refresh (elastic#12752)

* fixing refresh and auto refresh * cleaning up state monitor * uiState should trigger normal reload path * query bar search should force refresh * reload on global fetch event
thomasneirynck · Jul 12, 2017 · 574f5ca · 574f5ca
1 parent ef492a7
commit 574f5ca
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/src/core_plugins/kibana/public/visualize/editor/editor.js b/src/core_plugins/kibana/public/visualize/editor/editor.js
@@ -105,7 +105,9 @@ function VisEditor($scope, $route, timefilter, AppState, $window, kbnUrl, courie
  }, {
  key: 'refresh',
  description: 'Refresh',
- run: function () { $scope.fetch(); },
+ run: function () {
+ vis.forceReload();
+ },
  testId: 'visualizeRefreshButton',
  }];
 
@@ -202,7 +204,7 @@ function VisEditor($scope, $route, timefilter, AppState, $window, kbnUrl, courie
 
  // update the searchSource when query updates
  $scope.fetch = function () {
- $state.save();
+ $scope.vis.forceReload();
  };
 
  $scope.$on('ready:vis', function () {

diff --git a/src/ui/public/vis/request_handlers/courier.js b/src/ui/public/vis/request_handlers/courier.js
@@ -10,7 +10,7 @@ const CourierRequestHandlerProvider = function (Private, courier, timefilter) {
  }
 
  const shouldQuery = () => {
- if (!searchSource.lastQuery) return true;
+ if (!searchSource.lastQuery || vis.reload) return true;
  if (!_.isEqual(_.cloneDeep(searchSource.get('filter')), searchSource.lastQuery.filter)) return true;
  if (!_.isEqual(_.cloneDeep(searchSource.get('query')), searchSource.lastQuery.query)) return true;
  if (!_.isEqual(_.cloneDeep(searchSource.get('aggs')()), searchSource.lastQuery.aggs)) return true;
@@ -21,6 +21,7 @@ const CourierRequestHandlerProvider = function (Private, courier, timefilter) {
 
  return new Promise((resolve, reject) => {
  if (shouldQuery()) {
+ delete vis.reload;
  searchSource.onResults().then(resp => {
  searchSource.lastQuery = {
  filter: _.cloneDeep(searchSource.get('filter')),

diff --git a/src/ui/public/vis/vis.js b/src/ui/public/vis/vis.js
@@ -98,6 +98,10 @@ export function VisProvider(Private, indexPatterns, timefilter, getAppState) {
  this.setCurrentState(this._state);
  }
 
+ forceReload() {
+ this.emit('reload');
+ }
+
  getCurrentState(includeDisabled) {
  return {
  title: this.title,

diff --git a/src/ui/public/visualize/visualize.js b/src/ui/public/visualize/visualize.js
@@ -15,7 +15,7 @@ import {
 
 uiModules
 .get('kibana/directive', ['ngSanitize'])
-.directive('visualize', function (Notifier, Private, timefilter, getAppState, $timeout) {
+.directive('visualize', function (Notifier, Private, timefilter, getAppState) {
  const notify = new Notifier({ location: 'Visualize' });
  const requestHandlers = Private(VisRequestHandlersRegistryProvider);
  const responseHandlers = Private(VisResponseHandlersRegistryProvider);
@@ -83,6 +83,15 @@ uiModules
  }
  });
 
+ const reload = () => {
+ $scope.vis.reload = true;
+ $scope.fetch();
+ };
+ $scope.vis.on('reload', reload);
+ $scope.$on('courier:searchRefresh', reload);
+ // dashboard will trigger this event when refreshing
+ $scope.$on('fetch', reload);
+
  if ($scope.appState) {
  let oldUiState;
  const stateMonitor = stateMonitorFactory.create($scope.appState);
@@ -99,12 +108,14 @@ uiModules
  // current visualizations uiState changed.
  if (!oldUiState || oldUiState !== JSON.stringify($scope.uiState.toJSON())) {
  oldUiState = JSON.stringify($scope.uiState.toJSON());
- $timeout(() => {
- $scope.$broadcast('render');
- });
+ $scope.fetch();
  }
  }
  });
+
+ $scope.$on('$destroy', () => {
+ stateMonitor.destroy();
+ });
  }
 
  let resizeInit = false;