Skip to content

[Discover] Reimplement $route.reload when index pattern changes #59877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kertal merged 2 commits into from
Mar 12, 2020
Merged

[Discover] Reimplement $route.reload when index pattern changes #59877

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a31ae20
Reimplement $route.reload when index pattern changes
kertal Mar 11, 2020
ddaef14
Merge branch 'master' into kertal-pr-2020-03-11-reimplement-route-rel…
elasticmachine Mar 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 4 additions & 22 deletions src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,28 +238,9 @@ function discoverController(
$scope.state = { ...newState };

// detect changes that should trigger fetching of new data
const changes = ['interval', 'sort', 'index', 'query'].filter(
const changes = ['interval', 'sort', 'query'].filter(
prop => !_.isEqual(newStatePartial[prop], oldStatePartial[prop])
);
if (changes.indexOf('index') !== -1) {
try {
$scope.indexPattern = await indexPatterns.get(newStatePartial.index);
$scope.opts.timefield = getTimeField();
$scope.enableTimeRangeSelector = !!$scope.opts.timefield;
// is needed to rerender the histogram
$scope.vis = undefined;

// Taking care of sort when switching index pattern:
// Old indexPattern: sort by A
// If A is not available in the new index pattern, sort has to be adapted and propagated to URL
const sort = getSortArray(newStatePartial.sort, $scope.indexPattern);
if (newStatePartial.sort && !_.isEqual(sort, newStatePartial.sort)) {
return await replaceUrlAppState({ sort });
}
} catch (e) {
toastNotifications.addWarning({ text: getIndexPatternWarning(newStatePartial.index) });
}
}

if (changes.length) {
$fetchObservable.next();
Expand All @@ -268,8 +249,9 @@ function discoverController(
}
});

$scope.setIndexPattern = id => {
setAppState({ index: id });
$scope.setIndexPattern = async id => {
await replaceUrlAppState({ index: id });
$route.reload();
};

// update data source when filters update
Expand Down