Skip to content

[6.x] Replace Discover notifier warnings with toasts. (#20650) #20701

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
merged 1 commit into from
Jul 11, 2018
Merged

[6.x] Replace Discover notifier warnings with toasts. (#20650) #20701

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 24 additions & 12 deletions src/core_plugins/kibana/public/discover/controllers/discover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,24 +745,36 @@ function discoverController(
}

function resolveIndexPatternLoading() {
const props = $route.current.locals.ip;
const loaded = props.loaded;
const stateVal = props.stateVal;
const stateValFound = props.stateValFound;
const {
loaded: loadedIndexPattern,
stateVal,
stateValFound,
} = $route.current.locals.ip;

const own = $scope.searchSource.getOwnField('index');
const ownIndexPattern = $scope.searchSource.getOwnField('index');

if (ownIndexPattern && !stateVal) {
return ownIndexPattern;
}

if (own && !stateVal) return own;
if (stateVal && !stateValFound) {
const err = '"' + stateVal + '" is not a configured pattern ID. ';
if (own) {
notify.warning(`${err} Using the saved index pattern: "${own.title}" (${own.id})`);
return own;
const warningTitle = `"${stateVal}" is not a configured index pattern ID`;

if (ownIndexPattern) {
toastNotifications.addWarning({
title: warningTitle,
text: `Showing the saved index pattern: "${ownIndexPattern.title}" (${ownIndexPattern.id})`,
});
return ownIndexPattern;
}

notify.warning(`${err} Using the default index pattern: "${loaded.title}" (${loaded.id})`);
toastNotifications.addWarning({
title: warningTitle,
text: `Showing the default index pattern: "${loadedIndexPattern.title}" (${loadedIndexPattern.id})`,
});
}
return loaded;

return loadedIndexPattern;
}

init();
Expand Down