github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8392 from elastic/jasper/backport/8312/5.0

Browse source 
[backport] PR #8312 to 5.0
This commit is contained in:
Thomas Neirynck 2016-09-20 20:12:38 -04:00 • committed by GitHub
commit 78500aed29
1 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/core_plugins/kibana/public/management/sections/indices/_create.js
View file

@ -43,7 +43,14 @@ uiModules.get('apps/management')
};
$scope.refreshFieldList = function () {
fetchFieldList().then(updateFieldList);
const timeField = index.timeField;
fetchFieldList().then(function (results) {
if (timeField) {
updateFieldListAndSetTimeField(results, timeField.name);
} else {
updateFieldList(results);
}
});
};
$scope.createIndexPattern = function () {
@ -247,6 +254,22 @@ uiModules.get('apps/management')
}, notify.fatal);
}
function updateFieldListAndSetTimeField(results, timeFieldName) {
updateFieldList(results);
if (!results.dateFields.length) {
return;
}
const matchingTimeField = results.dateFields.find(field => field.name === timeFieldName);
const defaultTimeField = results.dateFields[0];
//assign the field from the results-list
//angular recreates a new timefield instance, each time the list is refreshed.
//This ensures the selected field matches one of the instances in the list.
index.timeField = matchingTimeField ? matchingTimeField : defaultTimeField;
}
function updateFieldList(results) {
index.fetchFieldsError = results.fetchFieldsError;
index.dateFields = results.dateFields;