maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix issue where subsequent index name is wiped out when previous file cancelled

Browse source
This commit is contained in:
Aaron Caldwell 2019-09-25 13:44:18 -06:00
parent e46c240723
commit 0688e73ffc
1 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
x-pack/legacy/plugins/file_upload/public/components/json_index_file_picker.js
View file

@ -48,27 +48,10 @@ export class JsonIndexFilePicker extends Component {
return;
}
const file = fileArr[0];
let initIndexName;
try {
initIndexName = this._getIndexName(file);
} catch (error) {
this.setState({
fileUploadError: i18n.translate('xpack.fileUpload.jsonIndexFilePicker.errorGettingIndexName', {
defaultMessage: 'Error retrieving index name: {errorMessage}',
values: {
errorMessage: error.message
}
})
});
return;
}
this.props.setIndexName(initIndexName);
this.setState({ fileParseActive: true }, () => this._parseFile(file));
};
_getIndexName({ name, size }) {
_getDefaultIndexName({ name, size }) {
if (!name) {
throw new Error(i18n.translate('xpack.fileUpload.jsonIndexFilePicker.noFileNameError', {
defaultMessage: 'No file name provided'
@ -99,6 +82,25 @@ export class JsonIndexFilePicker extends Component {
return splitNameArr[0];
}
_setIndexName(file) {
let initIndexName;
try {
initIndexName = this._getDefaultIndexName(file);
} catch (error) {
this.setState({
fileUploadError: i18n.translate('xpack.fileUpload.jsonIndexFilePicker.errorGettingIndexName', {
defaultMessage: 'Error retrieving index name: {errorMessage}',
values: {
errorMessage: error.message
}
})
});
return;
}
this.props.setIndexName(initIndexName);
}
setFileProgress = ({ bytesProcessed, totalBytes }) => {
const percentageProcessed = parseInt((100 * bytesProcessed) / totalBytes);
if (
@ -143,10 +145,14 @@ export class JsonIndexFilePicker extends Component {
resetFileAndIndexSettings();
return;
}
this._setIndexName(file);
setFileRef(file);
setParsedFile(parsedFileResult);
}
render() {
const {
fileUploadError,